Browse Source

improve https rewrite code

Thomas Pointhuber 10 years ago
parent
commit
bb126da0fb
2 changed files with 10 additions and 4 deletions
  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):
 
 
         # append ruleset
         # append ruleset
         https_rules.append(ruleset)
         https_rules.append(ruleset)
+        
+    print(' * {n} https-rules loaded'.format(n=len(https_rules)))

+ 8 - 4
searx/webapp.py

@@ -224,10 +224,14 @@ def index():
 
 
                     # process rules
                     # process rules
                     for rule in rules:
                     for rule in rules:
-                        # TODO, precompile rule
-                        p = re.compile(rule[0])
-                        # rewrite url if possible
-                        new_result_url = p.sub(rule[1], result['url'])
+                        try:
+                            # TODO, precompile rule
+                            p = re.compile(rule[0])
+                            
+                            # rewrite url if possible
+                            new_result_url = p.sub(rule[1], result['url'])
+                        except:
+                            break
 
 
                         # parse new url
                         # parse new url
                         new_parsed_url = urlparse(new_result_url)
                         new_parsed_url = urlparse(new_result_url)