git.iko.soy/searx
on master help sign in
improve https rewrite code
bb126daThomas Pointhuber
searx/https_rewrite.py+2
compare with master
unifiedsplit
@@ -137,3 +137,5 @@ def load_https_rules(rules_path):
137
137
138 # append ruleset
138 # append ruleset
139 https_rules.append(ruleset)
139 https_rules.append(ruleset)
140+
141+ print(' * {n} https-rules loaded'.format(n=len(https_rules)))
searx/webapp.py+8−4
@@ -224,10 +224,14 @@ def index():
224
224
225 # process rules
225 # process rules
226 for rule in rules:
226 for rule in rules:
227+ try:
227− # TODO, precompile rule
228+ # TODO, precompile rule
228− p = re.compile(rule[0])
229+ p = re.compile(rule[0])
230+
229− # rewrite url if possible
231+ # rewrite url if possible
230− new_result_url = p.sub(rule[1], result['url'])
232+ new_result_url = p.sub(rule[1], result['url'])
233+ except:
234+ break
231
235
232 # parse new url
236 # parse new url
233 new_parsed_url = urlparse(new_result_url)
237 new_parsed_url = urlparse(new_result_url)