searx

commit: 6f8daea724238dc74b221f640616ee6f596868a4
parent: 7b4ec5c5e9a89fc1bc3b3fc8dfad26450530a2da
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sat, 11 Jan 2014 02:12:40 -0800

Merge pull request #18 from rsdy/master

highlight different search results differently
Diffstat:
M
searx/engines/duckduckgo_definitions.py
7
++++---
M
searx/engines/piratebay.py
6
+++---
M
searx/static/css/style.css
13
+++++++++----
M
searx/templates/result_templates/default.html
2
+-
A
searx/templates/result_templates/torrent.html
7
+++++++

5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/searx/engines/duckduckgo_definitions.py b/searx/engines/duckduckgo_definitions.py
@@ -13,9 +13,10 @@ def response(resp):
     results = []
     if 'Definition' in search_res:
         if search_res.get('AbstractURL'):
-            res = {'title'   : search_res.get('Heading', '')
-                  ,'content' : search_res.get('Definition', '')
-                  ,'url'     : search_res.get('AbstractURL', '')
+            res = {'title'    : search_res.get('Heading', '')
+                  ,'content'  : search_res.get('Definition', '')
+                  ,'url'      : search_res.get('AbstractURL', '')
+                  ,'class'   : 'definition_result'
                   }
             results.append(res)
 
diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py
@@ -28,8 +28,8 @@ def response(resp):
         title = ' '.join(link.xpath('.//text()'))
         content = escape(' '.join(result.xpath('.//font[@class="detDesc"]//text()')))
         seed, leech = result.xpath('.//td[@align="right"]/text()')[:2]
-        content += '<br />Seed: %s, Leech: %s' % (seed, leech)
         magnetlink = result.xpath('.//a[@title="Download this torrent using magnet"]')[0]
-        content += '<br /><a href="%s">magnet link</a>' % urljoin(url, magnetlink.attrib['href'])
-        results.append({'url': href, 'title': title, 'content': content})
+        results.append({'url': href, 'title': title, 'content': content,
+                        'seed': seed, 'leech': leech, 'magnetlink': magnetlink.attrib['href'],
+                        'template': 'torrent.html'})
     return results
diff --git a/searx/static/css/style.css b/searx/static/css/style.css
@@ -97,6 +97,11 @@ a:visited { color: #7b11be; }
 .image_result p span a { color: #FFFFFF; }
 .image_result p:hover span a { display: block; position: absolute; bottom: 0; right: 0; padding: 4px; background-color: rgba(0, 0, 0, 0.6); font-size: 0.7em; }
 
+.torrent_result { border-left: 10px solid lightgray; padding-left: 3px; }
+.torrent_result p { margin: 3px; font-size: 0.8em; }
+
+.definition_result { border-left: 10px solid gray; padding-left: 3px; }
+
 .percentage { position: relative; width: 300px; }
 .percentage div { background: #444444; }
 td { padding: 0 4px; }
@@ -142,7 +147,7 @@ tr:hover td { background: #DDDDDD; }
 #suggestions form { display: block; }
 #suggestions input { padding: 2px 6px; margin: 2px 4px;  font-size: 0.8em; display: inline-block; background: #E4E4E4; border-radius: 4px; border: 0; cursor: pointer; }
 
-#preferences { 
+#preferences {
     top: 10px;
     padding: 0;
     border: 0;
@@ -163,7 +168,7 @@ tr:hover td { background: #DDDDDD; }
 }
 
 @media screen and (max-width: 60em) {
-    
+
   #suggestions { position: static; max-width: 50em; margin: 0 0 2px 0; padding: 0; float: none; border: none; width: auto }
   #suggestions span { display: inline; font-size: 0.8em }
   #suggestions form { display: inline; }
@@ -172,13 +177,13 @@ tr:hover td { background: #DDDDDD; }
 }
 
 @media screen and (max-width: 680px) {
-    
+
   #search_wrapper { width: 90%; clear:both; overflow: hidden }
 
   .right { display: none; postion: fixed !important; top: 100px; right: 0px; }
 
   #categories { font-size: 80% }
-  
+
   #categories .checkbox_container { margin-top: 2px; margin: 0 2px; }
 
   .result { border-top: 1px solid #e8e7e6; margin: 7px 0 6px 0;  }
diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
@@ -1,4 +1,4 @@
-<div class="result">
+<div class="result {{ result.class }}">
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
     <p class="url">{{ result.pretty_url }}</p>
diff --git a/searx/templates/result_templates/torrent.html b/searx/templates/result_templates/torrent.html
@@ -0,0 +1,7 @@
+<div class="result torrent_result">
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+    <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p>
+    <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p>
+    <p class="url">{{ result.pretty_url }}</p>
+</div>