Fixed errors in scene exceptions when retrieving list of exceptions.

Fixed trakt.tv errors when updating/syncing show lists.

sickbeard/generic_queue.py

@@ -62,7 +62,7 @@ class GenericQueue(object):
         if self.queueItem is None or not self.queueItem.isAlive():
 
             # if the thread is dead then the current item should be finished
-            if self.currentItem != None:
+            if self.currentItem:
                 self.currentItem.finish()
                 self.currentItem = None
 

sickbeard/scene_exceptions.py

@@ -223,6 +223,9 @@ def retrieve_exceptions():
         existing_exceptions = [x["show_name"] for x in
                                myDB.select("SELECT * FROM scene_exceptions WHERE indexer_id = ?", [cur_indexer_id])]
 
+        if not cur_indexer_id in exception_dict:
+            continue
+
         for cur_exception_dict in exception_dict[cur_indexer_id]:
             cur_exception, curSeason = cur_exception_dict.items()[0]
 

sickbeard/search_queue.py

@@ -97,8 +97,11 @@ class DailySearchQueueItem(generic_queue.QueueItem):
         self.segment = segment
 
     def run(self):
+
         generic_queue.QueueItem.run(self)
 
+        try:
+
             logger.log("Beginning daily search for [" + self.show.name + "]")
             foundResults = search.searchForNeededEpisodes(self.show, self.segment)
 
@@ -117,7 +120,8 @@ class DailySearchQueueItem(generic_queue.QueueItem):
                     time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
 
             generic_queue.QueueItem.finish(self)
-
+        except Exception:
+            logger.log(traceback.format_exc(), logger.DEBUG)
 
 class ManualSearchQueueItem(generic_queue.QueueItem):
     def __init__(self, show, segment):
@@ -161,7 +165,6 @@ class ManualSearchQueueItem(generic_queue.QueueItem):
             self.success = False
         generic_queue.QueueItem.finish(self)
 
-
 class BacklogQueueItem(generic_queue.QueueItem):
     def __init__(self, show, segment):
         generic_queue.QueueItem.__init__(self, 'Backlog', BACKLOG_SEARCH)
@@ -217,6 +220,7 @@ class FailedQueueItem(generic_queue.QueueItem):
     def run(self):
         generic_queue.QueueItem.run(self)
 
+        try:
             for season, episodes in self.segment.items():
                 for epObj in episodes:
                     logger.log(u"Marking episode as bad: [" + epObj.prettyName() + "]")
@@ -230,7 +234,6 @@ class FailedQueueItem(generic_queue.QueueItem):
                     failed_history.revertEpisode(epObj)
                     logger.log("Beginning failed download search for [" + epObj.prettyName() + "]")
 
-                try:
                     searchResult = search.searchProviders(self.show, season, [epObj], True)
 
                     # reset thread back to original name
@@ -247,7 +250,7 @@ class FailedQueueItem(generic_queue.QueueItem):
 
                     else:
                         logger.log(u"No valid episode found to retry for [" + epObj.prettyName() + "]")
-                except Exception, e:
+        except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
 
         self.finish()

sickbeard/traktChecker.py

@@ -17,6 +17,7 @@
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
 import time
 import os
+import traceback
 
 import sickbeard
 from sickbeard import encodingKludge as ek
@@ -33,10 +34,8 @@ class TraktChecker():
         self.todoWanted = []
         self.todoBacklog = []
 
-    def __del__(self):
-        pass
-
     def run(self, force=False):
+        try:
             # add shows from trakt.tv watchlist
             if sickbeard.TRAKT_USE_WATCHLIST:
                 self.todoWanted = []  # its about to all get re-added
@@ -49,6 +48,8 @@ class TraktChecker():
             # sync trakt.tv library with sickrage library
             if sickbeard.TRAKT_SYNC:
                 self.syncLibrary()
+        except Exception:
+            logger.log(traceback.format_exc(), logger.DEBUG)
 
     def findShow(self, indexerid):
         library = TraktCall("user/library/shows/all.json/%API%/" + sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_API,
@@ -62,6 +63,7 @@ class TraktChecker():
 
     def syncLibrary(self):
         logger.log(u"Syncing library to trakt.tv show library", logger.DEBUG)
+        if sickbeard.showList:
             for myShow in sickbeard.showList:
                 self.addShowToTraktLibrary(myShow)
 
@@ -107,9 +109,10 @@ class TraktChecker():
         logger.log(u"Starting trakt show watchlist check", logger.DEBUG)
         watchlist = TraktCall("user/watchlist/shows.json/%API%/" + sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_API,
                               sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_PASSWORD)
-        if watchlist is None:
+        if not watchlist:
             logger.log(u"Could not connect to trakt service, aborting watchlist update", logger.ERROR)
             return
+
         for show in watchlist:
             if int(sickbeard.TRAKT_METHOD_ADD) != 2:
                 self.addDefaultShow(show["tvdb_id"], show["title"], SKIPPED)
@@ -132,9 +135,10 @@ class TraktChecker():
         logger.log(u"Starting trakt episode watchlist check", logger.DEBUG)
         watchlist = TraktCall("user/watchlist/episodes.json/%API%/" + sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_API,
                               sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_PASSWORD)
-        if watchlist is None:
+        if not watchlist:
             logger.log(u"Could not connect to trakt service, aborting watchlist update", logger.ERROR)
             return
+
         for show in watchlist:
             self.addDefaultShow(int(show["tvdb_id"]), show["title"], SKIPPED)
             newShow = helpers.findCertainShow(sickbeard.showList, int(show["tvdb_id"]))