diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py index 9330631d..32472cac 100644 --- a/couchpotato/core/plugins/base.py +++ b/couchpotato/core/plugins/base.py @@ -28,6 +28,7 @@ class Plugin(object): _needs_shutdown = False + user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20130519 Firefox/24.0' http_last_use = {} http_time_between_calls = 0 http_failed_request = {} @@ -106,7 +107,7 @@ class Plugin(object): # Fill in some headers headers['Referer'] = headers.get('Referer', urlparse(url).hostname) headers['Host'] = headers.get('Host', urlparse(url).hostname) - headers['User-Agent'] = headers.get('User-Agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.2) Gecko/20100101 Firefox/10.0.2') + headers['User-Agent'] = headers.get('User-Agent', self.user_agent) headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip') host = urlparse(url).hostname @@ -138,7 +139,7 @@ class Plugin(object): response = opener.open(request, timeout = timeout) else: - log.info('Opening url: %s, params: %s', (url, [x for x in params.iterkeys()])) + log.info('Opening url: %s, params: %s', (url, [x for x in params.iterkeys()] if isinstance(params, dict) else 'with data')) data = tryUrlencode(params) if len(params) > 0 else None request = urllib2.Request(url, data, headers) diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index 72bf42a6..e3709aa9 100644 --- a/couchpotato/core/providers/base.py +++ b/couchpotato/core/providers/base.py @@ -104,7 +104,7 @@ class YarrProvider(Provider): try: cookiejar = cookielib.CookieJar() opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar)) - opener.addheaders = [] + opener.addheaders = [('User-Agent', self.user_agent)] urllib2.install_opener(opener) log.info2('Logging into %s', self.urls['login']) f = opener.open(self.urls['login'], self.getLoginParams()) @@ -114,9 +114,12 @@ class YarrProvider(Provider): if self.loginSuccess(output): self.login_opener = opener return True - except: - log.error('Failed to login %s: %s', (self.getName(), traceback.format_exc())) + error = 'unknown' + except: + error = traceback.format_exc() + + log.error('Failed to login %s: %s', (self.getName(), error)) return False def loginSuccess(self, output):