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

fix target selector check

Browse Source 
Fixed target selector check in some cases
Changed line endings from CRLF to LF
This commit is contained in:
zeheyler 2020-11-04 20:51:23 +03:00
parent 9bb7fbff06
commit 6958b22e68
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/devtoolsdeepltranslate.cpp
View File

@ -48,7 +48,7 @@ QStringList languagesFrom
"Spanish: es", "Spanish: es",
}; };
int docFound = -1, targetNodeId = -1, session = -1, pageEnabled = -1, userAgentFlag = -1, backup = -1, sourceLangId = -1; int docFound = -1, targetNodeId = -1, session = -1, pageEnabled = -1, userAgentFlag = -1, backup = -1, sourceLangId = -1, mobileShareId = -1;
long update = -1, callNumber = 0; long update = -1, callNumber = 0;
std::vector<long> callQueue; std::vector<long> callQueue;
@ -101,6 +101,7 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devT
docFound = -1; docFound = -1;
targetNodeId = -1; targetNodeId = -1;
sourceLangId = -1; sourceLangId = -1;
mobileShareId = -1;
pageEnabled = -1; pageEnabled = -1;
userAgentFlag = -1; userAgentFlag = -1;
update = -1; update = -1;
@ -153,7 +154,9 @@ 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; long target;
if (backup == -1) if (mobileShareId != -1 && backup == -1)
target = devTools->methodToReceive("DOM.attributeModified", { { "nodeId" , mobileShareId } , { "value" , "lmt__mobile_share_container lmt--mobile-hidden" } });
else if (mobileShareId == -1 && backup == -1)
target = devTools->methodToReceive("DOM.attributeModified", { { "value" , "lmt__mobile_share_container lmt--mobile-hidden" } }); target = devTools->methodToReceive("DOM.attributeModified", { { "value" , "lmt__mobile_share_container lmt--mobile-hidden" } });
else else
target = devTools->methodToReceive("DOM.childNodeCountUpdated"); target = devTools->methodToReceive("DOM.childNodeCountUpdated");
@ -217,6 +220,19 @@ std::pair<bool, std::wstring> Translate(const std::wstring& text, DevTools* devT
sourceLangId = root.value("result").toObject().value("nodeId").toInt(); sourceLangId = root.value("result").toObject().value("nodeId").toInt();
} }
// Get mobile share selector
if (mobileShareId == -1 && errorCode == 0)
{
if (!devTools->SendRequest("DOM.querySelector", { {"nodeId", docFound}, {"selector", "div.lmt__mobile_share_container"} }, root)
|| root.value("result").toObject().value("nodeId").toInt() == 0)
{
docFound = -1;
errorCode = 1;
}
else
mobileShareId = root.value("result").toObject().value("nodeId").toInt();
}
// Wait for the translation to appear on the web page // Wait for the translation to appear on the web page
timer = 0; timer = 0;
while (errorCode == 0 && !devTools->checkMethod(target) && timer < timerStop) while (errorCode == 0 && !devTools->checkMethod(target) && timer < timerStop)