Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2025-01-01 10:04:12 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-08-19 19:08:23 +08:00
parent 5bf9eeb490
commit 49494806ee
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LunaTranslator/LunaTranslator/gui/pretransfile.py
View File

@ -5,6 +5,7 @@ from myutils.config import globalconfig, _TR
from myutils.utils import autosql from myutils.utils import autosql
from gui.usefulwidget import getQMessageBox, LFocusCombo from gui.usefulwidget import getQMessageBox, LFocusCombo
from gui.dynalang import LFormLayout, LPushButton, LDialog from gui.dynalang import LFormLayout, LPushButton, LDialog
from textsource.texthook import splitembedlines
def sqlite2json2(self, sqlitefile, targetjson=None, existsmerge=False): def sqlite2json2(self, sqlitefile, targetjson=None, existsmerge=False):
@ -95,6 +96,8 @@ def sqlite2json2(self, sqlitefile, targetjson=None, existsmerge=False):
for k in existsjs: for k in existsjs:
if k not in js_format2 or js_format2[k] == "": if k not in js_format2 or js_format2[k] == "":
js_format2[k] = existsjs[k] js_format2[k] = existsjs[k]
for _ in js_format2:
js_format2[_] = splitembedlines(js_format2[_])
os.makedirs(os.path.dirname(target), exist_ok=True) os.makedirs(os.path.dirname(target), exist_ok=True)
with open(target, "w", encoding="utf8") as ff: with open(target, "w", encoding="utf8") as ff:
ff.write( ff.write(

28
LunaTranslator/LunaTranslator/textsource/texthook.py
View File

@ -88,6 +88,21 @@ HookInsertHandler = CFUNCTYPE(None, c_uint64, c_wchar_p)
EmbedCallback = CFUNCTYPE(None, c_wchar_p, ThreadParam) EmbedCallback = CFUNCTYPE(None, c_wchar_p, ThreadParam)
def splitembedlines(trans):
if len(trans) and globalconfig["embedded"]["limittextlength_use"]:
length = globalconfig["embedded"]["limittextlength_length"]
lines = trans.split("\n")
newlines = []
space = getlanguagespace(getlangtgt())
for line in lines:
line = line.split(space) if space else line
while len(line):
newlines.append(space.join(line[:length]))
line = line[length:]
trans = "\n".join(newlines)
return trans
class texthook(basetext): class texthook(basetext):
autofindpids = False autofindpids = False
@ -369,18 +384,7 @@ class texthook(basetext):
self.embedcallback(text, trans) self.embedcallback(text, trans)
def embedcallback(self, text: str, trans: str): def embedcallback(self, text: str, trans: str):
if len(trans) and globalconfig["embedded"]["limittextlength_use"]: trans = splitembedlines(trans)
length = globalconfig["embedded"]["limittextlength_length"]
lines = trans.split("\n")
newlines = []
space = getlanguagespace(getlangtgt())
for line in lines:
line = line.split(space) if space else line
while len(line):
newlines.append(space.join(line[:length]))
line = line[length:]
trans = "\n".join(newlines)
print(trans)
for pid in self.pids.copy(): for pid in self.pids.copy():
self.Luna_embedcallback(pid, text, trans) self.Luna_embedcallback(pid, text, trans)

4
plugins/shareddllproxy/aspatch.cpp
View File

@ -92,7 +92,7 @@ std::map<std::string, std::string> translation;
std::unordered_set<DWORD> connectedpids; std::unordered_set<DWORD> connectedpids;
void (*Luna_Start)(ProcessEvent Connect, ProcessEvent Disconnect, ThreadEvent Create, ThreadEvent Destroy, OutputCallback Output, ConsoleHandler console, HookInsertHandler hookinsert, EmbedCallback embed); void (*Luna_Start)(ProcessEvent Connect, ProcessEvent Disconnect, ThreadEvent Create, ThreadEvent Destroy, OutputCallback Output, ConsoleHandler console, HookInsertHandler hookinsert, EmbedCallback embed);
void (*Luna_Inject)(DWORD pid, LPCWSTR basepath); void (*Luna_Inject)(DWORD pid, LPCWSTR basepath);
void (*Luna_EmbedSettings)(DWORD pid, UINT32 waittime, UINT8 fontCharSet, bool fontCharSetEnabled, wchar_t *fontFamily, UINT32 spaceadjustpolicy, UINT32 keeprawtext, bool fastskipignore, UINT32 line_text_length_limit); void (*Luna_EmbedSettings)(DWORD pid, UINT32 waittime, UINT8 fontCharSet, bool fontCharSetEnabled, wchar_t *fontFamily, UINT32 spaceadjustpolicy, UINT32 keeprawtext, bool fastskipignore);
void (*Luna_useembed)(DWORD pid, uint64_t address, uint64_t ctx1, uint64_t ctx2, bool use); void (*Luna_useembed)(DWORD pid, uint64_t address, uint64_t ctx1, uint64_t ctx2, bool use);
bool (*Luna_checkisusingembed)(DWORD pid, uint64_t address, uint64_t ctx1, uint64_t ctx2); bool (*Luna_checkisusingembed)(DWORD pid, uint64_t address, uint64_t ctx1, uint64_t ctx2);
void (*Luna_embedcallback)(DWORD pid, LPCWSTR text, LPCWSTR trans); void (*Luna_embedcallback)(DWORD pid, LPCWSTR text, LPCWSTR trans);
@ -120,7 +120,7 @@ public:
Luna_Start( Luna_Start(
[](DWORD pid) [](DWORD pid)
{ {
Luna_EmbedSettings(pid, 1000 * config["embedsettings"]["timeout_translate"], 2, false, config["embedsettings"]["changefont"] ? (StringToWideString(config["embedsettings"]["changefont_font"]).data()) : L"", config["embedsettings"]["insertspace_policy"], config["embedsettings"]["keeprawtext"], false, config["embedsettings"]["limittextlength_use"] ? config["embedsettings"]["limittextlength_length"] : 0); Luna_EmbedSettings(pid, 1000 * config["embedsettings"]["timeout_translate"], 2, false, config["embedsettings"]["changefont"] ? (StringToWideString(config["embedsettings"]["changefont_font"]).data()) : L"", config["embedsettings"]["insertspace_policy"], config["embedsettings"]["keeprawtext"], false);
connectedpids.insert(pid); connectedpids.insert(pid);
}, },
[](DWORD pid) [](DWORD pid)