From c5c20578590c1bc54da608aa00f3bbc8777be087 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Fri, 13 Mar 2015 23:43:29 -0700 Subject: [PATCH] Return everything if they're looking for a specific download --- headphones/searcher.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/headphones/searcher.py b/headphones/searcher.py index f614a1f0..549e2e05 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -225,7 +225,7 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False): myDB = db.DBConnection() albumlength = myDB.select('SELECT sum(TrackDuration) from tracks WHERE AlbumID=?', [album['AlbumID']])[0][0] - if headphones.CONFIG.PREFER_TORRENTS == 0: + if headphones.CONFIG.PREFER_TORRENTS == 0 and not choose_specific_download: if NZB_PROVIDERS and NZB_DOWNLOADERS: results = searchNZB(album, new, losslessOnly, albumlength) @@ -233,7 +233,7 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False): if not results and TORRENT_PROVIDERS: results = searchTorrent(album, new, losslessOnly, albumlength) - elif headphones.CONFIG.PREFER_TORRENTS == 1: + elif headphones.CONFIG.PREFER_TORRENTS == 1 and not choose_specific_download: if TORRENT_PROVIDERS: results = searchTorrent(album, new, losslessOnly, albumlength) @@ -247,10 +247,10 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False): torrent_results = None if NZB_PROVIDERS and NZB_DOWNLOADERS: - nzb_results = searchNZB(album, new, losslessOnly, albumlength) + nzb_results = searchNZB(album, new, losslessOnly, albumlength, choose_specific_download) if TORRENT_PROVIDERS: - torrent_results = searchTorrent(album, new, losslessOnly, albumlength) + torrent_results = searchTorrent(album, new, losslessOnly, albumlength, choose_specific_download) if not nzb_results: nzb_results = [] @@ -429,7 +429,7 @@ def get_year_from_release_date(release_date): return year -def searchNZB(album, new=False, losslessOnly=False, albumlength=None): +def searchNZB(album, new=False, losslessOnly=False, albumlength=None, choose_specific_download=False): reldate = album['ReleaseDate'] year = get_year_from_release_date(reldate) @@ -691,7 +691,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None): results = [result for result in resultlist if verifyresult(result[0], artistterm, term, losslessOnly)] # Additional filtering for size etc - if results: + if results and not choose_specific_download: results = more_filtering(results, album, albumlength, new) return results @@ -1018,7 +1018,7 @@ def verifyresult(title, artistterm, term, lossless): return True -def searchTorrent(album, new=False, losslessOnly=False, albumlength=None): +def searchTorrent(album, new=False, losslessOnly=False, albumlength=None, choose_specific_download=False): global gazelle # persistent what.cd api object to reduce number of login attempts # rutracker login @@ -1525,7 +1525,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None): results = [result for result in resultlist if verifyresult(result[0], artistterm, term, losslessOnly)] # Additional filtering for size etc - if results: + if results and not choose_specific_download: results = more_filtering(results, album, albumlength, new) return results