gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-21 02:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some merge conflicts doe to the tabs->whitespace change

Browse Source
This commit is contained in:
rembo10
2012-06-22 14:40:09 +05:30
parent 63e4dc65c2 b6be5f828a
commit f4a05cde51
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
headphones/searcher.py
View File

@@ -640,7 +640,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
data = False
if data:
d = feedparser.parse(data)
if not len(d.entries):
logger.info(u"No results found from %s for %s" % (provider, term))
@@ -658,6 +658,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
if format == "2":
request = urllib2.Request(url)
request.add_header('Accept-encoding', 'gzip')
request.add_header('Referer', 'http://kat.ph/')
response = urllib2.urlopen(request)
if response.info().get('Content-Encoding') == 'gzip':
buf = StringIO( response.read())
@@ -910,30 +911,26 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
def preprocesstorrent(resultlist):
selresult = ""
for result in resultlist:
try:
if selresult == "":
selresult = result
request = urllib2.Request(result[2])
request.add_header('Accept-encoding', 'gzip')
response = urllib2.urlopen(request)
if response.info().get('Content-Encoding') == 'gzip':
buf = StringIO( response.read())
f = gzip.GzipFile(fileobj=buf)
torrent = f.read()
else:
torrent = response.read()
elif int(selresult[1]) < int(result[1]):
selresult = result
request = urllib2.Request(result[2])
request.add_header('Accept-encoding', 'gzip')
response = urllib2.urlopen(request)
if response.info().get('Content-Encoding') == 'gzip':
buf = StringIO( response.read())
f = gzip.GzipFile(fileobj=buf)
torrent = f.read()
else:
torrent = response.read()
except ExpatError:
logger.error('Unable to torrent file. Skipping.')
continue
if selresult == "":
selresult = result
elif int(selresult[1]) < int(result[1]): # if size is lower than new result replace previous selected result (bigger size = better quality?)
selresult = result
try:
request = urllib2.Request(selresult[2])
request.add_header('Accept-encoding', 'gzip')
if selresult[3] == 'Kick Ass Torrent':
request.add_header('Referer', 'http://kat.ph/')
response = urllib2.urlopen(request)
if response.info().get('Content-Encoding') == 'gzip':
buf = StringIO(response.read())
f = gzip.GzipFile(fileobj=buf)
torrent = f.read()
else:
torrent = response.read()
except ExpatError:
logger.error('Unable to torrent %s' % selresult[2])
return torrent, selresult