From 161226180f4130011614654939684887f2932906 Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 24 Jul 2014 01:33:38 -0700 Subject: [PATCH] Cleaned up NyaaTorrents search code and fixed unicode issues. --- sickbeard/providers/nyaatorrents.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py index e379fd09..d9612e45 100644 --- a/sickbeard/providers/nyaatorrents.py +++ b/sickbeard/providers/nyaatorrents.py @@ -80,29 +80,28 @@ class NyaaProvider(generic.TorrentProvider): logger.log(u"Search string: " + searchURL, logger.DEBUG) data = self.cache.getRSSFeed(searchURL) - if not data: - logger.log(u"Error trying to load NyaaTorrents RSS feed: " + searchURL, logger.ERROR) - logger.log(u"RSS data: " + data, logger.DEBUG) return [] - items = data.entries + if 'entries' in data: + items = data.entries - results = [] + results = [] - for curItem in items: + for curItem in items: - (title, url) = self._get_title_and_url(curItem) + (title, url) = self._get_title_and_url(curItem) - if not title or not url: - logger.log( - u"The XML returned from the NyaaTorrents RSS feed is incomplete, this result is unusable: " + data, - logger.ERROR) - continue + if title and url: + results.append(curItem) + else: + logger.log( + u"The data returned from the " + self.name + " is incomplete, this result is unusable", + logger.DEBUG) - results.append(curItem) + return results - return results + return [] def _get_title_and_url(self, item):