From a275e26ba7cc9d60361e71da5ef809af8c808a3a Mon Sep 17 00:00:00 2001 From: btdigg research Date: Tue, 13 Dec 2011 18:47:06 +0200 Subject: [PATCH] btdigg: Python3 support and add torrent in magnet link --- src/searchengine/nova/engines/btdigg.py | 10 +++++----- src/searchengine/nova3/engines/btdigg.py | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/searchengine/nova/engines/btdigg.py b/src/searchengine/nova/engines/btdigg.py index 584dd089f..7c7da80f1 100644 --- a/src/searchengine/nova/engines/btdigg.py +++ b/src/searchengine/nova/engines/btdigg.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -#VERSION: 1.1 +#VERSION: 1.2 #AUTHORS: BTDigg team (research@btdigg.org) # # GNU GENERAL PUBLIC LICENSE @@ -45,14 +45,14 @@ class btdigg(object): continue info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6] - - res = dict(link = 'magnet:?xt=urn:btih:%s' % (info_hash,), - name = name.translate(None, '|'), + name = name.translate(None, '|') + res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.quote(name)), + name = name, size = size, seeds = int(dl), leech = int(dl), 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) finally: diff --git a/src/searchengine/nova3/engines/btdigg.py b/src/searchengine/nova3/engines/btdigg.py index 17a681bf0..95378abb0 100644 --- a/src/searchengine/nova3/engines/btdigg.py +++ b/src/searchengine/nova3/engines/btdigg.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -#VERSION: 1.1 +#VERSION: 1.2 #AUTHORS: BTDigg team (research@btdigg.org) # # GNU GENERAL PUBLIC LICENSE @@ -36,23 +36,24 @@ class btdigg(object): pass 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)),)) try: for line in u: + line = line.decode('utf-8') if line.startswith('#'): continue info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6] - - res = dict(link = 'magnet:?xt=urn:btih:%s' % (info_hash,), - name = name.translate(None, '|'), + name = name.replace('|', '') + res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.parse.quote(name)), + name = name, size = size, seeds = int(dl), leech = int(dl), 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) finally: