Browse Source

btdigg: Python3 support and add torrent in magnet link

adaptive-webui-19844
btdigg research 13 years ago committed by Christophe Dumez
parent
commit
a275e26ba7
  1. 10
      src/searchengine/nova/engines/btdigg.py
  2. 13
      src/searchengine/nova3/engines/btdigg.py

10
src/searchengine/nova/engines/btdigg.py

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
#VERSION: 1.1 #VERSION: 1.2
#AUTHORS: BTDigg team (research@btdigg.org) #AUTHORS: BTDigg team (research@btdigg.org)
# #
# GNU GENERAL PUBLIC LICENSE # GNU GENERAL PUBLIC LICENSE
@ -45,14 +45,14 @@ class btdigg(object):
continue continue
info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6] info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6]
name = name.translate(None, '|')
res = dict(link = 'magnet:?xt=urn:btih:%s' % (info_hash,), res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.quote(name)),
name = name.translate(None, '|'), name = name,
size = size, size = size,
seeds = int(dl), seeds = int(dl),
leech = int(dl), leech = int(dl),
engine_url = self.url, engine_url = self.url,
desc_link = 'http://btdigg.org/search?%s' % (urllib.urlencode(dict(info_hash = info_hash, q = req)),)) desc_link = '%s/search?%s' % (self.url, urllib.urlencode(dict(info_hash = info_hash, q = req)),))
prettyPrinter(res) prettyPrinter(res)
finally: finally:

13
src/searchengine/nova3/engines/btdigg.py

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
#VERSION: 1.1 #VERSION: 1.2
#AUTHORS: BTDigg team (research@btdigg.org) #AUTHORS: BTDigg team (research@btdigg.org)
# #
# GNU GENERAL PUBLIC LICENSE # GNU GENERAL PUBLIC LICENSE
@ -36,23 +36,24 @@ class btdigg(object):
pass pass
def search(self, what, cat='all'): def search(self, what, cat='all'):
req = what.replace('+', ' ') req = urllib.parse.unquote(what).replace('+', ' ')
u = urllib.request.urlopen('http://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.parse.urlencode(dict(q = req)),)) u = urllib.request.urlopen('http://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.parse.urlencode(dict(q = req)),))
try: try:
for line in u: for line in u:
line = line.decode('utf-8')
if line.startswith('#'): if line.startswith('#'):
continue continue
info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6] info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6]
name = name.replace('|', '')
res = dict(link = 'magnet:?xt=urn:btih:%s' % (info_hash,), res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.parse.quote(name)),
name = name.translate(None, '|'), name = name,
size = size, size = size,
seeds = int(dl), seeds = int(dl),
leech = int(dl), leech = int(dl),
engine_url = self.url, engine_url = self.url,
desc_link = 'http://btdigg.org/search?%s' % (urllib.parse.urlencode(dict(info_hash = info_hash, q = req)),)) desc_link = '%s/search?%s' % (self.url, urllib.parse.urlencode(dict(info_hash = info_hash, q = req)),))
prettyPrinter(res) prettyPrinter(res)
finally: finally:

Loading…
Cancel
Save