From aba4bae39eb4780681f58d770cceb1dd66739b72 Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Fri, 11 Apr 2014 17:54:30 +0200 Subject: [PATCH 1/3] Comparing against remote branch should be master...local_version, instead the other way around --- headphones/versioncheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headphones/versioncheck.py b/headphones/versioncheck.py index 066a9713..d8ab0f87 100644 --- a/headphones/versioncheck.py +++ b/headphones/versioncheck.py @@ -137,7 +137,7 @@ def checkGithub(): return headphones.LATEST_VERSION logger.info('Comparing currently installed version with latest GitHub version') - url = 'https://api.github.com/repos/%s/headphones/compare/%s...%s' % (headphones.GIT_USER, headphones.CURRENT_VERSION, headphones.LATEST_VERSION) + url = 'https://api.github.com/repos/%s/headphones/compare/%s...%s' % (headphones.GIT_USER, headphones.LATEST_VERSION, headphones.CURRENT_VERSION) commits = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict) if commits is None: From 2d137ddcd64cf05919becced87d4a7e9cde9ca14 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Fri, 11 Apr 2014 10:35:34 -0700 Subject: [PATCH 2/3] Fix for newznab not being searched --- headphones/searcher.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/headphones/searcher.py b/headphones/searcher.py index f1c7ac2f..6f6b1e08 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -339,6 +339,10 @@ def searchNZB(album, new=False, losslessOnly=False): provider = "newznab" newznab_hosts = [] + if headphones.NEWZNAB_HOST and headphones.NEWZNAB_ENABLED: + + newznab_hosts.append((headphones.NEWZNAB_HOST, headphones.NEWZNAB_APIKEY, headphones.NEWZNAB_ENABLED)) + for newznab_host in headphones.EXTRA_NEWZNABS: if newznab_host[2] == '1' or newznab_host[2] == 1: newznab_hosts.append(newznab_host) From 0616aae68476ca6d2a619604cb397bb826565e62 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Fri, 11 Apr 2014 10:36:41 -0700 Subject: [PATCH 3/3] Fix for magnet links not being opened on windows --- headphones/searcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headphones/searcher.py b/headphones/searcher.py index 6f6b1e08..d9b74dc9 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -619,7 +619,7 @@ def send_to_downloader(data, bestqual, album): if headphones.OPEN_MAGNET_LINKS: try: if headphones.SYS_PLATFORM == 'win32': - os.startfile(besqual[2]) + os.startfile(bestqual[2]) elif headphones.SYS_PLATFORM == 'darwin': subprocess.Popen(["open", bestqual[2]], stdout=subprocess.PIPE, stderr=subprocess.PIPE) else: