Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

GreaseMonkey: Use QtWebEngine's handling of include/exclude/match rules

Browse Source
This commit is contained in:
David Rosca 2017-04-19 15:53:27 +02:00
parent 166fe13747
commit a2e02a8922
1 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/plugins/GreaseMonkey/gm_script.cpp
View File

@ -127,26 +127,10 @@ QString GM_Script::fileName() const
QWebEngineScript GM_Script::webScript() const QWebEngineScript GM_Script::webScript() const
{ {
QWebEngineScript::InjectionPoint injectionPoint;
switch (startAt()) {
case DocumentStart:
injectionPoint = QWebEngineScript::DocumentCreation;
break;
case DocumentEnd:
injectionPoint = QWebEngineScript::DocumentReady;
break;
case DocumentIdle:
injectionPoint = QWebEngineScript::Deferred;
break;
default:
Q_UNREACHABLE();
}
QWebEngineScript script; QWebEngineScript script;
script.setSourceCode(QSL("%1\n%2").arg(m_manager->bootstrapScript(), m_script)); script.setSourceCode(QSL("%1\n%2").arg(m_manager->bootstrapScript(), m_script));
script.setName(fullName()); script.setName(fullName());
script.setWorldId(QWebEngineScript::MainWorld); script.setWorldId(QWebEngineScript::MainWorld);
script.setInjectionPoint(injectionPoint);
script.setRunsOnSubFrames(!m_noframes); script.setRunsOnSubFrames(!m_noframes);
return script; return script;
} }
@ -184,28 +168,6 @@ void GM_Script::watchedFileChanged(const QString &file)
} }
} }
static QString toJavaScriptList(const QStringList &patterns)
{
QString out;
foreach (const QString &pattern, patterns) {
QString p;
if (pattern.startsWith(QL1C('/')) && pattern.endsWith(QL1C('/')) && pattern.size() > 1) {
p = pattern.mid(1, pattern.size() - 2);
} else {
p = pattern;
p.replace(QL1S("."), QL1S("\\."));
p.replace(QL1S("*"), QL1S(".*"));
}
p = QSL("'%1'").arg(p);
if (out.isEmpty()) {
out.append(p);
} else {
out.append(QL1C(',') + p);
}
}
return QSL("[%1]").arg(out);
}
void GM_Script::parseScript() void GM_Script::parseScript()
{ {
m_name.clear(); m_name.clear();
@ -312,26 +274,7 @@ void GM_Script::parseScript()
const QString nspace = QCryptographicHash::hash(fullName().toUtf8(), QCryptographicHash::Md4).toHex(); const QString nspace = QCryptographicHash::hash(fullName().toUtf8(), QCryptographicHash::Md4).toHex();
const QString gmValues = m_manager->valuesScript().arg(nspace); const QString gmValues = m_manager->valuesScript().arg(nspace);
const QString runCheck = QString(QL1S("for (var value of %1) {" m_script = QSL("(function(){%1\n%2\n%3\n})();").arg(gmValues, m_manager->requireScripts(m_require), fileData);
" var re = new RegExp(value);"
" if (re.test(window.location.href)) {"
" return;"
" }"
"}"
"__qz_includes = false;"
"for (var value of %2) {"
" var re = new RegExp(value);"
" if (re.test(window.location.href)) {"
" __qz_includes = true;"
" break;"
" }"
"}"
"if (!__qz_includes) {"
" return;"
"}"
"delete __qz_includes;")).arg(toJavaScriptList(m_exclude), toJavaScriptList(m_include));
m_script = QSL("(function(){%1\n%2\n%3\n%4\n})();").arg(runCheck, gmValues, m_manager->requireScripts(m_require), fileData);
m_valid = true; m_valid = true;
downloadRequires(); downloadRequires();