git.iko.soy/searx
on master help sign in
Merge pull request #172 from Cqoicebordel/torrents-w3c+ux+rss

Torrents w3c+ux+rss

commit12425618caacec90ac90332f580fb628ef32e213 authorAdam Tauber <asciimoo@gmail.com> dateMon 12 Jan 2015, 14:15 (12 years ago) parentb47b8cc8242084
4 files changed+18−17
compare with master
unifiedsplit
searx/engines/kickass.py+2−1 searx/templates/oscar/preferences.html+3−3 searx/templates/oscar/result_templates/torrent.html+12−12 searx/templates/oscar/results.html+1−1
searx/engines/kickass.py+2−1
@@ -102,6 +102,7 @@ def response(resp):
102102 magnetlink = result.xpath(magnet_xpath)[0].attrib['href']
103103
104104 torrentfile = result.xpath(torrent_xpath)[0].attrib['href']
105+ torrentfileurl = quote(torrentfile, safe="%/:=&?~#+!$,;'@()*")
105106
106107 # append result
107108 results.append({'url': href,
@@ -112,7 +113,7 @@ def response(resp):
112113 'filesize': filesize,
113114 'files': files,
114115 'magnetlink': magnetlink,
115− 'torrentfile': torrentfile,
116+ 'torrentfile': torrentfileurl,
116117 'template': 'torrent.html'})
117118
118119 # return results sorted by seeder
searx/templates/oscar/preferences.html+3−3
@@ -113,9 +113,9 @@
113113 <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
114114 <div class="col-xs-6 col-sm-4 col-md-4">
115115 <div class="checkbox">
116− <input class="hidden" type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
117− <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
118− <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
116+ <input class="hidden" type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
117+ <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
118+ <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
119119 </div>
120120 </div>
121121 </div>
searx/templates/oscar/result_templates/torrent.html+12−12
@@ -4,23 +4,23 @@
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
66<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
7+{% if result.magnetlink %}<small> &bull; <a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} {{ _('magnet link') }}</a></small>{% endif %}
8+{% if result.torrentfile %}<small> &bull; <a href="{{ result.torrentfile }}" class="torrentfile">{{ icon('download-alt') }} {{ _('torrent file') }}</a></small>{% endif %}
79
810<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>
9−{% if result.filesize %}</br>{{ icon('floppy-disk') }} {{ _('Filesize') }}
11+{% if result.filesize %}<br />{{ icon('floppy-disk') }} {{ _('Filesize') }}
1012 <span class="badge">
11− {% if result.filesize < 1024 %}{{ result.filesize }} Byte
12− {% elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} kb
13− {% elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} MB
14− {% elif result.filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024) }} GB
15− {% else %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024/1024) }} TB{% endif %}
13+ {% if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }}
14+ {% elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} {{ _('kiB') }}
15+ {% elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} {{ _('MiB') }}
16+ {% elif result.filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024) }} {{ _('GiB') }}
17+ {% else %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif %}
1618 </span>{% endif %}
17−{% if result.files %}</br>{{ icon('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span>{% endif %}</p>
18−<p class="result-content">
19− <a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} {{ _('magnet link') }}</a>
20− {% if result.torrentfile %}</br><a href="{{ result.torrentfile }}" class="torrentfile">{{ icon('download-alt') }} {{ _('torrent file') }}</a>{% endif %}
21−</p>
19+{% if result.files %}<br />{{ icon('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span>{% endif %}
20+
21+{% if result.content %}<br />{{ result.content|safe }}{% endif %}
2222
23−{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
23+</p>
2424
2525<div class="clearfix"></div>
2626
searx/templates/oscar/results.html+1−1
@@ -1,6 +1,6 @@
11{% extends "oscar/base.html" %}
22{% block title %}{{ q }} - {% endblock %}
3−{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q }}&format=rss&{% for category in selected_categories %}category_{{ category }}=1&{% endfor %}pageno={{ pageno+1 }}">{% endblock %}
3+{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
44{% block content %}
55 <div class="row">
66 <div class="col-sm-8" id="main_results">