Merge pull request #2201 from SiCKRAGETV/hdts-cleanup

Hdts cleanup

sickbeard/providers/generic.py

@@ -365,7 +365,7 @@ class GenericProvider:
                 # get season search results
                 for curString in self._get_season_search_strings(epObj):
                     itemList += self._doSearch(curString, search_mode, len(episodes), epObj=epObj)
-            else:
+            elif search_mode == 'eponly':
                 # get single episode search results
                 for curString in self._get_episode_search_strings(epObj):
                     itemList += self._doSearch(curString, 'eponly', len(episodes), epObj=epObj)

sickbeard/providers/hdtorrents.py

@@ -35,7 +35,6 @@ from sickbeard import clients
 import requests
 from requests import exceptions
 from bs4 import BeautifulSoup as soup
-#from sickbeard.bs4_parser import BS4Parser
 from unidecode import unidecode
 from sickbeard.helpers import sanitizeSceneName
 from requests.auth import AuthBase
@@ -49,8 +48,6 @@ class HDTorrentsProvider(generic.TorrentProvider):
         self.supportsBacklog = True
 
         self.enabled = False
-        #self._uid = None
-        #self._hash = None
         self.session = requests.Session()
         self.username = None
         self.password = None
@@ -70,8 +67,6 @@ class HDTorrentsProvider(generic.TorrentProvider):
 
         self.categories = "&category[]=59&category[]=60&category[]=30&category[]=38"
 
-        #self.cookies = None
-
     def isEnabled(self):
         return self.enabled
 
@@ -90,17 +85,9 @@ class HDTorrentsProvider(generic.TorrentProvider):
         if any(requests.utils.dict_from_cookiejar(self.session.cookies).values()):
             return True
 
-        # requests automatically handles cookies.
-        #if self._uid and self._hash:
-
-        #    requests.utils.add_dict_to_cookiejar(self.session.cookies, self.cookies)
-
-        else:
-
         login_params = {'uid': self.username,
                         'pwd': self.password,
-                            'submit': 'Confirm',
-            }
+                        'submit': 'Confirm'}
 
         try:
             response = self.session.post(self.urls['login'], data=login_params, timeout=30)
@@ -113,17 +100,11 @@ class HDTorrentsProvider(generic.TorrentProvider):
             logger.log(u'Invalid username or password for ' + self.name + ' Check your settings', logger.ERROR)
             return False
 
-            #self._uid = requests.utils.dict_from_cookiejar(self.session.cookies)['uid']
-            #self._hash = requests.utils.dict_from_cookiejar(self.session.cookies)['pass']
-            #self.cookies = {'uid': self._uid,
-            #                'pass': self._hash
-            #}
-
         return True
 
     def _get_season_search_strings(self, ep_obj):
         if not ep_obj:
-            return search_strings
+            return []
 
         search_strings = []
         for show_name in set(show_name_helpers.allPossibleShowNames(self.show)):
@@ -136,7 +117,6 @@ class HDTorrentsProvider(generic.TorrentProvider):
 
             search_strings.append(ep_string)
 
-
         return [search_strings]
 
     def _get_episode_search_strings(self, ep_obj, add_string=''):