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

Greasemonkey: Support greasemonkey-reload --force.

Browse Source 
Added a new argument to the greasemonkey-reload command to support
also re-downloading any `@required` scripts.
This commit is contained in:
Jimmy 2018-01-02 14:19:21 +13:00
parent b91e2e3267
commit 2307a0850f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qutebrowser/browser/greasemonkey.py
View File

@ -166,11 +166,15 @@ class GreasemonkeyManager(QObject):
@cmdutils.register(name='greasemonkey-reload', @cmdutils.register(name='greasemonkey-reload',
instance='greasemonkey') instance='greasemonkey')
def load_scripts(self): def load_scripts(self, force=False):
"""Re-read Greasemonkey scripts from disk. """Re-read Greasemonkey scripts from disk.
The scripts are read from a 'greasemonkey' subdirectory in The scripts are read from a 'greasemonkey' subdirectory in
qutebrowser's data directory (see `:version`). qutebrowser's data directory (see `:version`).
Args:
force: For any scripts that have required dependencies,
re-download them.
""" """
self._run_start = [] self._run_start = []
self._run_end = [] self._run_end = []
@ -191,7 +195,7 @@ class GreasemonkeyManager(QObject):
log.greasemonkey.debug( log.greasemonkey.debug(
"Deferring script until requirements are " "Deferring script until requirements are "
"fulfilled: {}".format(script.name)) "fulfilled: {}".format(script.name))
self._get_required_scripts(script) self._get_required_scripts(script, force)
else: else:
self._add_script(script) self._add_script(script)
@ -261,15 +265,14 @@ class GreasemonkeyManager(QObject):
self.scripts_reloaded.emit() self.scripts_reloaded.emit()
return True return True
def _get_required_scripts(self, script): def _get_required_scripts(self, script, force=False):
required_dls = [(url, self._required_url_to_file_path(url)) required_dls = [(url, self._required_url_to_file_path(url))
for url in script.requires] for url in script.requires]
required_dls = [(url, path) for (url, path) in required_dls if not force:
if not os.path.exists(path)] required_dls = [(url, path) for (url, path) in required_dls
if not os.path.exists(path)]
if not required_dls: if not required_dls:
# All the files exist so we don't have to deal with # All the required files exist already
# potentially not having a download manager yet
# TODO: Consider supporting force reloading.
self._add_script_with_requires(script, quiet=True) self._add_script_with_requires(script, quiet=True)
return return