rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address second round line comments.

Browse Source 
Add qute version to GM_info object in GM wrapper.
Support using the greasemonkey @namespace metadata for its intended
purpose of avoiding name collisions.
Get a nice utf8 encoded string from a QUrl more better.
This commit is contained in:
Jimmy 2017-10-10 20:45:10 +13:00
parent efde31aa57
commit fb019b2dab
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/browser/greasemonkey.py
View File

@ -27,7 +27,7 @@ import functools
import glob
import attr
from PyQt5.QtCore import pyqtSignal, QObject
from PyQt5.QtCore import pyqtSignal, QObject, QUrl
from qutebrowser.utils import log, standarddir, jinja
from qutebrowser.commands import cmdutils
@ -47,10 +47,13 @@ class GreasemonkeyScript:
self.excludes = []
self.description = None
self.name = None
self.namespace = None
self.run_at = None
for name, value in properties:
if name == 'name':
self.name = value
elif name == 'namespace':
self.namespace = value
elif name == 'description':
self.description = value
elif name in ['include', 'match']:
@ -93,7 +96,7 @@ class GreasemonkeyScript:
"""
return jinja.js_environment.get_template(
'greasemonkey_wrapper.js').render(
scriptName=self.name,
scriptName="/".join([self.namespace or '', self.name]),
scriptInfo=self._meta_json(),
scriptMeta=self.script_meta,
scriptSource=self._code)
@ -184,7 +187,7 @@ class GreasemonkeyManager(QObject):
if url.scheme() not in self.greaseable_schemes:
return MatchingScripts(url, [], [], [])
match = functools.partial(fnmatch.fnmatch,
str(url.toEncoded(), 'utf-8'))
url.toString(QUrl.FullyEncoded))
tester = (lambda script:
any([match(pat) for pat in script.includes]) and
not any([match(pat) for pat in script.excludes]))

22
qutebrowser/javascript/greasemonkey_wrapper.js
View File

@ -5,15 +5,19 @@
console.log(text);
}
var GM_info = (function () {
return {
'script': {{ scriptInfo | tojson }},
'scriptMetaStr': {{ scriptMeta | tojson }},
'scriptWillUpdate': false,
'version': '0.0.1',
'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
};
}());
var GM_info = {
'script': {{ scriptInfo }},
'scriptMetaStr': {{ scriptMeta | tojson }},
'scriptWillUpdate': false,
'version': "0.0.1",
'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
};
function checkKey(key, funcName) {
if (typeof key !== "string") {
throw new Error(funcName+" requires the first parameter to be of type string, not '"+typeof key+"'");
}
}
function GM_setValue(key, value) {
if (typeof key !== "string") {