From 2cf146652d9eff57a93e8a55e61339adb2b0e58a Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sat, 5 Jun 2021 09:36:07 -0600 Subject: [PATCH] integrate with devtools refactor and remove unneeded code --- extensions/CMakeLists.txt | 6 -- extensions/devtoolssystrantranslate.cpp | 101 +----------------------- 2 files changed, 2 insertions(+), 105 deletions(-) diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index a194e6d..fc346dc 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -59,10 +59,4 @@ if (NOT EXISTS ${CMAKE_FINAL_OUTPUT_DIRECTORY}/Qt5WebSockets.dll AND NOT EXISTS COMMAND set PATH=%PATH%$${qt5_install_prefix}/bin COMMAND Qt5::windeployqt --dir ${CMAKE_FINAL_OUTPUT_DIRECTORY} "${CMAKE_FINAL_OUTPUT_DIRECTORY}/DevTools\ DeepL\ Translate.dll" ) - add_custom_command(TARGET DevTools\ Systran\ Translate - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/windeployqt" - COMMAND set PATH=%PATH%$${qt5_install_prefix}/bin - COMMAND Qt5::windeployqt --dir ${CMAKE_FINAL_OUTPUT_DIRECTORY} "${CMAKE_FINAL_OUTPUT_DIRECTORY}/DevTools\ Systran\ Translate.dll" - ) endif() diff --git a/extensions/devtoolssystrantranslate.cpp b/extensions/devtoolssystrantranslate.cpp index 5afb98b..6f158c4 100644 --- a/extensions/devtoolssystrantranslate.cpp +++ b/extensions/devtoolssystrantranslate.cpp @@ -1,17 +1,8 @@ #include "qtcommon.h" #include "devtools.h" -#include -#include -#include -extern const wchar_t* TRANSLATION_ERROR; -extern const char* CHROME_LOCATION; -extern const char* START_DEVTOOLS; -extern const char* STOP_DEVTOOLS; -extern const char* HEADLESS_MODE; -extern const char* DEVTOOLS_STATUS; -extern const char* AUTO_START; extern const wchar_t* ERROR_START_CHROME; +extern const wchar_t* TRANSLATION_ERROR; extern Synchronized translateTo, translateFrom; extern QFormLayout* display; @@ -20,7 +11,6 @@ extern Settings settings; const char* TRANSLATION_PROVIDER = "DevTools Systran Translate"; const char* GET_API_KEY_FROM = nullptr; bool translateSelectedOnly = true, rateLimitAll = false, rateLimitSelected = false, useCache = true, useFilter = true; -bool firstTranslation = true; int tokenCount = 30, tokenRestoreDelay = 60000, maxSentenceSize = 2500; QStringList languages @@ -45,78 +35,7 @@ BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved { case DLL_PROCESS_ATTACH: { - QString chromePath = settings.value(CHROME_LOCATION).toString(); - wchar_t programFiles[MAX_PATH + 100] = {}; - if (chromePath.isEmpty()) for (auto folder : { CSIDL_PROGRAM_FILESX86, CSIDL_PROGRAM_FILES, CSIDL_LOCAL_APPDATA }) - { - SHGetFolderPathW(NULL, folder, NULL, SHGFP_TYPE_CURRENT, programFiles); - wcscat_s(programFiles, L"/Google/Chrome/Application/chrome.exe"); - if (std::filesystem::exists(programFiles)) chromePath = S(programFiles); - } - auto chromePathEdit = new QLineEdit(chromePath); - static struct : QObject - { - bool eventFilter(QObject* object, QEvent* event) - { - if (auto mouseEvent = dynamic_cast(event)) - if (mouseEvent->button() == Qt::LeftButton) - if (QString chromePath = QFileDialog::getOpenFileName(nullptr, TRANSLATION_PROVIDER, "/", "Chrome (*.exe)"); !chromePath.isEmpty()) - ((QLineEdit*)object)->setText(chromePath); - return false; - } - } chromeSelector; - chromePathEdit->installEventFilter(&chromeSelector); - QObject::connect(chromePathEdit, &QLineEdit::textChanged, [chromePathEdit](QString path) { settings.setValue(CHROME_LOCATION, path); }); - display->addRow(CHROME_LOCATION, chromePathEdit); - auto statusLabel = new QLabel("Stopped"); - auto startButton = new QPushButton(START_DEVTOOLS), stopButton = new QPushButton(STOP_DEVTOOLS); - auto headlessCheck = new QCheckBox(); - headlessCheck->setChecked(settings.value(HEADLESS_MODE, true).toBool()); - QObject::connect(headlessCheck, &QCheckBox::clicked, [](bool headless) { settings.setValue(HEADLESS_MODE, headless); }); - QObject::connect(startButton, &QPushButton::clicked, [statusLabel, chromePathEdit, headlessCheck] - { - DevTools::Start( - S(chromePathEdit->text()), - [statusLabel](QString status) - { - QMetaObject::invokeMethod(statusLabel, std::bind(&QLabel::setText, statusLabel, status)); - if (status == "ConnectedState") std::thread([] - { - if (HttpRequest httpRequest{ - L"Mozilla/5.0 Textractor", - L"127.0.0.1", - L"POST", - L"/json/version", - "", - NULL, - 9222, - NULL, - WINHTTP_FLAG_ESCAPE_DISABLE - }) - if (auto userAgent = Copy(JSON::Parse(httpRequest.response)[L"User-Agent"].String())) - if (userAgent->find(L"Headless") != std::string::npos) - DevTools::SendRequest( - "Network.setUserAgentOverride", - FormatString(LR"({"userAgent":"%s"})", userAgent->replace(userAgent->find(L"Headless"), 8, L"")) - ); - }).detach(); - }, - headlessCheck->isChecked() - ); - }); - QObject::connect(stopButton, &QPushButton::clicked, &DevTools::Close); - auto buttons = new QHBoxLayout(); - buttons->addWidget(startButton); - buttons->addWidget(stopButton); - display->addRow(HEADLESS_MODE, headlessCheck); - auto autoStartCheck = new QCheckBox(); - autoStartCheck->setChecked(settings.value(AUTO_START, false).toBool()); - QObject::connect(autoStartCheck, &QCheckBox::clicked, [](bool autoStart) { settings.setValue(AUTO_START, autoStart); }); - display->addRow(AUTO_START, autoStartCheck); - display->addRow(buttons); - statusLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken); - display->addRow(DEVTOOLS_STATUS, statusLabel); - if (autoStartCheck->isChecked()) QMetaObject::invokeMethod(startButton, &QPushButton::click, Qt::QueuedConnection); + DevTools::Start(); } break; case DLL_PROCESS_DETACH: @@ -134,27 +53,11 @@ std::pair Translate(const std::wstring& text) // DevTools can't handle concurrent translations yet static std::mutex translationMutex; std::scoped_lock lock(translationMutex); - if (firstTranslation) { - firstTranslation = false; - DevTools::SendRequest("Page.navigate", FormatString(LR"({"url":"https://translate.systran.net"})")); - for (int retry = 0; ++retry < 100; Sleep(100)) - if (auto translation = Copy(DevTools::SendRequest("Runtime.evaluate", - LR"({"expression":"document.querySelector('#translationTools').innerHTML.trim() ","returnByValue":true})" - )[L"result"][L"value"].String())) if (!translation->empty()) break; - DevTools::SendRequest("Runtime.evaluate", FormatString(LR"({"expression":" - //document.waitForSelector('#target-dummydiv'); - document.querySelector('#cookieChoiceDismiss').click(); - "})")); - } DevTools::SendRequest("Page.navigate", FormatString(LR"({"url":"https://translate.systran.net/?&source=%s&target=%s&input=%s"})", translateFrom.Copy(), translateTo.Copy(), Escape(text))); - for (int retry = 0; ++retry < 100; Sleep(100)) if (auto translation = Copy(DevTools::SendRequest("Runtime.evaluate", LR"({"expression":"document.querySelector('#outputEditor').textContent.trim() ","returnByValue":true})" )[L"result"][L"value"].String())) if (!translation->empty()) return { true, translation.value() }; - if (auto errorMessage = Copy(DevTools::SendRequest("Runtime.evaluate", - LR"({"expression":"document.querySelector('div.lmt__system_notification').innerHTML","returnByValue":true})" - )[L"result"][L"value"].String())) return { false, FormatString(L"%s: %s", TRANSLATION_ERROR, errorMessage.value()) }; return { false, TRANSLATION_ERROR }; }