diff --git a/sickbeard/logger.py b/sickbeard/logger.py index 9e360307..32156b72 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -98,7 +98,7 @@ class SBRotatingLogHandler(object): # define a Handler which writes INFO messages or higher to the sys.stderr console = logging.StreamHandler() - console.setLevel(logging.DEBUG) + console.setLevel(logging.INFO) # set a format which is simpler for console use console.setFormatter(DispatchingFormatter( diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index 80835f02..78b17d68 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -211,4 +211,25 @@ sports_regexs = [ (?P.*?(?.*?)$ '''), + + ('sports_parts_without_event', + # Show.Name.Event.Nov.23rd.2010.Source.Quality.Etc-Group + ''' + ^(?P.*?(UEFA|MLB|ESPN|WWE|MMA|UFC|TNA|EPL|NASCAR|NBA|NFL|NHL|NRL|PGA|SUPER LEAGUE|FORMULA|FIFA|NETBALL|MOTOGP).*?)[. _-]+ + (?P\d{1,3}\d{1,3}.*?)[. _-]+ + (?P\d{1,2}[a-zA-Z]{2})[. _-]+ + (?P[a-zA-Z]{3,})[. _-]+ + (?P\d{4})[. _-]+ + (?P.*?(?.*?)$ + '''), + + ('sports_bare', + # Show.Name.Event.Nov.23rd.2010.Source.Quality.Etc-Group + ''' + ^(?P.*?(UEFA|MLB|ESPN|WWE|MMA|UFC|TNA|EPL|NASCAR|NBA|NFL|NHL|NRL|PGA|SUPER LEAGUE|FORMULA|FIFA|NETBALL|MOTOGP).*?)[. _-]+ + (?P\d{1,3}\d{1,3}.*?)[. _-]+ + (?P.*?(?.*?)$ + '''), ] \ No newline at end of file diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py index da527b53..715b7800 100644 --- a/sickbeard/providers/btn.py +++ b/sickbeard/providers/btn.py @@ -357,9 +357,7 @@ class BTNCache(tvcache.TVCache): logger.WARNING) seconds_since_last_update = 86400 - data = self.provider._doSearch(search_params=None, age=seconds_since_last_update) - - return data + return self.provider._doSearch(search_params=None, age=seconds_since_last_update) def _parseItem(self, item): (title, url) = self.provider._get_title_and_url(item) diff --git a/sickbeard/providers/dtt.py b/sickbeard/providers/dtt.py index 20ae468e..4c8ea86c 100644 --- a/sickbeard/providers/dtt.py +++ b/sickbeard/providers/dtt.py @@ -126,8 +126,7 @@ class DTTCache(tvcache.TVCache): url = self.provider.url + 'rss/allshows?' + urllib.urlencode(params) logger.log(u"DTT cache update URL: " + url, logger.DEBUG) - data = self.provider.getRSSFeed(url) - return data + return self.provider.getRSSFeed(url) def _parseItem(self, item): title, url = self.provider._get_title_and_url(item) diff --git a/sickbeard/providers/ezrss.py b/sickbeard/providers/ezrss.py index 04856033..e8a6833b 100644 --- a/sickbeard/providers/ezrss.py +++ b/sickbeard/providers/ezrss.py @@ -118,7 +118,6 @@ class EZRSSProvider(generic.TorrentProvider): data = self.getRSSFeed(search_url) if not data: - logger.log(u"No data returned from " + search_url, logger.ERROR) return [] items = data.entries @@ -172,13 +171,7 @@ class EZRSSCache(tvcache.TVCache): rss_url = self.provider.url + 'feed/' logger.log(self.provider.name + " cache update URL: " + rss_url, logger.DEBUG) - data = self.provider.getRSSFeed(rss_url) - - if not data: - logger.log(u"No data returned from " + rss_url, logger.ERROR) - return None - - return data + return self.provider.getRSSFeed(rss_url) def _parseItem(self, item): diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index fde5aeb4..d6a88e4b 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -44,7 +44,6 @@ from lib.hachoir_parser import createParser from sickbeard.name_parser.parser import NameParser, InvalidNameException from sickbeard.common import Quality, Overview - class GenericProvider: NZB = "nzb" TORRENT = "torrent" @@ -137,6 +136,12 @@ class GenericProvider: if not f: logger.log(u"Error loading " + self.name + " URL: " + url, logger.ERROR) return None + elif 'error' in f.feed: + logger.log(u"Newznab ERROR:[%s] CODE:[%s]" % (f.feed['error']['description'], f.feed['error']['code']), logger.DEBUG) + return None + elif not f.entries: + logger.log(u"Error loading RSS feed items for " + self.name + " using URL: " + url, logger.ERROR) + return None return f diff --git a/sickbeard/providers/newzbin.py b/sickbeard/providers/newzbin.py index db39293d..0c69f9e6 100644 --- a/sickbeard/providers/newzbin.py +++ b/sickbeard/providers/newzbin.py @@ -323,9 +323,7 @@ class NewzbinProvider(generic.NZBProvider): url = self.url + "search/?%s" % urllib.urlencode(params) logger.log("Newzbin search URL: " + url, logger.DEBUG) - data = self.getRSSFeed(url) - - return data + return self.getRSSFeed(url) def _checkAuth(self): if sickbeard.NEWZBIN_USERNAME in (None, "") or sickbeard.NEWZBIN_PASSWORD in (None, ""): @@ -342,9 +340,7 @@ class NewzbinCache(tvcache.TVCache): def _getRSSData(self): - data = self.provider._getRSSData() - - return data + return self.provider._getRSSData() def _parseItem(self, item): diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py index 51e432bb..8aafd6d3 100644 --- a/sickbeard/providers/newznab.py +++ b/sickbeard/providers/newznab.py @@ -166,19 +166,9 @@ class NewznabProvider(generic.NZBProvider): if data is None: return self._checkAuth() - if len(data.feed) > 0: - if 'error' in data.feed: - if data.feed.error == 100: - raise AuthException("Your API key for " + self.name + " is incorrect, check your config.") - elif data.feed.error == 101: - raise AuthException("Your account on " + self.name + " has been suspended, contact the administrator.") - elif data.feed.error == 102: - raise AuthException( - "Your account isn't allowed to use the API on " + self.name + ", contact the administrator") - else: - logger.log(u"Unknown error given from " + self.name + ": " + data.feed.title, - logger.ERROR) - return False + if 'error' in data.feed: + logger.log(u"Newznab ERROR:[%s] CODE:[%s]" % (data.feed['error']['description'], data.feed['error']['code']), logger.DEBUG) + raise AuthException("%s" % data.feed['error']['description']) return True @@ -206,9 +196,7 @@ class NewznabProvider(generic.NZBProvider): logger.log(u"Search url: " + search_url, logger.DEBUG) data = self.getRSSFeed(search_url) - if not data: - logger.log(u"No data returned from " + search_url, logger.ERROR) return [] if self._checkAuthFromData(data): @@ -279,13 +267,7 @@ class NewznabCache(tvcache.TVCache): logger.log(self.provider.name + " cache update URL: " + rss_url, logger.DEBUG) - data = self.provider.getRSSFeed(rss_url) - - if not data: - logger.log(u"No data returned from " + rss_url, logger.ERROR) - return None - - return data + return self.provider.getRSSFeed(rss_url) def _checkAuth(self, data): return self.provider._checkAuthFromData(data) diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py index 9a462b71..f835f81d 100644 --- a/sickbeard/providers/nyaatorrents.py +++ b/sickbeard/providers/nyaatorrents.py @@ -133,9 +133,7 @@ class NyaaCache(tvcache.TVCache): logger.log(u"NyaaTorrents cache update URL: " + url, logger.DEBUG) - data = self.provider.getRSSFeed(url) - - return data + return self.provider.getRSSFeed(url) def _parseItem(self, item): (title, url) = self.provider._get_title_and_url(item) diff --git a/sickbeard/providers/nzbs_org_old.py b/sickbeard/providers/nzbs_org_old.py index 2111bc37..fb99c1ac 100644 --- a/sickbeard/providers/nzbs_org_old.py +++ b/sickbeard/providers/nzbs_org_old.py @@ -151,9 +151,7 @@ class NZBsCache(tvcache.TVCache): logger.log(u"NZBs cache update URL: " + url, logger.DEBUG) - data = self.provider.getURL(url) - - return data + return self.provider.getURL(url) def _checkItemAuth(self, title, url): if "&i=" not in url and "&h=" not in url: diff --git a/sickbeard/providers/nzbsrus.py b/sickbeard/providers/nzbsrus.py index e2283f13..7dc9e8ff 100644 --- a/sickbeard/providers/nzbsrus.py +++ b/sickbeard/providers/nzbsrus.py @@ -107,8 +107,7 @@ class NZBsRUSCache(tvcache.TVCache): url += urllib.urlencode(urlArgs) logger.log(u"NZBs'R'US cache update URL: " + url, logger.DEBUG) - data = self.provider.getRSSFeed(url) - return data + return self.provider.getRSSFeed(url) def _checkAuth(self, data): return data != 'Invalid Link' diff --git a/sickbeard/providers/omgwtfnzbs.py b/sickbeard/providers/omgwtfnzbs.py index ff6c9ef6..2e789362 100644 --- a/sickbeard/providers/omgwtfnzbs.py +++ b/sickbeard/providers/omgwtfnzbs.py @@ -164,13 +164,7 @@ class OmgwtfnzbsCache(tvcache.TVCache): logger.log(self.provider.name + u" cache update URL: " + rss_url, logger.DEBUG) - data = self.provider.getRSSFeed(rss_url) - - if not data: - logger.log(u"No data returned from " + rss_url, logger.ERROR) - return None - - return data + return self.provider.getRSSFeed(rss_url) def _checkAuth(self, data): return self.provider._checkAuthFromData(data) diff --git a/sickbeard/providers/rsstorrent.py b/sickbeard/providers/rsstorrent.py index 9a320f30..d852c6f2 100644 --- a/sickbeard/providers/rsstorrent.py +++ b/sickbeard/providers/rsstorrent.py @@ -82,7 +82,6 @@ class TorrentRssProvider(generic.TorrentProvider): try: data = self.cache._getRSSData() - if not data: return (False, 'No data returned from url: ' + self.url) diff --git a/sickbeard/providers/thepiratebay.py b/sickbeard/providers/thepiratebay.py index cbad7f7d..67c37262 100644 --- a/sickbeard/providers/thepiratebay.py +++ b/sickbeard/providers/thepiratebay.py @@ -122,7 +122,6 @@ class ThePirateBayProvider(generic.TorrentProvider): fileURL = self.proxy._buildURL(self.url + 'ajax_details_filelist.php?id=' + str(torrent_id)) data = self.getURL(fileURL) - if not data: return None diff --git a/sickbeard/providers/tvtorrents.py b/sickbeard/providers/tvtorrents.py index dbba297d..63d50b8b 100644 --- a/sickbeard/providers/tvtorrents.py +++ b/sickbeard/providers/tvtorrents.py @@ -84,13 +84,7 @@ class TvTorrentsCache(tvcache.TVCache): rss_url = self.provider.url + 'RssServlet?digest=' + sickbeard.TVTORRENTS_DIGEST + '&hash=' + sickbeard.TVTORRENTS_HASH + '&fname=true&exclude=(' + ignore_regex + ')' logger.log(self.provider.name + u" cache update URL: " + rss_url, logger.DEBUG) - data = self.provider.getRSSFeed(rss_url) - - if not data: - logger.log(u"No data returned from " + rss_url, logger.ERROR) - return None - - return data + return self.provider.getRSSFeed(rss_url) def _checkAuth(self, data): return self.provider._checkAuthFromData(data) diff --git a/sickbeard/providers/womble.py b/sickbeard/providers/womble.py index fa375831..920239da 100644 --- a/sickbeard/providers/womble.py +++ b/sickbeard/providers/womble.py @@ -42,8 +42,7 @@ class WombleCache(tvcache.TVCache): def _getRSSData(self): url = self.provider.url + 'rss/?sec=TV-x264&fr=false' logger.log(u"Womble's Index cache update URL: " + url, logger.DEBUG) - data = self.provider.getRSSFeed(url) - return data + return self.provider.getRSSFeed(url) def _checkAuth(self, data): return data != 'Invalid Link' diff --git a/tests/xem_tests.py b/tests/xem_tests.py index 96744132..e1ae2b23 100644 --- a/tests/xem_tests.py +++ b/tests/xem_tests.py @@ -56,8 +56,8 @@ class XEMBasicTests(test.SickbeardTestDBCase): ep_date_formated = ep.airdate.strftime('%b') - show_name = 'UFC' - if show_name.lower() in sickbeard.showList: + show_name = None + if show_name: print 'good' else: print 'bad'