This commit is contained in:
恍兮惚兮 2024-07-08 01:42:49 +08:00
parent b4dc3e329a
commit 6cac3cf2b2
17 changed files with 49 additions and 127 deletions

View File

@ -7,9 +7,7 @@ body:
value: >
Before asking questions, make sure it hasn't been mentioned before.
提问之前应先检索以下列表检查是否已有相关的回答。
https://github.com/test123456654321/LunaTranslator/issues
提问之前应先检查是否已有相关的回答。
Don't ask questions about bugs. To open the right template from the previous selection.

View File

@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Specific Game Related 特定游戏相关
url: https://github.com/test123456654321/LunaHook/issues/new?assignees=&labels=enhancement&projects=&template=01_game_request.yaml
url: https://lunatranslator.xyz/Github/LunaHook/issues/new?assignees=&labels=enhancement&projects=&template=01_game_request.yaml
about: Request for an unsupported game, or hooked text is incorrect 请求支持尚未支持的游戏,或提取的文本不正确

View File

@ -19,30 +19,6 @@ from gui.usefulwidget import (
versionchecktask = queue.Queue()
def getvesionmethod_github():
try:
headers = {
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
"Accept-Language": "zh-CN,zh;q=0.9",
"Cache-Control": "max-age=0",
"Proxy-Connection": "keep-alive",
"Upgrade-Insecure-Requests": "1",
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36",
}
res = requests.get(
"https://api.github.com/repos/HIllya51/LunaTranslator/releases/latest",
headers=headers,
verify=False,
proxies=getproxy(("github", "versioncheck")),
).json()
# print(res)
_version = res["tag_name"]
return _version
except:
print_exc()
return None
def getvesionmethod():
try:
res = requests.get(
@ -137,60 +113,6 @@ def updatemethod(info, self):
return savep
@tryprint
def updatemethod_github(_version, self):
check_interrupt = lambda: not (
globalconfig["autoupdate"] and versionchecktask.empty()
)
if platform.architecture()[0] == "64bit":
bit = ""
elif platform.architecture()[0] == "32bit":
bit = "_x86"
else:
raise Exception
url = "https://github.com/HIllya51/LunaTranslator/releases/download/{}/LunaTranslator{}.zip".format(
_version, bit
)
savep = gobject.getcachedir("update/LunaTranslator{}.zip".format(bit))
r2 = requests.get(
url, stream=True, verify=False, proxies=getproxy(("github", "download"))
)
size = int(r2.headers["Content-Length"])
if check_interrupt():
return
if updatemethod_checkalready(size, savep):
return savep
with open(savep, "wb") as file:
sess = requests.session()
r = sess.get(
url, stream=True, verify=False, proxies=getproxy(("github", "download"))
)
file_size = 0
for i in r.iter_content(chunk_size=1024):
if check_interrupt():
return
if not i:
continue
file.write(i)
thislen = len(i)
file_size += thislen
prg = int(10000 * file_size / size)
prg100 = prg / 100
sz = int(1000 * (int(size / 1024) / 1024)) / 1000
self.progresssignal.emit(
"总大小{} MB 进度 {:0.2f}% ".format(sz, prg100), prg
)
if check_interrupt():
return
if updatemethod_checkalready(size, savep):
return savep
def uncompress(self, savep):
self.progresssignal.emit("正在解压……", 10000)
shutil.rmtree(gobject.getcachedir("update/LunaTranslator/"))
@ -260,10 +182,10 @@ def createdownloadprogress(self):
def wraplink(text: str):
link = "https://github.com/HIllya51/LunaTranslator/releases"
link = "https://lunatranslator.xyz/Github/LunaTranslator/releases"
if text.startswith("v"):
link = f"https://github.com/HIllya51/LunaTranslator/releases/tag/{text}"
link = f"https://lunatranslator.xyz/Github/LunaTranslator/releases/tag/{text}"
return makehtml(
link,
show=text,
@ -386,7 +308,6 @@ def setTab_update(self, basel):
]
shuominggrid = [
# ["Github", makehtml("https://github.com/HIllya51/LunaTranslator")],
["项目网站", makehtml("https://lunatranslator.xyz/")],
[
"使用说明",

View File

@ -209,8 +209,8 @@ def on_not_find_qweb(self):
def _okcallback():
link = [
"https://github.com/test123456654321/RESOURCES/releases/download/other/QWebEngine_x86.zip",
"https://github.com/test123456654321/RESOURCES/releases/download/other/QWebEngine_x64.zip",
"https://lunatranslator.xyz/Resource/QWebEngine_x86.zip",
"https://lunatranslator.xyz/Resource/QWebEngine_x64.zip",
][platform.architecture()[0] == "64bit"]
os.startfile(link)
installqwebdialog(self, link)

View File

@ -697,27 +697,27 @@
"links": [
{
"name": "日语",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/ja.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/ja.zip"
},
{
"name": "英文",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/en.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/en.zip"
},
{
"name": "简体中文",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/zh.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/zh.zip"
},
{
"name": "繁体中文",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/cht.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/cht.zip"
},
{
"name": "韩语",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/ko.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/ko.zip"
},
{
"name": "俄语",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/ocr_models/ru.zip"
"link": "https://lunatranslator.xyz/Resource/ocr_models/ru.zip"
}
]
},
@ -750,7 +750,7 @@
"links": [
{
"name": "MeCab",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/dictionary/Mecab.zip"
"link": "https://lunatranslator.xyz/Resource/dictionary/Mecab.zip"
},
{
"name": "Unidic",
@ -760,19 +760,19 @@
},
{
"name": "小学馆",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/dictionary/xiaoxueguan.db"
"link": "https://lunatranslator.xyz/Resource/dictionary/xiaoxueguan.db"
},
{
"name": "EDICT",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/dictionary/edict.db"
"link": "https://lunatranslator.xyz/Resource/dictionary/edict.db"
},
{
"name": "EDICT2",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/dictionary/edict2"
"link": "https://lunatranslator.xyz/Resource/dictionary/edict2"
},
{
"name": "灵格斯词典",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/dictionary/Lingoes.zip"
"link": "https://lunatranslator.xyz/Resource/dictionary/Lingoes.zip"
},
{
"name": "MDict",
@ -847,7 +847,7 @@
},
{
"name": "win7适配版",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/other/Release.zip"
"link": "https://lunatranslator.xyz/Resource/Magpie9_Win7"
}
]
},
@ -857,11 +857,11 @@
"links": [
{
"name": "x86",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/other/QWebEngine_x86.zip"
"link": "https://lunatranslator.xyz/Resource/QWebEngine_x86.zip"
},
{
"name": "x64",
"link": "https://github.com/test123456654321/RESOURCES/releases/download/other/QWebEngine_x64.zip"
"link": "https://lunatranslator.xyz/Resource/QWebEngine_x64.zip"
}
]
}

View File

@ -2,8 +2,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
### 简体中文 | [Русский язык](README_ru.md) | [English](README_en.md) | [Other Language](otherlang.md)

View File

@ -2,8 +2,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
</p>
### [简体中文](README.md) | [Русский язык](README_ru.md) | English | [Other Languages](otherlang.md)
@ -12,7 +12,7 @@
### <a href="https://docs.lunatranslator.xyz/#/en/" target="_blank">Documentation</a>
Welcome friends who want to help us improve the documentation! [Documentation Repo](https://github.com/test123456654321/LunaTranslator)
Welcome friends who want to help us improve the documentation! [Documentation Repo](https://lunatranslator.xyz/Github/LunaTranslator)
## Features

View File

@ -3,8 +3,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
</p>
### [简体中文](README.md) | Русский язык | [English](README_en.md) | [Other Language](otherlang.md)
@ -14,7 +14,7 @@
### <a href="https://docs.lunatranslator.xyz/#/ru/" target="_blank">Инструкция по настройке программы (Полностью на русском языке)</a>
Welcome friends who find it helpful to improve the documentation together.[Documentation Repo](https://github.com/test123456654321/LunaTranslator)
Welcome friends who find it helpful to improve the documentation together.[Documentation Repo](https://lunatranslator.xyz/Github/LunaTranslator)
## Основные функции:

View File

@ -23,11 +23,11 @@ curlFileName64 = "curl-8.7.1_7-win64-mingw.zip"
ocrModelUrl = (
"https://github.com/test123456654321/RESOURCES/releases/download/ocr_models"
"https://lunatranslator.xyz/Resource/ocr_models"
)
availableLocales = ["cht", "en", "ja", "ko", "ru", "zh"]
LunaHook_latest = "https://github.com/test123456654321/LunaHook/releases/latest/download/Release_English.zip"
LunaHook_latest = "https://lunatranslator.xyz/Github/LunaHook/releases/latest/download/Release_English.zip"
LocaleRe = "https://github.com/InWILL/Locale_Remulator/releases/download/v1.5.3-beta.1/Locale_Remulator.1.5.3-beta.1.zip"
@ -113,15 +113,15 @@ def downloadcommon():
os.chdir(rootDir + "\\temp")
downloadlr()
subprocess.run(
f"curl -LO https://github.com/test123456654321/RESOURCES/releases/download/other/mecab.zip"
f"curl -LO https://lunatranslator.xyz/Resource/build_req/mecab.zip"
)
subprocess.run(f"7z x mecab.zip -oALL")
subprocess.run(
f"curl -LO https://github.com/test123456654321/RESOURCES/releases/download/other/ocr.zip"
f"curl -LO https://lunatranslator.xyz/Resource/build_req/ocr.zip"
)
subprocess.run(f"7z x ocr.zip -oALL")
subprocess.run(
f"curl -LO https://github.com/test123456654321/RESOURCES/releases/download/other/magpie.zip"
f"curl -LO https://lunatranslator.xyz/Resource/build_req/magpie.zip"
)
subprocess.run(f"7z x magpie.zip -oALL")
@ -241,8 +241,11 @@ def buildPlugins():
def downloadsomething():
os.chdir(rootDir + "\\temp")
os.system("git clone https://github.com/test123456654321/stylesheets")
move_directory_contents("stylesheets", rootDir + "\\LunaTranslator\\files\\themes")
subprocess.run(
f"curl -LO https://lunatranslator.xyz/Resource/build_req/stylesheets-main.zip"
)
subprocess.run(f"7z x stylesheets-main.zip -oALL")
move_directory_contents("ALL/stylesheets-main", rootDir + "\\LunaTranslator\\files\\themes")
if __name__ == "__main__":

View File

@ -3,8 +3,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
## Features

View File

@ -4,7 +4,7 @@
## How to Download
1. Go to [the LunaTranslator releases page](https://github.com/test123456654321/LunaTranslator/releases)
1. Go to [the LunaTranslator releases page](https://lunatranslator.xyz/Github/LunaTranslator/releases)
2. In the "Assets" section of the latest release, find and download the "LunaTranslator.zip" file
3. Extract the contents of the ZIP file to any directory on your computer.
![img](../images/zh/download.jpg)

View File

@ -3,8 +3,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a id="table1"></a>

View File

@ -3,7 +3,7 @@
## Скачать
Ссылка для загрузки актуальной версии программы: <a target="_blank" href="https://github.com/test123456654321/LunaTranslator/releases">https://github.com/test123456654321/LunaTranslator/releases</a>
Ссылка для загрузки актуальной версии программы: <a target="_blank" href="https://lunatranslator.xyz/Github/LunaTranslator/releases">https://lunatranslator.xyz/Github/LunaTranslator/releases</a>
Скачайте архив **LunaTranslator.zip** и распакуйте его в любое удобное для вас место.
![img](../images/ru/download_ru.png)

View File

@ -5,8 +5,8 @@
<p align="left">
<a href="./LICENSE"><img src="https://img.shields.io/github/license/test123456654321/LunaTranslator"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases"><img src="https://img.shields.io/github/v/release/test123456654321/LunaTranslator?color=ffa"></a>
<a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a>
<a href="https://docs.lunatranslator.xyz/#/zh/" target="_blank">使用说明</a> <a href="https://space.bilibili.com/592120404/video" target="_blank">视频教程</a> <a href="https://qm.qq.com/q/qE32v9NYBO" target="_blank">交流群912525396</a>

View File

@ -25,7 +25,7 @@
- [如何自动划词进 anki](/zh/qa2.md)
- [如何使用离线 chatgpt](/zh/qa3.md)
- [如何使用 gemini 免费 api](/zh/qa4.md)
- [其他问题](https://github.com/test123456654321/LunaTranslator/issues?q=label%3AQ%26A)
- [其他问题](https://lunatranslator.xyz/Github/LunaTranslatorissues?q=label%3AQ%26A)
- 支持作者
- [支持作者](/zh/support.md)

View File

@ -2,7 +2,7 @@
### 下载
下载64位版 <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> 下载32位版 <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a> 或从 <a target="_blank" href="https://github.com/test123456654321/LunaTranslator/releases" target="_blank"> releases</a> 下载 <a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank">LunaTranslator.zip</a><a href="https://github.com/test123456654321/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank">LunaTranslator_x86.zip</a> ,解压到任意目录
下载64位版 <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank"><img src="https://img.shields.io/badge/download_64bit-blue"/></a> 下载32位版 <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank"><img src="https://img.shields.io/badge/download_32bit-blue"/></a> 或从 <a target="_blank" href="https://lunatranslator.xyz/Github/LunaTranslator/releases" target="_blank"> releases</a> 下载 <a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator.zip" target="_blank">LunaTranslator.zip</a><a href="https://lunatranslator.xyz/Github/LunaTranslator/releases/latest/download/LunaTranslator_x86.zip" target="_blank">LunaTranslator_x86.zip</a> ,解压到任意目录
#### 注意

View File

@ -31,7 +31,7 @@ int updatewmain(int argc, wchar_t *argv[])
catch (std::exception &e)
{
MessageBoxA(GetForegroundWindow(), (std::string("Update failed!\r\n") + e.what()).c_str(), "Error", 0);
ShellExecute(0, L"open", L"https://github.com/test123456654321/LunaTranslator/releases", NULL, NULL, SW_SHOWNORMAL);
ShellExecute(0, L"open", L"https://lunatranslator.xyz/Github/LunaTranslator/releases", NULL, NULL, SW_SHOWNORMAL);
return 0;
}
try