[mod] restore btdigg engine as btdig.com (#1515)

5 files changed, 23 insertions, 26 deletions

diff --git a/searx/engines/btdigg.py b/searx/engines/btdigg.py
index 40438673f..82eedc24b 100644
--- a/searx/engines/btdigg.py
+++ b/searx/engines/btdigg.py
@@ -1,7 +1,7 @@
 """
  BTDigg (Videos, Music, Files)
 
- @website     https://btdigg.org
+ @website     https://btdig.com
  @provide-api yes (on demand)
 
  @using-api   no
@@ -21,7 +21,7 @@ categories = ['videos', 'music', 'files']
 paging = True
 
 # search-url
-url = 'https://btdigg.org'
+url = 'https://btdig.com'
 search_url = url + '/search?q={search_term}&p={pageno}'
 
 
@@ -39,7 +39,7 @@ def response(resp):
 
     dom = html.fromstring(resp.text)
 
-    search_res = dom.xpath('//div[@id="search_res"]/table/tr')
+    search_res = dom.xpath('//div[@class="one_result"]')
 
     # return empty array if nothing is found
     if not search_res:
@@ -47,46 +47,39 @@ def response(resp):
 
     # parse results
     for result in search_res:
-        link = result.xpath('.//td[@class="torrent_name"]//a')[0]
+        link = result.xpath('.//div[@class="torrent_name"]//a')[0]
         href = urljoin(url, link.attrib.get('href'))
         title = extract_text(link)
-        content = extract_text(result.xpath('.//pre[@class="snippet"]')[0])
-        content = "<br />".join(content.split("\n"))
 
-        filesize = result.xpath('.//span[@class="attr_val"]/text()')[0].split()[0]
-        filesize_multiplier = result.xpath('.//span[@class="attr_val"]/text()')[0].split()[1]
-        files = result.xpath('.//span[@class="attr_val"]/text()')[1]
-        seed = result.xpath('.//span[@class="attr_val"]/text()')[2]
+        excerpt = result.xpath('.//div[@class="torrent_excerpt"]')[0]
+        content = html.tostring(excerpt, encoding='unicode', method='text', with_tail=False)
+        # it is better to emit <br/> instead of |, but html tags are verboten
+        content = content.strip().replace('\n', ' | ')
+        content = ' '.join(content.split())
 
-        # convert seed to int if possible
-        if seed.isdigit():
-            seed = int(seed)
-        else:
-            seed = 0
-
-        leech = 0
+        filesize = result.xpath('.//span[@class="torrent_size"]/text()')[0].split()[0]
+        filesize_multiplier = result.xpath('.//span[@class="torrent_size"]/text()')[0].split()[1]
+        files = (result.xpath('.//span[@class="torrent_files"]/text()') or ['1'])[0]
 
         # convert filesize to byte if possible
         filesize = get_torrent_size(filesize, filesize_multiplier)
 
         # convert files to int if possible
-        if files.isdigit():
+        try:
             files = int(files)
-        else:
+        except:
             files = None
 
-        magnetlink = result.xpath('.//td[@class="ttth"]//a')[0].attrib['href']
+        magnetlink = result.xpath('.//div[@class="torrent_magnet"]//a')[0].attrib['href']
 
         # append result
         results.append({'url': href,
                         'title': title,
                         'content': content,
-                        'seed': seed,
-                        'leech': leech,
                         'filesize': filesize,
                         'files': files,
                         'magnetlink': magnetlink,
                         'template': 'torrent.html'})
 
     # return results sorted by seeder
-    return sorted(results, key=itemgetter('seed'), reverse=True)
+    return results
diff --git a/searx/settings.yml b/searx/settings.yml
index 53dfaae2c..c2a77630a 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -115,6 +115,10 @@ engines:
     disabled : True
     shortcut : bb
 
+  - name : btdigg
+    engine : btdigg
+    shortcut : bt
+
   - name : ccc-tv
     engine : xpath
     paging : False
diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html
index 2fd8395ad..d659064d9 100644
--- a/searx/templates/courgette/result_templates/torrent.html
+++ b/searx/templates/courgette/result_templates/torrent.html
@@ -4,7 +4,7 @@
     {% endif %}
     <h3 class="result_title"><a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ result.title|safe }}</a></h3>
     {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %}
-    <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />
+    {% if result.seed %}<span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />{% endif %}
     <span>
         {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} 
         {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}>{{ _('torrent file') }}</a>{% endif %}
diff --git a/searx/templates/legacy/result_templates/torrent.html b/searx/templates/legacy/result_templates/torrent.html
index 67e058ae5..7a8ac33de 100644
--- a/searx/templates/legacy/result_templates/torrent.html
+++ b/searx/templates/legacy/result_templates/torrent.html
@@ -8,6 +8,6 @@
     <p>
         {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} 
         {% if result.torrentfile %}<a href="{{ result.torrentfile }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="torrentfile">{{ _('torrent file') }}</a>{% endif %} - 
-        <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span>
+        {% if result.seed %}<span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span>{% endif %} 
     </p>
 </div>
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
index bc2b30fbe..f5ea415e2 100644
--- a/searx/templates/oscar/result_templates/torrent.html
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -3,7 +3,7 @@
 {{ result_header(result, favicons) }}
 {{ result_sub_header(result) }}
 
-<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>
+{% if result.seed %}<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>{% endif %}
 {% if result.filesize %}<br />{{ icon('floppy-disk') }} {{ _('Filesize') }} 
     <span class="badge">
         {% if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }}