Merge pull request #1678 from Thraxis/trakt-changes

Trakt API Changes / Tweaks

lib/trakt/trakt.py

@@ -10,7 +10,7 @@ class TraktAPI():
         self.password = password
         self.verify = not disable_ssl_verify
         self.timeout = timeout if timeout else None
-        self.api_url = 'https://api.trakt.tv/'
+        self.api_url = 'https://api-v2launch.trakt.tv/'
         self.headers = {
           'Content-Type': 'application/json',
           'trakt-api-version': '2',

sickbeard/traktChecker.py

@@ -391,13 +391,17 @@ class TraktChecker():
         else:
             watchlist = self.ShowWatchlist
 
+        trakt_id = sickbeard.indexerApi(show_obj.indexer).config['trakt_id']
+        
         for watchlist_el in watchlist:
 
-            trakt_id = sickbeard.indexerApi(show_obj.indexer).config['trakt_id']
             if trakt_id == 'tvdb_id':
                 indexer_id = int(watchlist_el['show']['ids']["tvdb"])
             else:
+                if not watchlist_el['show']['ids']["tvrage"] is None:
                    indexer_id = int(watchlist_el['show']['ids']["tvrage"])
+                else:
+                    indexer_id = 0
                     
             if indexer_id == show_obj.indexerid and season is None and episode is None:
                 found=True