Merge branch 'release/0.4.0' into develop

CHANGES.md

@@ -10,7 +10,7 @@
 * Fix adding show from TVRage API
 
 
-### 0.4.0 (2014-11-23 03:27:00 UTC)
+### 0.4.0 (2014-11-23 08:44:00 UTC)
 
 * Change footer stats to not add newlines when copy/pasting from them
 * Remove redundant references from Config/Help & Info
@@ -59,6 +59,7 @@
 * Fix typo on General Config/Misc
 * Fix Add Trending Shows "Not In library" now filters tvrage added shows
 * Add a hover over text "In library" on Add Trending Shows to display tv database show was added from
+* Fix reduces time API endpoint Shows takes to return results
 
 
 ### 0.3.1 (2014-11-19 16:40:00 UTC)

lib/tvrage_api/tvrage_api.py

@@ -98,15 +98,12 @@ class ShowContainer(dict):
 
         #keep only the 100th latest results
         if time.time() - self._lastgc > 20:
-            tbd = self._stack[:-100]
-            i = 0
-            for o in tbd:
+            for o in self._stack[:-100]:
                 del self[o]
-                del self._stack[i]
-                i += 1
                 
-            _lastgc = time.time()
-            del tbd
+            self._stack = self._stack[-100:]
+
+            self._lastgc = time.time()
 
         super(ShowContainer, self).__setitem__(key, value)
 

sickbeard/helpers.py

@@ -1164,8 +1164,13 @@ def mapIndexersToShow(showObj):
 
     # for each mapped entry
     for curResult in sqlResults:
+        nlist = [i for i in curResult if None is not i]
+        # Check if its mapped with both tvdb and tvrage.
+        if 4 <= len(nlist):
             logger.log(u"Found indexer mapping in cache for show: " + showObj.name, logger.DEBUG)
             mapped[int(curResult['mindexer'])] = int(curResult['mindexer_id'])
+            break
+
     else:
         sql_l = []
         for indexer in sickbeard.indexerApi().indexers: