Merge pull request #2703 from flightlevel/patch-1

TTN: Fix category & search_string

sickbeard/providers/transmitthenet.py

@@ -34,6 +34,7 @@ from urllib import urlencode
 
 class TransmitTheNetProvider(generic.TorrentProvider):
     def __init__(self):
+
         generic.TorrentProvider.__init__(self, "TransmitTheNet")
 
         self.urls = {
@@ -55,7 +56,9 @@ class TransmitTheNetProvider(generic.TorrentProvider):
         self.cache = TransmitTheNetCache(self)
 
         self.search_params = {
-            'page': 'torrents', "category": 1, "active": 1
+            "page": 'torrents',
+            "category": 0,
+            "active": 1
         }
 
     def isEnabled(self):
@@ -70,6 +73,7 @@ class TransmitTheNetProvider(generic.TorrentProvider):
         return quality
 
     def _checkAuth(self):
+
         if not self.username or not self.password:
             raise AuthException("Your authentication credentials for " + self.name + " are missing, check your config.")
 
@@ -141,7 +145,7 @@ class TransmitTheNetProvider(generic.TorrentProvider):
                             sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season,
                                                                   'episodenumber': ep_obj.scene_episode} + ' %s' % add_string
 
-                search_string['Episode'].append(re.sub('\s+', ' ', ep_string))
+                search_string['Episode'].append(re.sub('\s+', ' ', ep_string.replace('.', ' ').strip()))
 
         return [search_string]
 
@@ -156,7 +160,7 @@ class TransmitTheNetProvider(generic.TorrentProvider):
         for mode in search_strings.keys():
             for search_string in search_strings[mode]:
 
-                self.search_params['search'] = search_string.strip()
+                self.search_params['search'] = search_string
                 logger.log(u"Search string: " + self.search_params['search'] + " for " + self.name, logger.DEBUG)
 
                 data = self.getURL(self.urls['index'], params=self.search_params)
@@ -182,7 +186,8 @@ class TransmitTheNetProvider(generic.TorrentProvider):
 
                         # Continue only if one Release is found
                         if len(torrent_rows) < 1:
-                             logger.log(u"The Data returned from " + self.name + " did not contain any torrent", logger.DEBUG)
+                            logger.log(u"The Data returned from " + self.name + " did not contain any torrent",
+                                       logger.DEBUG)
                             continue
 
                         for torrent_row in torrent_rows:
@@ -195,7 +200,9 @@ class TransmitTheNetProvider(generic.TorrentProvider):
 
                             # Filter unseeded torrent
                             if seeders < self.minseed:
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0} (S:{1})".format(name, seeders), logger.DEBUG)
+                                logger.log(
+                                    u"Discarding torrent because it doesn't meet the minimum seeders: {0} (S:{1})".format(
+                                        title, seeders), logger.DEBUG)
                                 continue
 
                             if not title or not download_href:
@@ -204,7 +211,8 @@ class TransmitTheNetProvider(generic.TorrentProvider):
                             download_url = self.urls['base_url'] + download_href
 
                             item = title, download_url, id, seeders, leechers
-                            logger.log(u"Found result: " + title.replace(' ','.') + " (" + download_url + ")", logger.DEBUG)
+                            logger.log(u"Found result: " + title.replace(' ', '.') + " (" + download_url + ")",
+                                       logger.DEBUG)
 
                             items[mode].append(item)
 
@@ -262,10 +270,9 @@ class TransmitTheNetProvider(generic.TorrentProvider):
 
 class TransmitTheNetCache(tvcache.TVCache):
     def __init__(self, provider):
-
         tvcache.TVCache.__init__(self, provider)
 
-        # only poll TorrentBytes every 20 minutes max
+        # Only poll TransmitTheNet every 20 minutes max
         self.minTime = 20
 
     def _getRSSData(self):