Merge pull request #117 from pointhi/https_fix

Browse Source 
print error if https rewrite directory is not found, #116
This commit is contained in:
Adam Tauber 2014-10-19 21:48:53 +02:00
commit 5656fc472c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
searx/https_rewrite.py
View File

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