d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[search engine] Update Torrentz

adaptive-webui-19844
ngosang 10 years ago
parent
9d97c05889
commit
2b2ffca7d0
4 changed files with 28 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/searchengine/nova/engines/torrentz.py
  2. 2
      src/searchengine/nova/engines/versions.txt
  3. 21
      src/searchengine/nova3/engines/torrentz.py
  4. 2
      src/searchengine/nova3/engines/versions.txt

21
src/searchengine/nova/engines/torrentz.py
Unescape View File

@ -1,4 +1,4 @@
#VERSION: 2.14 #VERSION: 2.15
#AUTHORS: Diego de las Heras (diegodelasheras@gmail.com) #AUTHORS: Diego de las Heras (diegodelasheras@gmail.com)
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -37,8 +37,8 @@ class torrentz(object):
supported_categories = {'all': ''} supported_categories = {'all': ''}
trackers_list = ['udp://open.demonii.com:1337/announce', trackers_list = ['udp://open.demonii.com:1337/announce',
'udp://tracker.openbittorrent.com:80/announce',
'udp://tracker.leechers-paradise.org:6969', 'udp://tracker.leechers-paradise.org:6969',
'udp://exodus.desync.com:6969',
'udp://tracker.coppersurfer.tk:6969', 'udp://tracker.coppersurfer.tk:6969',
'udp://9.rarbg.com:2710/announce'] 'udp://9.rarbg.com:2710/announce']
@ -52,8 +52,8 @@ class torrentz(object):
self.current_item = None self.current_item = None
def handle_starttag(self, tag, attrs): def handle_starttag(self, tag, attrs):
params = dict(attrs)
if tag == 'a': if tag == 'a':
params = dict(attrs)
if 'href' in params: if 'href' in params:
self.current_item = {} self.current_item = {}
self.td_counter = 0 self.td_counter = 0
@ -61,8 +61,10 @@ class torrentz(object):
params['href'].strip(' /') + self.trackers params['href'].strip(' /') + self.trackers
self.current_item['desc_link'] = self.url + params['href'].strip() self.current_item['desc_link'] = self.url + params['href'].strip()
elif tag == 'span': elif tag == 'span':
if isinstance(self.td_counter,int): if self.td_counter is not None:
self.td_counter += 1 self.td_counter += 1
if 'class' in params and params['class'] == 'pe': # hack to avoid Pending
self.td_counter += 2
if self.td_counter > 6: # safety if self.td_counter > 6: # safety
self.td_counter = None self.td_counter = None
@ -74,12 +76,18 @@ class torrentz(object):
elif self.td_counter == 4: elif self.td_counter == 4:
if 'size' not in self.current_item: if 'size' not in self.current_item:
self.current_item['size'] = data.strip() self.current_item['size'] = data.strip()
if self.current_item['size'] == 'Pending':
self.current_item['size'] = ''
elif self.td_counter == 5: elif self.td_counter == 5:
if 'seeds' not in self.current_item: if 'seeds' not in self.current_item:
self.current_item['seeds'] = data.strip().replace(',', '') self.current_item['seeds'] = data.strip().replace(',', '')
if not self.current_item['seeds'].isdigit():
self.current_item['seeds'] = 0
elif self.td_counter == 6: elif self.td_counter == 6:
if 'leech' not in self.current_item: if 'leech' not in self.current_item:
self.current_item['leech'] = data.strip().replace(',', '') self.current_item['leech'] = data.strip().replace(',', '')
if not self.current_item['leech'].isdigit():
self.current_item['leech'] = 0
# display item # display item
self.td_counter = None self.td_counter = None
@ -87,10 +95,7 @@ class torrentz(object):
if self.current_item['name'].find(' \xc2'): if self.current_item['name'].find(' \xc2'):
self.current_item['name'] = self.current_item['name'].split(' \xc2')[0] self.current_item['name'] = self.current_item['name'].split(' \xc2')[0]
self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']}) self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']})
if not self.current_item['seeds'].isdigit():
self.current_item['seeds'] = 0
if not self.current_item['leech'].isdigit():
self.current_item['leech'] = 0
prettyPrinter(self.current_item) prettyPrinter(self.current_item)
self.results.append('a') self.results.append('a')

2
src/searchengine/nova/engines/versions.txt
Unescape View File

@ -6,4 +6,4 @@ legittorrents: 2.00
mininova: 2.00 mininova: 2.00
piratebay: 2.11 piratebay: 2.11
torrentreactor: 1.36 torrentreactor: 1.36
torrentz: 2.14 torrentz: 2.15

21
src/searchengine/nova3/engines/torrentz.py
Unescape View File

@ -1,4 +1,4 @@
#VERSION: 2.14 #VERSION: 2.15
#AUTHORS: Diego de las Heras (diegodelasheras@gmail.com) #AUTHORS: Diego de las Heras (diegodelasheras@gmail.com)
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -37,8 +37,8 @@ class torrentz(object):
supported_categories = {'all': ''} supported_categories = {'all': ''}
trackers_list = ['udp://open.demonii.com:1337/announce', trackers_list = ['udp://open.demonii.com:1337/announce',
'udp://tracker.openbittorrent.com:80/announce',
'udp://tracker.leechers-paradise.org:6969', 'udp://tracker.leechers-paradise.org:6969',
'udp://exodus.desync.com:6969',
'udp://tracker.coppersurfer.tk:6969', 'udp://tracker.coppersurfer.tk:6969',
'udp://9.rarbg.com:2710/announce'] 'udp://9.rarbg.com:2710/announce']
@ -52,8 +52,8 @@ class torrentz(object):
self.current_item = None self.current_item = None
def handle_starttag(self, tag, attrs): def handle_starttag(self, tag, attrs):
params = dict(attrs)
if tag == 'a': if tag == 'a':
params = dict(attrs)
if 'href' in params: if 'href' in params:
self.current_item = {} self.current_item = {}
self.td_counter = 0 self.td_counter = 0
@ -61,8 +61,10 @@ class torrentz(object):
params['href'].strip(' /') + self.trackers params['href'].strip(' /') + self.trackers
self.current_item['desc_link'] = self.url + params['href'].strip() self.current_item['desc_link'] = self.url + params['href'].strip()
elif tag == 'span': elif tag == 'span':
if isinstance(self.td_counter,int): if self.td_counter is not None:
self.td_counter += 1 self.td_counter += 1
if 'class' in params and params['class'] == 'pe': # hack to avoid Pending
self.td_counter += 2
if self.td_counter > 6: # safety if self.td_counter > 6: # safety
self.td_counter = None self.td_counter = None
@ -74,12 +76,18 @@ class torrentz(object):
elif self.td_counter == 4: elif self.td_counter == 4:
if 'size' not in self.current_item: if 'size' not in self.current_item:
self.current_item['size'] = data.strip() self.current_item['size'] = data.strip()
if self.current_item['size'] == 'Pending':
self.current_item['size'] = ''
elif self.td_counter == 5: elif self.td_counter == 5:
if 'seeds' not in self.current_item: if 'seeds' not in self.current_item:
self.current_item['seeds'] = data.strip().replace(',', '') self.current_item['seeds'] = data.strip().replace(',', '')
if not self.current_item['seeds'].isdigit():
self.current_item['seeds'] = 0
elif self.td_counter == 6: elif self.td_counter == 6:
if 'leech' not in self.current_item: if 'leech' not in self.current_item:
self.current_item['leech'] = data.strip().replace(',', '') self.current_item['leech'] = data.strip().replace(',', '')
if not self.current_item['leech'].isdigit():
self.current_item['leech'] = 0
# display item # display item
self.td_counter = None self.td_counter = None
@ -87,10 +95,7 @@ class torrentz(object):
if self.current_item['name'].find(' »'): if self.current_item['name'].find(' »'):
self.current_item['name'] = self.current_item['name'].split(' »')[0] self.current_item['name'] = self.current_item['name'].split(' »')[0]
self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']}) self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']})
if not self.current_item['seeds'].isdigit():
self.current_item['seeds'] = 0
if not self.current_item['leech'].isdigit():
self.current_item['leech'] = 0
prettyPrinter(self.current_item) prettyPrinter(self.current_item)
self.results.append('a') self.results.append('a')

2
src/searchengine/nova3/engines/versions.txt
Unescape View File

@ -6,4 +6,4 @@ legittorrents: 2.00
mininova: 2.00 mininova: 2.00
piratebay: 2.11 piratebay: 2.11
torrentreactor: 1.36 torrentreactor: 1.36
torrentz: 2.14 torrentz: 2.15

Write Preview
Loading…
Cancel
Save