Fixed minor issues with provider rss caching code.

Fixed login issues with T411 provider.
Added 2 new subcats to T411 provider - 455 and 637

sickbeard/providers/bitsoup.py

@@ -246,10 +246,7 @@ class BitSoupProvider(generic.TorrentProvider):
             ' OR (e.status IN (' + ','.join([str(x) for x in Quality.SNATCHED]) + ')))'
         )
 
-        if not sqlResults:
+        for sqlshow in sqlResults or []:
-            return []
-
-        for sqlshow in sqlResults:
             self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
             if self.show:
                 curEp = self.show.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))

sickbeard/providers/btn.py

@@ -78,6 +78,7 @@ class BTNProvider(generic.TorrentProvider):
 
         self._checkAuth()
 
+        results = []
         params = {}
         apikey = self.api_key
 
@@ -120,16 +121,13 @@ class BTNProvider(generic.TorrentProvider):
                     if 'torrents' in parsedJSON:
                         found_torrents.update(parsedJSON['torrents'])
 
-            results = []
             for torrentid, torrent_info in found_torrents.iteritems():
                 (title, url) = self._get_title_and_url(torrent_info)
 
                 if title and url:
                     results.append(torrent_info)
 
-            return results
+        return results
-
-        return []
 
     def _api_call(self, apikey, params={}, results_per_page=1000, offset=0):
 

sickbeard/providers/freshontv.py

@@ -181,7 +181,7 @@ class FreshOnTVProvider(generic.TorrentProvider):
         freeleech = '3' if self.freeleech else '0'
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/providers/hdbits.py

@@ -205,14 +205,16 @@ class HDBitsCache(tvcache.TVCache):
         self.minTime = 15
 
     def _getRSSData(self):
+        results = []
+
         try:
             parsedJSON = self.provider.getURL(self.provider.rss_url, post_data=self.provider._make_post_data_JSON(),
                                               json=True)
             if self.provider._checkAuthFromData(parsedJSON):
-                return parsedJSON['data']
+                results = parsedJSON['data']
         except:
             pass
 
-        return []
+        return results
 
 provider = HDBitsProvider()                                                                                                              

sickbeard/providers/hdtorrents.py

@@ -179,7 +179,7 @@ class HDTorrentsProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/providers/iptorrents.py

@@ -158,7 +158,7 @@ class IPTorrentsProvider(generic.TorrentProvider):
         freeleech = '&free=on' if self.freeleech else ''
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/providers/kat.py

@@ -359,5 +359,4 @@ class KATCache(tvcache.TVCache):
         search_params = {'RSS': ['rss']}
         return self.provider._doSearch(search_params)
 
-
 provider = KATProvider()

sickbeard/providers/newznab.py

@@ -15,6 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
+import traceback
 
 import urllib
 import time
@@ -427,36 +428,45 @@ class NewznabCache(tvcache.TVCache):
         return self.provider._checkAuthFromData(data)
 
     def updateCache(self):
+        if not self.shouldUpdate():
+            return
 
-        if self.shouldUpdate() and self._checkAuth(None):
+        try:
-            data = self._getRSSData()
+            if self._checkAuth(None):
+                data = self._getRSSData()
+                if not data or not len(data) > 0:
+                    return
 
-            # as long as the http request worked we count this as an update
+                # clear cache
-            if not data:
+                self._clearCache()
-                return []
 
-            self.setLastUpdate()
+                # set updated
+                self.setLastUpdate()
 
-            # clear cache
+                try:
-            self._clearCache()
+                    items = data.get('entries', [])
+                except:
+                    items = data
 
-            if self._checkAuth(data):
+                if self._checkAuth(items):
-                items = data.entries
+                    cl = []
-                cl = []
+                    for item in items:
-                for item in items:
+                        ci = self._parseItem(item)
-                    ci = self._parseItem(item)
+                        if ci is not None:
-                    if ci is not None:
+                            cl.append(ci)
-                        cl.append(ci)
 
-                if len(cl) > 0:
+                    if len(cl) > 0:
-                    myDB = self._getDB()
+                        myDB = self._getDB()
-                    myDB.mass_action(cl)
+                        myDB.mass_action(cl)
 
-            else:
+                else:
-                raise AuthException(
+                    raise AuthException(
-                    u"Your authentication credentials for " + self.provider.name + " are incorrect, check your config")
+                        u"Your authentication credentials for " + self.provider.name + " are incorrect, check your config")
-
+        except AuthException, e:
-        return []
+            logger.log(u"Authentication error: " + ex(e), logger.ERROR)
+        except Exception, e:
+            logger.log(u"Error while searching " + self.provider.name + ", skipping: " + ex(e), logger.ERROR)
+            logger.log(traceback.format_exc(), logger.DEBUG)
 
     # overwrite method with that parses the rageid from the newznab feed
     def _parseItem(self, item):

sickbeard/providers/nextgen.py

@@ -190,7 +190,7 @@ class NextGenProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
 

sickbeard/providers/rsstorrent.py

@@ -107,12 +107,11 @@ class TorrentRssProvider(generic.TorrentProvider):
                 if not cookie_validator.match(self.cookies):
                     return (False, 'Cookie is not correctly formatted: ' + self.cookies)
 
-            items = self.cache._getRSSData()
+            data = self.cache._getRSSData()
-
+            if not data or not len(data) > 0:
-            if not len(items) > 0:
                 return (False, 'No items found in the RSS feed ' + self.url)
 
-            (title, url) = self._get_title_and_url(items[0])
+            (title, url) = self._get_title_and_url(data.entries[0])
 
             if not title:
                 return (False, 'Unable to get title from first item')

sickbeard/providers/scc.py

@@ -164,7 +164,7 @@ class SCCProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         data = []
         searchURLS = []
@@ -307,6 +307,4 @@ class SCCCache(tvcache.TVCache):
         search_params = {'RSS': ['']}
         return self.provider._doSearch(search_params)
 
-
-
 provider = SCCProvider()

sickbeard/providers/speedcd.py

@@ -151,7 +151,7 @@ class SpeedCDProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:
@@ -256,7 +256,5 @@ class SpeedCDCache(tvcache.TVCache):
         search_params = {'RSS': ['']}
         return self.provider._doSearch(search_params)
 
-
-
 provider = SpeedCDProvider()
 

sickbeard/providers/t411.py

@@ -12,7 +12,7 @@
 # Sick Beard is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
@@ -25,6 +25,8 @@ import sickbeard
 import generic
 
 from lib import requests
+from lib.requests import exceptions
+
 from sickbeard.common import USER_AGENT, Quality, cpu_presets
 from sickbeard import logger
 from sickbeard import tvcache
@@ -34,32 +36,29 @@ from sickbeard import db
 from sickbeard import helpers
 from sickbeard import classes
 from sickbeard.helpers import sanitizeSceneName
+from sickbeard.exceptions import ex
+
 
 class T411Provider(generic.TorrentProvider):
     urls = {'base_url': 'http://www.t411.me/',
-            'search': 'http://www.t411.me/torrents/search/?name=%s&cat=210&subcat=433&search=%s&submit=Recherche',
+            'search': 'http://www.t411.me/torrents/search/?name=%s&cat=210&subcat=%s&search=%s&submit=Recherche',
             'login_page': 'http://www.t411.me/users/login/',
             'download': 'http://www.t411.me/torrents/download/?id=%s',
     }
 
     def __init__(self):
-
         generic.TorrentProvider.__init__(self, "T411")
 
         self.supportsBacklog = True
-
         self.enabled = False
         self.username = None
         self.password = None
         self.ratio = None
 
         self.cache = T411Cache(self)
-
         self.url = self.urls['base_url']
 
-        self.last_login_check = None
+        self.subcategories = [637, 455, 433]
-
-        self.login_opener = None
 
     def isEnabled(self):
         return self.enabled
@@ -68,60 +67,27 @@ class T411Provider(generic.TorrentProvider):
         return 't411.png'
 
     def getQuality(self, item, anime=False):
-
         quality = Quality.sceneQuality(item[0], anime)
         return quality
 
-    def getLoginParams(self):
+    def _doLogin(self):
-        return {
+        login_params = {'login': self.username,
-            'login': self.username,
+                        'password': self.password,
-            'password': self.password,
-            'remember': '1',
         }
 
-    def loginSuccess(self, output):
+        self.session = requests.Session()
-        if "<span>Ratio: <strong class" in output.text:
-            return True
-        else:
-            return False
-
-    def _doLogin(self):
-
-        now = time.time()
-
-        if self.login_opener and self.last_login_check < (now - 3600):
-            try:
-                output = self.login_opener.open(self.urls['test'])
-                if self.loginSuccess(output):
-                    self.last_login_check = now
-                    return True
-                else:
-                    self.login_opener = None
-            except:
-                self.login_opener = None
-
-        if self.login_opener:
-            return True
 
         try:
-            login_params = self.getLoginParams()
+            response = self.session.post(self.urls['login_page'], data=login_params, timeout=30, verify=False)
-            self.session = requests.Session()
+        except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError), e:
-            self.session.headers.update({'User-Agent': USER_AGENT})
+            logger.log(u'Unable to connect to ' + self.name + ' provider: ' + ex(e), logger.ERROR)
-            data = self.session.get(self.urls['login_page'], verify=False)
+            return False
-            output = self.session.post(self.urls['login_page'], data=login_params, verify=False)
-            if self.loginSuccess(output):
-                self.last_login_check = now
-                self.login_opener = self.session
-                return True
 
-            error = 'unknown'
+        if not re.search('/users/logout/', response.text.lower()):
-        except:
+            logger.log(u'Invalid username or password for ' + self.name + ' Check your settings', logger.ERROR)
-            error = traceback.format_exc()
+            return False
-            self.login_opener = None
 
-        self.login_opener = None
+        return True
-        logger.log(u'Failed to login:' + str(error), logger.ERROR)
-        return False
 
     def _get_season_search_strings(self, ep_obj):
 
@@ -177,7 +143,7 @@ class T411Provider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
 
@@ -187,54 +153,55 @@ class T411Provider(generic.TorrentProvider):
                     search_string2 = ''
                 else:
                     search_string2 = '%40name+' + search_string + '+'
-                    
-                searchURL = self.urls['search'] % (search_string, search_string2)
-                logger.log(u"" + self.name + " search page URL: " + searchURL, logger.DEBUG)
 
-                data = self.getURL(searchURL)
+                for sc in self.subcategories:
+                    searchURL = self.urls['search'] % (search_string, sc, search_string2)
+                    logger.log(u"" + self.name + " search page URL: " + searchURL, logger.DEBUG)
 
-                if not data:
+                    data = self.getURL(searchURL)
-                    continue
+                    if not data:
+                        continue
 
-                try:
+                    try:
-                    with BS4Parser(data.decode('iso-8859-1'), features=["html5lib", "permissive"]) as html:
+                        with BS4Parser(data, features=["html5lib", "permissive"]) as html:
-                        resultsTable = html.find('table', attrs={'class': 'results'})
+                            resultsTable = html.find('table', attrs={'class': 'results'})
 
-                        if not resultsTable:
+                            if not resultsTable:
-                            logger.log(u"The Data returned from " + self.name + " do not contains any torrent",
+                                logger.log(u"The Data returned from " + self.name + " do not contains any torrent",
-                                       logger.DEBUG)
+                                           logger.DEBUG)
-                            continue
+                                continue
 
-                        entries = resultsTable.find("tbody").findAll("tr")
+                            entries = resultsTable.find("tbody").findAll("tr")
 
-                        if len(entries) > 0:
+                            if len(entries) > 0:
-                            for result in entries:
+                                for result in entries:
 
-                                try:
+                                    try:
-                                    link = result.find('a', title=True)
+                                        link = result.find('a', title=True)
-                                    torrentName = link['title']
+                                        torrentName = link['title']
-                                    torrent_name = str(torrentName)
+                                        torrent_name = str(torrentName)
-                                    torrentId = result.find_all('td')[2].find_all('a')[0]['href'][1:].replace('torrents/nfo/?id=','')
+                                        torrentId = result.find_all('td')[2].find_all('a')[0]['href'][1:].replace(
-                                    torrent_download_url = (self.urls['download'] % torrentId).encode('utf8')
+                                            'torrents/nfo/?id=', '')
-                                except (AttributeError, TypeError):
+                                        torrent_download_url = (self.urls['download'] % torrentId).encode('utf8')
-                                    continue
+                                    except (AttributeError, TypeError):
+                                        continue
 
-                                if not torrent_name or not torrent_download_url:
+                                    if not torrent_name or not torrent_download_url:
-                                    continue
+                                        continue
 
-                                item = torrent_name, torrent_download_url
+                                    item = torrent_name, torrent_download_url
-                                logger.log(u"Found result: " + torrent_name + " (" + torrent_download_url + ")", logger.DEBUG)
+                                    logger.log(u"Found result: " + torrent_name + " (" + torrent_download_url + ")",
-                                items[mode].append(item)
+                                               logger.DEBUG)
+                                    items[mode].append(item)
 
-                        else:
+                            else:
-                            logger.log(u"The Data returned from " + self.name + " do not contains any torrent",
+                                logger.log(u"The Data returned from " + self.name + " do not contains any torrent",
-                                       logger.WARNING)
+                                           logger.WARNING)
-                            continue
+                                continue
-
-                except Exception, e:
-                    logger.log(u"Failed parsing " + self.name + " Traceback: " + traceback.format_exc(),
-                               logger.ERROR)
 
+                    except Exception, e:
+                        logger.log(u"Failed parsing " + self.name + " Traceback: " + traceback.format_exc(),
+                                   logger.ERROR)
             results += items[mode]
 
         return results
@@ -286,13 +253,12 @@ class T411Provider(generic.TorrentProvider):
 
 class T411Cache(tvcache.TVCache):
     def __init__(self, provider):
-
         tvcache.TVCache.__init__(self, provider)
 
         # Only poll T411 every 10 minutes max
         self.minTime = 10
 
-    def _getDailyData(self):
+    def _getRSSData(self):
         search_params = {'RSS': ['']}
         return self.provider._doSearch(search_params)
 

sickbeard/providers/thepiratebay.py

@@ -342,7 +342,6 @@ class ThePirateBayCache(tvcache.TVCache):
         search_params = {'RSS': ['rss']}
         return self.provider._doSearch(search_params)
 
-
 class ThePirateBayWebproxy:
     def __init__(self):
         self.Type = 'GlypeProxy'

sickbeard/providers/torrentbytes.py

@@ -151,7 +151,7 @@ class TorrentBytesProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/providers/torrentday.py

@@ -182,7 +182,7 @@ class TorrentDayProvider(generic.TorrentProvider):
         freeleech = '&free=on' if self.freeleech else ''
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/providers/torrentleech.py

@@ -156,7 +156,7 @@ class TorrentLeechProvider(generic.TorrentProvider):
         items = {'Season': [], 'Episode': [], 'RSS': []}
 
         if not self._doLogin():
-            return []
+            return results
 
         for mode in search_params.keys():
             for search_string in search_params[mode]:

sickbeard/rssfeeds.py

@@ -42,6 +42,8 @@ class RSSFeeds:
 
         try:
             fc = Cache(self.rssDB)
-            return fc.fetch(url, False, False, request_headers)
+            feed = fc.fetch(url, False, False, request_headers)
+
+            return feed
         finally:
             self.rssDB.close()

sickbeard/tvcache.py

@@ -116,41 +116,41 @@ class TVCache():
         try:
             if self._checkAuth(None):
                 data = self._getRSSData()
-                if len(data) > 0:
+                if not data or not len(data) > 0:
-                    # clear cache
+                    return
-                    self._clearCache()
 
-                    # set updated
+                # clear cache
-                    self.setLastUpdate()
+                self._clearCache()
 
-                    try:
+                # set updated
-                        items = data.get('entries', [])
+                self.setLastUpdate()
-                    except:
-                        items = data
 
-                    if self._checkAuth(items):
+                try:
-                        cl = []
+                    items = data.get('entries', [])
-                        for item in items:
+                except:
-                            title, url = self._get_title_and_url(item)
+                    items = data
-                            ci = self._parseItem(title, url)
-                            if ci is not None:
-                                cl.append(ci)
 
-                        if len(cl) > 0:
+                if self._checkAuth(items):
-                            myDB = self._getDB()
+                    cl = []
-                            myDB.mass_action(cl)
+                    for item in items:
+                        title, url = self._get_title_and_url(item)
+                        ci = self._parseItem(title, url)
+                        if ci is not None:
+                            cl.append(ci)
 
-                    else:
+                    if len(cl) > 0:
-                        raise AuthException(
+                        myDB = self._getDB()
-                            u"Your authentication credentials for " + self.provider.name + " are incorrect, check your config")
+                        myDB.mass_action(cl)
+
+                else:
+                    raise AuthException(
+                        u"Your authentication credentials for " + self.provider.name + " are incorrect, check your config")
         except AuthException, e:
             logger.log(u"Authentication error: " + ex(e), logger.ERROR)
         except Exception, e:
             logger.log(u"Error while searching " + self.provider.name + ", skipping: " + ex(e), logger.ERROR)
             logger.log(traceback.format_exc(), logger.DEBUG)
 
-        return []
-
     def getRSSFeed(self, url, post_data=None, request_headers=None):
         return RSSFeeds(self.providerID).getFeed(url, post_data, request_headers)