Fix for addCacheEntry

gui/slick/interfaces/default/config_general.tmpl

@@ -67,7 +67,7 @@
                             </label>
                             <label class="nocheck clearfix">
                                 <span class="component-title">&nbsp;</span>
-                                <span class="component-desc">Checking for updates runs on startup and every 5 minutes.</span>
+                                <span class="component-desc">Checking for updates runs on startup and every 12 hours.</span>
                             </label>
                         </div>
 
@@ -79,7 +79,7 @@
                             </label>
                             <label class="nocheck clearfix">
                                 <span class="component-title">&nbsp;</span>
-                                <span class="component-desc">Automatic Updates runs on startup and in the background.</span>
+                                <span class="component-desc">Automatic Updates run on startup and in the background every 12 hours.</span>
                             </label>
                         </div>
 

sickbeard/tvcache.py

@@ -208,21 +208,18 @@ class TVCache():
 
         indexer_lang = None
 
-        # if we need indexer_id then search the DB for them
-        if not indexer_id:
-
-            # if we have only the indexer_id, use the database
         if indexer_id:
-                try:
+            # if we have only the indexer_id, use the database
             showObj = helpers.findCertainShow(sickbeard.showList, indexer_id)
-                except (MultipleShowObjectsException):
-                    showObj = None
             if showObj:
+                self.indexer = int(showObj.indexer)
                 indexer_lang = showObj.lang
-
-            # if they're both empty then fill out as much info as possible by searching the show name
             else:
+                logger.log(u"We were given a Indexer ID " + str(indexer_id) + " but it doesn't match a show we have in our list, so leaving indexer_id empty",logger.DEBUG)
+                indexer_id = 0
 
+        # if no indexerID then fill out as much info as possible by searching the show name
+        if not indexer_id:
             # check the name cache and see if we already know what show this is
             logger.log(
                 u"Checking the cache to see if we already know the indexer id of " + parse_result.series_name,
@@ -287,7 +284,6 @@ class TVCache():
         if parse_result.air_by_date and indexer_id:
             try:
                 lINDEXER_API_PARMS = sickbeard.indexerApi(self.indexer).api_params.copy()
-
                 if not (indexer_lang == "" or indexer_lang == "en" or indexer_lang == None):
                     lINDEXER_API_PARMS['language'] = indexer_lang