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

Merge branch 'develop'

Browse Source
This commit is contained in:
rembo10
2014-04-11 10:40:37 -07:00
parent f7df469cc3 bf918e6e56
commit 6c4da76056
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headphones/searcher.py
View File

@@ -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)
@@ -615,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:

2
headphones/versioncheck.py
View File

@@ -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: