integrate with devtools refactor and remove unneeded code

extensions/devtoolspapagotranslate.cpp

@@ -1,21 +1,10 @@
 #include "qtcommon.h"
 #include "devtools.h"
-#include <QFileDialog>
-#include <QMouseEvent>
-#include <ShlObj.h>
 
-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<std::wstring> translateTo, translateFrom;
-extern QFormLayout* display;
-extern Settings settings;
 
 const char* TRANSLATION_PROVIDER = "DevTools Papago Translate";
 const char* GET_API_KEY_FROM = nullptr;
@@ -24,7 +13,7 @@ int tokenCount = 30, tokenRestoreDelay = 60000, maxSentenceSize = 2500;
 
 QStringList languages
 {
-	"Chinese (Simplified): zh-CN",
+	"Chinese (simplified): zh-CN",
 	"Chinese (traditional): zt-TW",
 	"English: en",
 	"French: fr",
@@ -42,103 +31,13 @@ QStringList languages
 };
 std::wstring autoDetectLanguage = L"auto";
 
-QStringList languagesTo
-{
-	"Chinese (Simplified): zh-CN",
-	"Chinese (traditional): zt-TW",
-	"English: en",
-	"French: fr",
-	"German: de",
-	"Hindi: hi",
-	"Indonesian: id",
-	"Italian: it",
-	"Japanese: ja",
-	"Korean: ko",
-	"Portuguese: pt",
-	"Russian: ru",
-	"Spanish: es",
-	"Thai: th",
-	"Vietnamese: vi",
-};
-
 BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
 	switch (ul_reason_for_call)
 	{
 	case DLL_PROCESS_ATTACH:
 	{
-		QString chromePath = settings.value(CHROME_LOCATION).toString();
+		DevTools::Start();
-		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<QMouseEvent*>(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);
 	}
 	break;
 	case DLL_PROCESS_DETACH:
@@ -156,15 +55,10 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text)
 	// DevTools can't handle concurrent translations yet
 	static std::mutex translationMutex;
 	std::scoped_lock lock(translationMutex);
-
 	DevTools::SendRequest("Page.navigate", FormatString(LR"({"url":"https://papago.naver.com/?sk=%s&tk=%s&st=%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('#txtTarget').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 };
 }