d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 22:14:32 +00:00
Code Issues Projects Releases Wiki Activity

- Use AND operator for torrentdownloads searches

Browse Source
This commit is contained in:
Christophe Dumez 2010-09-25 13:07:31 +00:00
parent c64f02c9bf
commit 261d02863c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/search_engine/engines/torrentdownloads.py
View File

@ -1,4 +1,4 @@
#VERSION: 1.03 #VERSION: 1.04
#AUTHORS: Christophe Dumez (chris@qbittorrent.org) #AUTHORS: Christophe Dumez (chris@qbittorrent.org)
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -40,7 +40,7 @@ class torrentdownloads(object):
def __init__(self): def __init__(self):
self.results = [] self.results = []
self.parser = self.SimpleSGMLParser(self.results, self.url) #self.parser = self.SimpleSGMLParser(self.results, self.url)
def download_torrent(self, url): def download_torrent(self, url):
""" Download file at url and write it to a file, return the path to the file and the url """ """ Download file at url and write it to a file, return the path to the file and the url """
@ -65,12 +65,13 @@ class torrentdownloads(object):
print path+" "+url print path+" "+url
class SimpleSGMLParser(sgmllib.SGMLParser): class SimpleSGMLParser(sgmllib.SGMLParser):
def __init__(self, results, url, *args): def __init__(self, results, url, what, *args):
sgmllib.SGMLParser.__init__(self) sgmllib.SGMLParser.__init__(self)
self.url = url self.url = url
self.li_counter = None self.li_counter = None
self.current_item = None self.current_item = None
self.results = results self.results = results
self.what = what.upper().split('+')
def start_a(self, attr): def start_a(self, attr):
params = dict(attr) params = dict(attr)
@ -110,6 +111,10 @@ class torrentdownloads(object):
self.current_item['seeds'] = 0 self.current_item['seeds'] = 0
if not self.current_item['leech'].isdigit(): if not self.current_item['leech'].isdigit():
self.current_item['leech'] = 0 self.current_item['leech'] = 0
# Search should use AND operator as a default
tmp = self.current_item['name'].upper();
for w in self.what:
if tmp.find(w) < 0: return
prettyPrinter(self.current_item) prettyPrinter(self.current_item)
self.results.append('a') self.results.append('a')
@ -118,7 +123,7 @@ class torrentdownloads(object):
i = 1 i = 1
while i<11: while i<11:
results = [] results = []
parser = self.SimpleSGMLParser(results, self.url) parser = self.SimpleSGMLParser(results, self.url, what)
dat = retrieve_url(self.url+'/search/?page=%d&search=%s&s_cat=%s&srt=seeds&pp=50&order=desc'%(i, what, self.supported_categories[cat])) dat = retrieve_url(self.url+'/search/?page=%d&search=%s&s_cat=%s&srt=seeds&pp=50&order=desc'%(i, what, self.supported_categories[cat]))
results_re = re.compile('(?s)<div class="torrentlist">.*') results_re = re.compile('(?s)<div class="torrentlist">.*')
for match in results_re.finditer(dat): for match in results_re.finditer(dat):