on master help sign in
Merge pull request #117 from pointhi/https_fix
5656fc4Adam Tauber
searx/https_rewrite.py+5−4
@@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
18import re
18import re
19from lxml import etree
19from lxml import etree
20from os import listdir
20from os import listdir
21−from os.path import isfile, join
21+from os.path import isfile, isdir, join
22
22
23
23
24# https://gitweb.torproject.org/\
24# https://gitweb.torproject.org/\
@@ -120,9 +120,10 @@ def load_single_https_ruleset(filepath):
120
120
121# load all https rewrite rules
121# load all https rewrite rules
122def load_https_rules(rules_path):
122def load_https_rules(rules_path):
123− # add / to path if not set yet
123+ # check if directory exists
124− if rules_path[-1:] != '/':
124+ if not isdir(rules_path):
125− rules_path += '/'
125+ print("[E] directory not found: '" + rules_path + "'")
126+ return
126
127
127 # search all xml files which are stored in the https rule directory
128 # search all xml files which are stored in the https rule directory
128 xml_files = [join(rules_path, f)
129 xml_files = [join(rules_path, f)