Use magnet link for kat.ph. fix #644

This commit is contained in:
Ruud committed 2012-08-09 16:23:05 +02:00
1 parent 334a5725e1
commit 28f75617b2
1 file changed
+5 -21
@@ -3,8 +3,6 @@ from couchpotato.core.event import fireEvent
from couchpotato.core.helpers.variable import tryInt from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.providers.torrent.base import TorrentProvider from couchpotato.core.providers.torrent.base import TorrentProvider
import StringIO
import gzip
import re import re
import traceback import traceback
@@ -14,10 +12,9 @@ log = CPLog(__name__)
class KickAssTorrents(TorrentProvider): class KickAssTorrents(TorrentProvider):
urls = { urls = {
'test': 'http://www.kat.ph/', 'test': 'http://kat.ph/',
'detail': 'http://www.kat.ph/%s-t%s.html', 'detail': 'http://kat.ph/%s-t%s.html',
'search': 'http://www.kat.ph/i%s/', 'search': 'http://kat.ph/i%s/',
'download': 'http://torcache.net/',
} }
cat_ids = [ cat_ids = [
@@ -60,11 +57,10 @@ class KickAssTorrents(TorrentProvider):
continue continue
new = { new = {
'type': 'torrent', 'type': 'torrent_magnet',
'check_nzb': False, 'check_nzb': False,
'description': '', 'description': '',
'provider': self.getName(), 'provider': self.getName(),
'download': self.download,
'score': 0, 'score': 0,
} }
@@ -77,9 +73,7 @@ class KickAssTorrents(TorrentProvider):
link = td.find('div', {'class': 'torrentname'}).find_all('a')[1] link = td.find('div', {'class': 'torrentname'}).find_all('a')[1]
new['id'] = temp.get('id')[-8:] new['id'] = temp.get('id')[-8:]
new['name'] = link.text new['name'] = link.text
new['url'] = td.find_all('a', 'idownload')[1]['href'] new['url'] = td.find('a', 'imagnet')['href']
if new['url'][:2] == '//':
new['url'] = 'http:%s' % new['url']
new['score'] = 20 if td.find('a', 'iverif') else 0 new['score'] = 20 if td.find('a', 'iverif') else 0
elif column_name is 'size': elif column_name is 'size':
new['size'] = self.parseSize(td.text) new['size'] = self.parseSize(td.text)
@@ -129,13 +123,3 @@ class KickAssTorrents(TorrentProvider):
age += tryInt(nr) * mult age += tryInt(nr) * mult
return tryInt(age) return tryInt(age)
def download(self, url = '', nzb_id = ''):
compressed_data = self.urlopen(url = url, headers = {'Referer': 'http://kat.ph/'})
compressedstream = StringIO.StringIO(compressed_data)
gzipper = gzip.GzipFile(fileobj = compressedstream)
data = gzipper.read()
return data