From ec857a9b3d4cedd2ec48237f2b645eb1134d6995 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 7 Jan 2013 22:31:42 +0100 Subject: [PATCH] FTDWorld: Check for login success --- couchpotato/core/providers/base.py | 11 ++++++++--- couchpotato/core/providers/nzb/ftdworld/main.py | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index 213fa43..9c143d8 100644 --- a/couchpotato/core/providers/base.py +++ b/couchpotato/core/providers/base.py @@ -95,15 +95,20 @@ class YarrProvider(Provider): urllib2.install_opener(opener) log.info2('Logging into %s', self.urls['login']) f = opener.open(self.urls['login'], self.getLoginParams()) - f.read() + output = f.read() f.close() - self.login_opener = opener - return True + + if self.loginSuccess(output): + self.login_opener = opener + return True except: log.error('Failed to login %s: %s', (self.getName(), traceback.format_exc())) return False + def loginSuccess(self, output): + return True + def loginDownload(self, url = '', nzb_id = ''): try: if not self.login_opener and not self.login(): diff --git a/couchpotato/core/providers/nzb/ftdworld/main.py b/couchpotato/core/providers/nzb/ftdworld/main.py index 9a3a9f3..c5a0665 100644 --- a/couchpotato/core/providers/nzb/ftdworld/main.py +++ b/couchpotato/core/providers/nzb/ftdworld/main.py @@ -71,3 +71,6 @@ class FTDWorld(NZBProvider): 'passlogin': self.conf('password'), 'submit': 'Log In', }) + + def loginSuccess(self, output): + return 'password is incorrect' not in output