From e9e9d31d3a15ae737639a92a24b931bd476e13c0 Mon Sep 17 00:00:00 2001 From: Clay Mitchell Date: Sat, 16 Feb 2013 15:22:41 -0500 Subject: [PATCH] fixed User-Agent problem for nzb.su, fixed startup failure if version wasn't detected --- mylar/__init__.py | 7 +++++-- mylar/prov_nzbx.py | 4 ++-- mylar/search.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mylar/__init__.py b/mylar/__init__.py index c0dd02e3..93faceea 100755 --- a/mylar/__init__.py +++ b/mylar/__init__.py @@ -349,7 +349,7 @@ def initialize(): flattened_newznabs = check_setting_str(CFG, 'Newznab', 'extra_newznabs', [], log=False) EXTRA_NEWZNABS = list(itertools.izip(*[itertools.islice(flattened_newznabs, i, None, 3) for i in range(3)])) - + # update folder formats in the config & bump up config version if CONFIG_VERSION == '0': from mylar.helpers import replace_all @@ -429,7 +429,10 @@ def initialize(): # Get the currently installed version - returns None, 'win32' or the git hash # Also sets INSTALL_TYPE variable to 'win', 'git' or 'source' CURRENT_VERSION = versioncheck.getVersion() - hash = CURRENT_VERSION[:7] + if CURRENT_VERSION is not None: + hash = CURRENT_VERSION[:7] + else: + hash = "unknown" print ("hash is set to : " + str(hash)) if version.MYLAR_VERSION == 'master': diff --git a/mylar/prov_nzbx.py b/mylar/prov_nzbx.py index 891343c2..0df37ef2 100755 --- a/mylar/prov_nzbx.py +++ b/mylar/prov_nzbx.py @@ -15,8 +15,8 @@ def searchit(cm): logger.fdebug(u'Parsing results from nzbx.co' % searchURL) request = urllib2.Request(searchURL) - request.add_header(mylar.USER_AGENT) - opener = urllib2.build_opener() + request.add_header('User-Agent', str(mylar.USER_AGENT)) + opener = urllib2.build_opener(urllib2.HTTPHandler(debuglevel=1)) try: data = opener.open(request).read() diff --git a/mylar/search.py b/mylar/search.py index 2dcf5319..8f09feb0 100755 --- a/mylar/search.py +++ b/mylar/search.py @@ -347,8 +347,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is # Add a user-agent print ("user-agent:" + str(mylar.USER_AGENT)) request = urllib2.Request(findurl) - request.add_header('User Agent', str(mylar.USER_AGENT)) - opener = urllib2.build_opener() + request.add_header('User-Agent', str(mylar.USER_AGENT)) + opener = urllib2.build_opener(urllib2.HTTPHandler(debuglevel=1)) try: data = opener.open(request).read()