Merge branch 'origin/dev'

sickbeard/failed_history.py

@@ -104,6 +104,8 @@ def hasFailed(release, size, provider="%"):
     is found with any provider.
     """
 
+    release = prepareFailedName(release)
+
     myDB = db.DBConnection("failed.db")
     sql_results = myDB.select(
         "SELECT * FROM failed WHERE release=? AND size=? AND provider LIKE ?",
@@ -137,9 +139,6 @@ def revertEpisode(epObj):
         logger.log(u"Unable to create episode, please set its status manually: " + ex(e),
                                logger.WARNING)
 
-    return
-
-
 def markFailed(epObj):
     log_str = u""
 
@@ -161,7 +160,6 @@ def logSnatch(searchResult):
     logDate = datetime.datetime.today().strftime(dateFormat)
     release = prepareFailedName(searchResult.name)
 
-
     providerClass = searchResult.provider
     if providerClass is not None:
         provider = providerClass.name
@@ -192,7 +190,6 @@ def trimHistory():
     myDB.action("DELETE FROM history WHERE date < " + str(
         (datetime.datetime.today() - datetime.timedelta(days=30)).strftime(dateFormat)))
 
-
 def findRelease(epObj):
     """
     Find releases in history by show ID and season.

sickbeard/search.py

@@ -515,6 +515,7 @@ def searchProviders(queueItem, show, season, episodes, seasonSearch=False, manua
                 continue
 
             result = pickBestResult(foundResults[provider.name][curEp], show)
+            if result:
                 finalResults.append(result)
 
                 logger.log(u"Checking if we should snatch " + result.name, logger.DEBUG)