chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add backup check method

Browse Source 
Added backup check method in case the first method fails
This commit is contained in:
zeheyler 2020-10-29 02:08:11 +03:00
parent 93b8711bf8
commit 4b46057800
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/devtools.cpp
View File

@ -7,6 +7,8 @@ DevTools::DevTools(QObject* parent) :
status("Stopped"), status("Stopped"),
session(0) session(0)
{ {
connect(&webSocket, &QWebSocket::stateChanged, this, &DevTools::stateChanged);
connect(&webSocket, &QWebSocket::textMessageReceived, this, &DevTools::onTextMessageReceived);
} }
void DevTools::startDevTools(QString path, bool headless, int port) void DevTools::startDevTools(QString path, bool headless, int port)
@ -29,8 +31,6 @@ void DevTools::startDevTools(QString path, bool headless, int port)
{ {
useragent = doc.object().value("User-Agent").toString(); useragent = doc.object().value("User-Agent").toString();
} }
connect(&webSocket, &QWebSocket::stateChanged, this, &DevTools::stateChanged);
connect(&webSocket, &QWebSocket::textMessageReceived, this, &DevTools::onTextMessageReceived);
webSocket.open(webSocketDebuggerUrl); webSocket.open(webSocketDebuggerUrl);
session += 1; session += 1;
return; return;

15
extensions/devtoolsdeepltranslate.cpp
View File

@ -32,7 +32,7 @@ QStringList languages
"Spanish: es", "Spanish: es",
}; };
int docfound = -1, targetNodeId = -1, session = -1, pageenabled = -1, useragentflag = -1; int docfound = -1, targetNodeId = -1, session = -1, pageenabled = -1, useragentflag = -1, backup = -1;
long update = -1, callnumber = 0; long update = -1, callnumber = 0;
std::vector<long> callqueue; std::vector<long> callqueue;
@ -88,6 +88,7 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devt
useragentflag = -1; useragentflag = -1;
update = -1; update = -1;
callnumber = 0; callnumber = 0;
backup = -1;
} }
// Remove tags and reduce the number of ellipsis for correct translation // Remove tags and reduce the number of ellipsis for correct translation
@ -134,7 +135,11 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devt
// Set methods to receive // Set methods to receive
long navigate = devtools->methodToReceive("Page.navigatedWithinDocument"); long navigate = devtools->methodToReceive("Page.navigatedWithinDocument");
long target = devtools->methodToReceive("DOM.attributeModified", { { "value" , "lmt__mobile_share_container" } }); long target;
if (backup == -1)
target = devtools->methodToReceive("DOM.attributeModified", { { "value" , "lmt__mobile_share_container lmt--mobile-hidden" } });
else
target = devtools->methodToReceive("DOM.childNodeCountUpdated");
if (update == -1) if (update == -1)
update = devtools->methodToReceive("DOM.documentUpdated"); update = devtools->methodToReceive("DOM.documentUpdated");
@ -204,8 +209,8 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devt
{ {
// Try to catch the notification // Try to catch the notification
int noteNodeId = -1; int noteNodeId = -1;
if (errorcode == 0 && !devtools->SendRequest("DOM.querySelector", { {"nodeId", docfound}, {"selector", "div.lmt__system_notification"} }, root) if (errorcode == 0 && (!devtools->SendRequest("DOM.querySelector", { {"nodeId", docfound}, {"selector", "div.lmt__system_notification"} }, root)
|| root.value("result").toObject().value("nodeId").toInt() == 0) || root.value("result").toObject().value("nodeId").toInt() == 0) && timer >= timer_stop)
{ {
errorcode = 2; errorcode = 2;
} }
@ -221,6 +226,8 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devt
} }
OuterHTML.remove(QRegExp("<[^>]*>")); OuterHTML.remove(QRegExp("<[^>]*>"));
OuterHTML = OuterHTML.trimmed(); OuterHTML = OuterHTML.trimmed();
if (backup == -1 && errorcode == 0 && timer >= timer_stop)
backup = 1;
// Check if the translator output language does not match the selected language // Check if the translator output language does not match the selected language
QString targetlang; QString targetlang;