From 0bfc793194f44cc3c0e6fdeb9dc9c00c448c0324 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:09:02 +0100 Subject: Add a variable with all the icons of the theme Add for the template a list of available icons in the current theme. --- searx/webapp.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 541975573..bb412df69 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -291,6 +291,11 @@ def index(): for engine in result['engines']: if engine in favicons: result['favicon'] = engine + + mypath = searx_dir+"/static/"+get_current_theme_name()+"/img/" + favs=[] + for (dirpath, dirnames, filenames) in os.walk(mypath): + favs.extend(filenames) # TODO, check if timezone is calculated right if 'publishedDate' in result: @@ -344,7 +349,8 @@ def index(): suggestions=search.suggestions, answers=search.answers, infoboxes=search.infoboxes, - theme=get_current_theme_name() + theme=get_current_theme_name(), + favicons=favs ) -- cgit v1.2.3 From e71b665fd5d62ddc52fda3eca141547bb3540522 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 13 Dec 2014 21:37:28 +0100 Subject: Load the list of icons only once --- searx/webapp.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index bb412df69..6387a92f4 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -71,6 +71,13 @@ babel = Babel(app) #TODO configurable via settings.yml favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud', 'twitter', 'stackoverflow', 'github', 'deviantart'] + +global_favicons = [] +for indice,theme in enumerate(themes): + global_favicons.append([]) + theme_img_path = searx_dir+"/static/"+theme+"/img/" + for (dirpath, dirnames, filenames) in os.walk(theme_img_path): + global_favicons[indice].extend(filenames) cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years @@ -292,11 +299,6 @@ def index(): if engine in favicons: result['favicon'] = engine - mypath = searx_dir+"/static/"+get_current_theme_name()+"/img/" - favs=[] - for (dirpath, dirnames, filenames) in os.walk(mypath): - favs.extend(filenames) - # TODO, check if timezone is calculated right if 'publishedDate' in result: result['pubdate'] = result['publishedDate'].strftime('%Y-%m-%d %H:%M:%S%z') @@ -350,7 +352,7 @@ def index(): answers=search.answers, infoboxes=search.infoboxes, theme=get_current_theme_name(), - favicons=favs + favicons=global_favicons[themes.index(get_current_theme_name())] ) -- cgit v1.2.3 From 83d6f366596829f2140f84c73b684bd7f783e93c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Thu, 18 Dec 2014 16:26:32 +0100 Subject: Final commit on favicons Definitely remove engine array Change every themes to accomodate that change Tweak of video template of oscar to add link on video thumbnail --- searx/webapp.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 6387a92f4..ca58d8ea3 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -68,10 +68,6 @@ app.secret_key = settings['server']['secret_key'] babel = Babel(app) -#TODO configurable via settings.yml -favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud', - 'twitter', 'stackoverflow', 'github', 'deviantart'] - global_favicons = [] for indice,theme in enumerate(themes): global_favicons.append([]) @@ -294,10 +290,6 @@ def index(): result['pretty_url'] = u'{0}[...]{1}'.format(*url_parts) else: result['pretty_url'] = result['url'] - - for engine in result['engines']: - if engine in favicons: - result['favicon'] = engine # TODO, check if timezone is calculated right if 'publishedDate' in result: -- cgit v1.2.3