searx

commit: 5656fc472c570c44bd2d971ab7862ac01ed6cf36
parent: 7be97597038078dc749b60ae8770af7abe1b8261
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sun, 19 Oct 2014 21:48:53 +0200

Merge pull request #117 from pointhi/https_fix

print error if https rewrite directory is not found, #116
Diffstat:
M
searx/https_rewrite.py
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/searx/https_rewrite.py b/searx/https_rewrite.py
@@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 import re
 from lxml import etree
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile, isdir, join
 
 
 # https://gitweb.torproject.org/\
@@ -120,9 +120,10 @@ def load_single_https_ruleset(filepath):
 
 # load all https rewrite rules
 def load_https_rules(rules_path):
-    # add / to path if not set yet
-    if rules_path[-1:] != '/':
-        rules_path += '/'
+    # check if directory exists
+    if not isdir(rules_path):
+        print("[E] directory not found: '" + rules_path + "'")
+        return
 
     # search all xml files which are stored in the https rule directory
     xml_files = [join(rules_path, f)