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

Fixing FLAC OR MP3 combined searches and existing bug in handling torrents containing unicode names

Browse Source
This commit is contained in:
Aaron Cohen
2012-07-09 00:36:45 -07:00
parent af108d3914
commit cb57abc321
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/searcher.py
+4 -4
View File
@@ -711,7 +711,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
bitrate = "(Lossless)" bitrate = "(Lossless)"
maxsize = 10000000000 maxsize = 10000000000
elif headphones.PREFERRED_QUALITY: elif headphones.PREFERRED_QUALITY:
format = "(FLAC OR MP3)" format = "FLAC OR MP3"
maxsize = 10000000000 maxsize = 10000000000
else: else:
format = "MP3" format = "MP3"
@@ -719,7 +719,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
query_items = ['artist:"%s"' % artistterm, query_items = ['artist:"%s"' % artistterm,
'album:"%s"' % albumterm, 'album:"%s"' % albumterm,
'format:"%s"' % format, 'format:(%s)' % format,
'size:[0 TO %d]' % maxsize, 'size:[0 TO %d]' % maxsize,
'-seeders:0'] # cut out dead torrents '-seeders:0'] # cut out dead torrents
if bitrate: if bitrate:
@@ -984,7 +984,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
elif headphones.TORRENTBLACKHOLE_DIR != "": elif headphones.TORRENTBLACKHOLE_DIR != "":
# Get torrent name from .torrent, this is usually used by the torrent client as the folder name # Get torrent name from .torrent, this is usually used by the torrent client as the folder name
torrent_name = torrent_folder_name + '.torrent' torrent_name = torrent_folder_name + '.torrent'
download_path = os.path.join(headphones.TORRENTBLACKHOLE_DIR, torrent_name) download_path = os.path.join(headphones.TORRENTBLACKHOLE_DIR, torrent_name)
@@ -998,7 +998,7 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
torrent_file = open(download_path, 'rb') torrent_file = open(download_path, 'rb')
torrent_info = bencode.bdecode(torrent_file.read()) torrent_info = bencode.bdecode(torrent_file.read())
torrent_file.close() torrent_file.close()
torrent_folder_name = torrent_info['info'].get('name','') torrent_folder_name = torrent_info['info'].get('name','').decode('utf-8')
logger.info('Torrent folder name: %s' % torrent_folder_name) logger.info('Torrent folder name: %s' % torrent_folder_name)
except Exception, e: except Exception, e:
logger.error('Couldn\'t get name from Torrent file: %s' % e) logger.error('Couldn\'t get name from Torrent file: %s' % e)