浏览代码

improve https rewrite code

Thomas Pointhuber 10 年前
父节点
当前提交
bb126da0fb
共有 2 个文件被更改,包括 10 次插入4 次删除
  1. 2
    0
      searx/https_rewrite.py
  2. 8
    4
      searx/webapp.py

+ 2
- 0
searx/https_rewrite.py 查看文件

@@ -137,3 +137,5 @@ def load_https_rules(rules_path):
137 137
 
138 138
         # append ruleset
139 139
         https_rules.append(ruleset)
140
+        
141
+    print(' * {n} https-rules loaded'.format(n=len(https_rules)))

+ 8
- 4
searx/webapp.py 查看文件

@@ -224,10 +224,14 @@ def index():
224 224
 
225 225
                     # process rules
226 226
                     for rule in rules:
227
-                        # TODO, precompile rule
228
-                        p = re.compile(rule[0])
229
-                        # rewrite url if possible
230
-                        new_result_url = p.sub(rule[1], result['url'])
227
+                        try:
228
+                            # TODO, precompile rule
229
+                            p = re.compile(rule[0])
230
+                            
231
+                            # rewrite url if possible
232
+                            new_result_url = p.sub(rule[1], result['url'])
233
+                        except:
234
+                            break
231 235
 
232 236
                         # parse new url
233 237
                         new_parsed_url = urlparse(new_result_url)