From 5f1c16ca02a3e159386cdde33f08dd21edbef50c Mon Sep 17 00:00:00 2001 From: echel0n Date: Sun, 30 Nov 2014 09:16:35 -0800 Subject: [PATCH] Fixed issue #990 - was not properly calling lower function --- gui/slick/interfaces/default/history.tmpl | 4 ++-- sickbeard/providers/tvtorrents.py | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl index dcf7a0fc..33995fd5 100644 --- a/gui/slick/interfaces/default/history.tmpl +++ b/gui/slick/interfaces/default/history.tmpl @@ -128,7 +128,7 @@ #set $curdatetime = $datetime.datetime.strptime(str($hItem["date"]), $history.dateFormat)
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True)
$time.mktime($curdatetime.timetuple()) - $hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower or "repack" in $hItem["resource"].lower then ' Proper' else ""# + $hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower() or "repack" in $hItem["resource"].lower() then ' Proper' else ""# #if $curStatus == SUBTITLED: "> @@ -190,7 +190,7 @@ #set $curdatetime = $datetime.datetime.strptime(str($hItem["actions"][0]["time"]), $history.dateFormat)
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True)
$time.mktime($curdatetime.timetuple()) - $hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower or "repack" in $hItem["resource"].lower then ' Proper' else ""# + $hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower() or "repack" in $hItem["resource"].lower() then ' Proper' else ""# "> #for $action in sorted($hItem["actions"]): diff --git a/sickbeard/providers/tvtorrents.py b/sickbeard/providers/tvtorrents.py index 227c1941..4fa61346 100644 --- a/sickbeard/providers/tvtorrents.py +++ b/sickbeard/providers/tvtorrents.py @@ -61,11 +61,8 @@ class TvTorrentsProvider(generic.TorrentProvider): return True def _checkAuthFromData(self, data): - if data.feed.title: - description_text = data.feed.title - - if "User can't be found" in description_text or "Invalid Hash" in description_text: - logger.log(u"Incorrect authentication credentials for " + self.name + " : " + str(description_text), + if "User can't be found" in data.feed.title or "Invalid Hash" in data.feed.title: + logger.log(u"Incorrect authentication credentials for " + self.name + " : " + str(data.feed.title), logger.DEBUG) raise AuthException( u"Your authentication credentials for " + self.name + " are incorrect, check your config")