From eb697554a3238bb3f69e862fdfaf754ffeb888ff Mon Sep 17 00:00:00 2001 From: Chenx221 Date: Thu, 5 Sep 2024 14:57:16 +0800 Subject: [PATCH] Revert "translatewrapper: regex lineedit doesn't translate sentence on a full match" This reverts commit 24a199a8c44244b4cfd83d4e17142f58b4ac6eef. --- extensions/bingtranslate.cpp | 1 - extensions/deepltranslate.cpp | 1 - extensions/devtoolsdeepltranslate.cpp | 1 - extensions/devtoolspapagotranslate.cpp | 1 - extensions/devtoolssystrantranslate.cpp | 1 - extensions/googletranslate.cpp | 1 - extensions/translatewrapper.cpp | 21 --------------------- text.cpp | 2 -- 8 files changed, 29 deletions(-) diff --git a/extensions/bingtranslate.cpp b/extensions/bingtranslate.cpp index 0cb09ea..2722b85 100644 --- a/extensions/bingtranslate.cpp +++ b/extensions/bingtranslate.cpp @@ -194,7 +194,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = false, useRateLimiter = true, rateLimitSelected = false, useCache = true, useFilter = true; int tokenCount = 30, rateLimitTimespan = 60000, maxSentenceSize = 1000; -std::wstring dontTranslateIfMatch = L""; std::pair Translate(const std::wstring& text, TranslationParam tlp) { diff --git a/extensions/deepltranslate.cpp b/extensions/deepltranslate.cpp index 94b05bb..a20fd88 100644 --- a/extensions/deepltranslate.cpp +++ b/extensions/deepltranslate.cpp @@ -105,7 +105,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = true, useRateLimiter = true, rateLimitSelected = true, useCache = true, useFilter = true; int tokenCount = 10, rateLimitTimespan = 60000, maxSentenceSize = 1000; -std::wstring dontTranslateIfMatch = L""; enum KeyType { CAT, REST }; int keyType = REST; diff --git a/extensions/devtoolsdeepltranslate.cpp b/extensions/devtoolsdeepltranslate.cpp index 77516a6..7ec6b79 100644 --- a/extensions/devtoolsdeepltranslate.cpp +++ b/extensions/devtoolsdeepltranslate.cpp @@ -115,7 +115,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = true, useRateLimiter = true, rateLimitSelected = false, useCache = true, useFilter = true; int tokenCount = 30, rateLimitTimespan = 60000, maxSentenceSize = 2500; -std::wstring dontTranslateIfMatch = L""; BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { diff --git a/extensions/devtoolspapagotranslate.cpp b/extensions/devtoolspapagotranslate.cpp index 22fca47..0934008 100644 --- a/extensions/devtoolspapagotranslate.cpp +++ b/extensions/devtoolspapagotranslate.cpp @@ -48,7 +48,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = true, useRateLimiter = true, rateLimitSelected = false, useCache = true, useFilter = true; int tokenCount = 30, rateLimitTimespan = 60000, maxSentenceSize = 2500; -std::wstring dontTranslateIfMatch = L""; BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { diff --git a/extensions/devtoolssystrantranslate.cpp b/extensions/devtoolssystrantranslate.cpp index e0d29ab..70bfda0 100644 --- a/extensions/devtoolssystrantranslate.cpp +++ b/extensions/devtoolssystrantranslate.cpp @@ -115,7 +115,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = true, useRateLimiter = true, rateLimitSelected = false, useCache = true, useFilter = true; int tokenCount = 30, rateLimitTimespan = 60000, maxSentenceSize = 2500; -std::wstring dontTranslateIfMatch = L""; BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { diff --git a/extensions/googletranslate.cpp b/extensions/googletranslate.cpp index af26784..26d8d41 100644 --- a/extensions/googletranslate.cpp +++ b/extensions/googletranslate.cpp @@ -234,7 +234,6 @@ extern const std::unordered_map codes bool translateSelectedOnly = false, useRateLimiter = true, rateLimitSelected = false, useCache = true, useFilter = true; int tokenCount = 30, rateLimitTimespan = 60000, maxSentenceSize = 1000; -std::wstring dontTranslateIfMatch = L""; std::pair Translate(const std::wstring& text, TranslationParam tlp) { diff --git a/extensions/translatewrapper.cpp b/extensions/translatewrapper.cpp index b04a647..77e8fd5 100644 --- a/extensions/translatewrapper.cpp +++ b/extensions/translatewrapper.cpp @@ -17,7 +17,6 @@ extern const char* FILTER_GARBAGE; extern const char* MAX_TRANSLATIONS_IN_TIMESPAN; extern const char* TIMESPAN; extern const char* MAX_SENTENCE_SIZE; -extern const char* DONT_TRANSLATE_IF_MATCH; extern const char* API_KEY; extern const wchar_t* SENTENCE_TOO_LARGE_TO_TRANS; extern const wchar_t* TRANSLATION_ERROR; @@ -28,7 +27,6 @@ extern const char* GET_API_KEY_FROM; extern const QStringList languagesTo, languagesFrom; extern bool translateSelectedOnly, useRateLimiter, rateLimitSelected, useCache, useFilter; extern int tokenCount, rateLimitTimespan, maxSentenceSize; -extern std::wstring dontTranslateIfMatch; std::pair Translate(const std::wstring& text, TranslationParam tlp); QFormLayout* display; @@ -120,14 +118,6 @@ public: display->addRow(label, spinBox); connect(spinBox, qOverload(&QSpinBox::valueChanged), [label, &value](int newValue) { settings.setValue(label, value = newValue); }); } - - auto matchEdit = new QLineEdit(settings.value(DONT_TRANSLATE_IF_MATCH).toString(), this); - dontTranslateIfMatch = S(matchEdit->text()); - QObject::connect(matchEdit, &QLineEdit::textChanged, [](QString match) { settings.setValue(DONT_TRANSLATE_IF_MATCH, S(dontTranslateIfMatch = S(match))); }); - auto matchLabel = new QLabel(QString("%1 (regex)").arg(DONT_TRANSLATE_IF_MATCH), this); - matchLabel->setOpenExternalLinks(true); - display->addRow(matchLabel, matchEdit); - if (GET_API_KEY_FROM) { auto keyEdit = new QLineEdit(settings.value(API_KEY).toString(), this); @@ -192,17 +182,6 @@ bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo) sentence.erase(std::remove_if(sentence.begin(), sentence.end(), [](wchar_t ch) { return ch < ' ' && ch != '\n'; }), sentence.end()); } if (sentence.empty()) return true; - - try - { - if (!dontTranslateIfMatch.empty() && std::regex_match(sentence, std::wregex(dontTranslateIfMatch))) - { - sentence += L"\x200b \n" + sentence; - return true; - } - } catch (...) {} - - if (sentence.size() > maxSentenceSize) translation = SENTENCE_TOO_LARGE_TO_TRANS; if (useCache) { auto translationCache = ::translationCache.Acquire(); diff --git a/text.cpp b/text.cpp index c36d743..fd150bc 100644 --- a/text.cpp +++ b/text.cpp @@ -160,7 +160,6 @@ const wchar_t* ERROR_START_CHROME = L"failed to start Chrome or to connect to it const char* EXTRA_WINDOW_INFO = u8R"(Right click to change settings Click and drag on window edges to move, or the bottom right corner to resize)"; const char* MAX_SENTENCE_SIZE = u8"Max sentence size"; -const char* DONT_TRANSLATE_IF_MATCH = u8"Don't translate if match full"; const char* TOPMOST = u8"Always on top"; const char* DICTIONARY = u8"Dictionary"; const char* DICTIONARY_INSTRUCTIONS = u8R"(This file is used only for the "Dictionary" feature of the Extra Window extension. @@ -922,7 +921,6 @@ esempio: Textractor -p4466 -p"My Game.exe" sta tentando di inniettare i processi EXTRA_WINDOW_INFO = u8R"(Tasto destro per cambiare le impostazioni Clicca e trascina i bordi della finestra per muoverla, oppure nell'angolo in basso a destra per ridimensionare)"; MAX_SENTENCE_SIZE = u8"Dimensione massima sentenza"; - DONT_TRANSLATE_IF_MATCH = u8"Non traduce se corrisponde completamente"; TOPMOST = u8"Sempre in primo piano"; DICTIONARY = u8"Dizionario"; DICTIONARY_INSTRUCTIONS = u8R"(Questo file รจ utilizzato solo per la funzione "Dizionario" dell'estenzione Extra Window.