c0bb89f · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

Merge pull request #816 from dalf/debian

c0bb89fAdam Tauber9 years ago

searx/__init__.py+18−7

compare with master

unifiedsplit

@@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

18import certifi

19import logging

20from os import environ

21−from os.path import realpath, dirname, join, abspath

21+from os.path import realpath, dirname, join, abspath, isfile

22from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION

23try:

24 from yaml import load

@@ -30,13 +30,24 @@ except:

30searx_dir = abspath(dirname(__file__))

31engine_dir = dirname(realpath(__file__))

33−# if possible set path to settings using the

33+

34−# enviroment variable SEARX_SETTINGS_PATH

34+def check_settings_yml(file_name):

35+ if isfile(file_name):

36+ return file_name

37+ else:

38+ return None

39+

40+# find location of settings.yml

35if 'SEARX_SETTINGS_PATH' in environ:

41if 'SEARX_SETTINGS_PATH' in environ:

42+ # if possible set path to settings using the

43+ # enviroment variable SEARX_SETTINGS_PATH

36− settings_path = environ['SEARX_SETTINGS_PATH']

44+ settings_path = check_settings_yml(environ['SEARX_SETTINGS_PATH'])

37−# otherwise using default path

38else:

45else:

46+ # if not, get it from searx code base or last solution from /etc/searx

39− settings_path = join(searx_dir, 'settings.yml')

47+ settings_path = check_settings_yml(join(searx_dir, 'settings.yml')) or check_settings_yml('/etc/searx/settings.yml')

48+

49+if not settings_path:

50+ raise Exception('settings.yml not found')

41# load settings

52# load settings

42with open(settings_path) as settings_yaml:

53with open(settings_path) as settings_yaml:

@@ -67,7 +78,7 @@ else:

67 logging.basicConfig(level=logging.WARNING)

78 logging.basicConfig(level=logging.WARNING)

69logger = logging.getLogger('searx')

80logger = logging.getLogger('searx')

70−

81+logger.debug('read configuration from %s', settings_path)

71# Workaround for openssl versions <1.0.2

82# Workaround for openssl versions <1.0.2

72# https://github.com/certifi/python-certifi/issues/26

83# https://github.com/certifi/python-certifi/issues/26

73if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2):

84if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2):

searx/settings.yml+2−1

@@ -16,7 +16,8 @@ server:

16 http_protocol_version : "1.0" # 1.0 and 1.1 are supported

18ui:

19+ static_path : "" # Custom static path - leave it blank if you didn't change

19− themes_path : "" # Custom ui themes path - leave it blank if you didn't change

20+ templates_path : "" # Custom templates path - leave it blank if you didn't change

20 default_theme : oscar # ui theme

21 default_theme : oscar # ui theme

21 default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section

22 default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section

searx/settings_robot.yml+2−1

@@ -16,7 +16,8 @@ server:

16 http_protocol_version : "1.0"

18ui:

19− themes_path : ""

19+ static_path : ""

20+ templates_path : ""

20 default_theme : oscar

21 default_theme : oscar

21 default_locale : ""

22 default_locale : ""

searx/utils.py+18−16

@@ -178,37 +178,39 @@ class UnicodeWriter:

178 self.writerow(row)

179

180

181−def get_themes(root):

181+def get_resources_directory(searx_directory, subdirectory, resources_directory):

182− """Returns available themes list."""

182+ if not resources_directory:

183+ resources_directory = os.path.join(searx_directory, subdirectory)

184+ if not os.path.isdir(resources_directory):

185+ raise Exception(directory + " is not a directory")

186+ return resources_directory

183

187

184− static_path = os.path.join(root, 'static')

185− templates_path = os.path.join(root, 'templates')

186

188

189+def get_themes(templates_path):

190+ """Returns available themes list."""

187− themes = os.listdir(os.path.join(static_path, 'themes'))

191+ themes = os.listdir(templates_path)

188 if '__common__' in themes:

192 if '__common__' in themes:

189 themes.remove('__common__')

193 themes.remove('__common__')

190− return static_path, templates_path, themes

194+ return themes

191

195

192

196

193−def get_static_files(base_path):

197+def get_static_files(static_path):

194− base_path = os.path.join(base_path, 'static')

195 static_files = set()

198 static_files = set()

196− base_path_length = len(base_path) + 1

199+ static_path_length = len(static_path) + 1

197− for directory, _, files in os.walk(base_path):

200+ for directory, _, files in os.walk(static_path):

198 for filename in files:

201 for filename in files:

199− f = os.path.join(directory[base_path_length:], filename)

202+ f = os.path.join(directory[static_path_length:], filename)

200 static_files.add(f)

203 static_files.add(f)

201 return static_files

204 return static_files

202

205

203

206

204−def get_result_templates(base_path):

207+def get_result_templates(templates_path):

205− base_path = os.path.join(base_path, 'templates')

206 result_templates = set()

208 result_templates = set()

207− base_path_length = len(base_path) + 1

209+ templates_path_length = len(templates_path) + 1

208− for directory, _, files in os.walk(base_path):

210+ for directory, _, files in os.walk(templates_path):

209 if directory.endswith('result_templates'):

211 if directory.endswith('result_templates'):

210 for filename in files:

212 for filename in files:

211− f = os.path.join(directory[base_path_length:], filename)

213+ f = os.path.join(directory[templates_path_length:], filename)

212 result_templates.add(f)

214 result_templates.add(f)

213 return result_templates

215 return result_templates

214

216

searx/webapp.py+19−18

@@ -56,9 +56,9 @@ from searx.engines import (

56 categories, engines, engine_shortcuts, get_engines_stats, initialize_engines

57)

58from searx.utils import (

59− UnicodeWriter, highlight_content, html_to_text, get_themes,

59+ UnicodeWriter, highlight_content, html_to_text, get_resources_directory,

60− get_static_files, get_result_templates, gen_useragent, dict_subset,

60+ get_static_files, get_result_templates, get_themes, gen_useragent,

61− prettify_url

61+ dict_subset, prettify_url

62)

63from searx.version import VERSION_STRING

64from searx.languages import language_codes

@@ -91,17 +91,25 @@ if sys.version_info[0] == 3:

91from werkzeug.serving import WSGIRequestHandler

92WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server'].get('http_protocol_version', '1.0'))

94−static_path, templates_path, themes =\

94+# about static

95− get_themes(settings['ui']['themes_path']

95+static_path = get_resources_directory(searx_dir, 'static', settings['ui']['static_path'])

96− if settings['ui']['themes_path']

96+logger.debug('static directory is %s', static_path)

97− else searx_dir)

97+static_files = get_static_files(static_path)

99+# about templates

99default_theme = settings['ui']['default_theme']

100default_theme = settings['ui']['default_theme']

101+templates_path = get_resources_directory(searx_dir, 'templates', settings['ui']['templates_path'])

102+logger.debug('templates directory is %s', templates_path)

103+themes = get_themes(templates_path)

104+result_templates = get_result_templates(templates_path)

105+global_favicons = []

106+for indice, theme in enumerate(themes):

107+ global_favicons.append([])

108+ theme_img_path = os.path.join(static_path, 'themes', theme, 'img', 'icons')

109+ for (dirpath, dirnames, filenames) in os.walk(theme_img_path):

110+ global_favicons[indice].extend(filenames)

100

111

101−static_files = get_static_files(searx_dir)

112+# Flask app

102−

103−result_templates = get_result_templates(searx_dir)

104−

105app = Flask(

113app = Flask(

106 __name__,

114 __name__,

107 static_folder=static_path,

115 static_folder=static_path,

@@ -120,13 +128,6 @@ babel = Babel(app)

120rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk', 'he',

128rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk', 'he',

121 'ku', 'mzn', 'pnb'', ''ps', 'sd', 'ug', 'ur', 'yi']

129 'ku', 'mzn', 'pnb'', ''ps', 'sd', 'ug', 'ur', 'yi']

122

130

123−global_favicons = []

124−for indice, theme in enumerate(themes):

125− global_favicons.append([])

126− theme_img_path = searx_dir + "/static/themes/" + theme + "/img/icons/"

127− for (dirpath, dirnames, filenames) in os.walk(theme_img_path):

128− global_favicons[indice].extend(filenames)

129−

130# used when translating category names

131# used when translating category names

131_category_names = (gettext('files'),

132_category_names = (gettext('files'),

132 gettext('general'),

133 gettext('general'),