From 6219b37c39e2123d6ea1f460a8f0c4bf71c598d6 Mon Sep 17 00:00:00 2001 From: Yannis Rohloff Date: Sat, 4 Mar 2017 16:39:44 +0100 Subject: [PATCH 1/3] adblock: Don't show message if host-blocking-enabled is true Fixes #2364 --- qutebrowser/browser/adblock.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index b0a9962c6..1a7525372 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -154,6 +154,9 @@ class HostBlocker: def read_hosts(self): """Read hosts from the existing blocked-hosts file.""" + if not config.get('content', 'host-blocking-enabled'): + return + self._blocked_hosts = set() self._read_hosts_file(self._config_hosts_file, From 5d5652a24be25d67b862d329fa0c42fa84155f72 Mon Sep 17 00:00:00 2001 From: Yannis Rohloff Date: Sat, 4 Mar 2017 17:08:53 +0100 Subject: [PATCH 2/3] always read the host file --- qutebrowser/browser/adblock.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index 1a7525372..28340f6c3 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -154,8 +154,6 @@ class HostBlocker: def read_hosts(self): """Read hosts from the existing blocked-hosts file.""" - if not config.get('content', 'host-blocking-enabled'): - return self._blocked_hosts = set() @@ -168,7 +166,8 @@ class HostBlocker: if not found: args = objreg.get('args') if (config.get('content', 'host-block-lists') is not None and - args.basedir is None): + args.basedir is None and + config.get('content', 'host-blocking-enabled')): message.info("Run :adblock-update to get adblock lists.") @cmdutils.register(instance='host-blocker') From 79846433659faea6097eb66ff5a339159b6aa257 Mon Sep 17 00:00:00 2001 From: Yannis Rohloff Date: Sat, 4 Mar 2017 17:16:52 +0100 Subject: [PATCH 3/3] flake8 fails fixed --- qutebrowser/browser/adblock.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py index 28340f6c3..27fb50603 100644 --- a/qutebrowser/browser/adblock.py +++ b/qutebrowser/browser/adblock.py @@ -154,7 +154,6 @@ class HostBlocker: def read_hosts(self): """Read hosts from the existing blocked-hosts file.""" - self._blocked_hosts = set() self._read_hosts_file(self._config_hosts_file, @@ -166,7 +165,7 @@ class HostBlocker: if not found: args = objreg.get('args') if (config.get('content', 'host-block-lists') is not None and - args.basedir is None and + args.basedir is None and config.get('content', 'host-blocking-enabled')): message.info("Run :adblock-update to get adblock lists.")