From 0bfc793194f44cc3c0e6fdeb9dc9c00c448c0324 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:09:02 +0100 Subject: [PATCH 1/8] 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(-) diff --git a/searx/webapp.py b/searx/webapp.py index 5419755..bb412df 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 ) From 3b88adf8b6782341d83a090ce94fe16328b19062 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:12:37 +0100 Subject: [PATCH 2/8] Use the new way of finding an icon --- searx/templates/oscar/result_templates/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 0f090d8..dd537fd 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From 3ffe6014ed491e47e779fa90ae8e7bb1d8eff849 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:13:40 +0100 Subject: [PATCH 3/8] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/images.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 7689f9f..3bdc136 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -7,7 +7,7 @@
-

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

{{ result.title }} From 002b812cc633a039c5d02dc5dffdac46e6e5af81 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:14:30 +0100 Subject: [PATCH 4/8] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/map.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 343e713..7ed629d 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} From f3f544d5b50e15f5665b26db7fe2e98fb5b5001d Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:15:30 +0100 Subject: [PATCH 5/8] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/torrent.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 1e133e3..94e6f22 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From 53a9af39efb0c444bfacd40c440208ba33ee75c4 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:16:29 +0100 Subject: [PATCH 6/8] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/videos.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 06275b8..977fcf8 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From e71b665fd5d62ddc52fda3eca141547bb3540522 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 13 Dec 2014 21:37:28 +0100 Subject: [PATCH 7/8] Load the list of icons only once --- searx/webapp.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index bb412df..6387a92 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())] ) From 83d6f366596829f2140f84c73b684bd7f783e93c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Thu, 18 Dec 2014 16:26:32 +0100 Subject: [PATCH 8/8] 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/templates/courgette/result_templates/default.html | 4 ++-- searx/templates/courgette/result_templates/map.html | 4 ++-- searx/templates/courgette/result_templates/videos.html | 8 +++----- searx/templates/default/result_templates/default.html | 2 +- searx/templates/default/result_templates/map.html | 4 ++-- searx/templates/default/result_templates/videos.html | 6 ++---- searx/templates/oscar/result_templates/default.html | 2 +- searx/templates/oscar/result_templates/images.html | 2 +- searx/templates/oscar/result_templates/map.html | 2 +- searx/templates/oscar/result_templates/torrent.html | 2 +- searx/templates/oscar/result_templates/videos.html | 4 ++-- searx/webapp.py | 8 -------- 12 files changed, 18 insertions(+), 30 deletions(-) diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index 734f906..3e93eee 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index 734f906..3e93eee 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 8ceb0b1..2694a91 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,12 +1,10 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %} -

{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} - {{ result.title }} + {{ result.title|striptags }}

{{ result.url }}

-

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index d0e725a..0f3e3e6 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index 78221aa..f9ba7dc 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 233a6c0..16b2d5f 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,8 +1,6 @@
-

-

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} - {{ result.title }} + {{ result.title|striptags }}

{{ result.url }}

-

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index dd537fd..3c8e625 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 3bdc136..94627c9 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -7,7 +7,7 @@
-

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|striptags }}

{{ result.title }} diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 7ed629d..a0858c0 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 94e6f22..b6753f7 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 977fcf8..2b95688 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,13 +1,13 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }}
- {{ result.title|urlencode }} {{ result['favicon'] }} + {{ result.title|striptags }} {{ result.engine }} {% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/webapp.py b/searx/webapp.py index 6387a92..ca58d8e 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: