From 93f06af3008d53896a2839aab7d525b7bd8576d6 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Sun, 14 Sep 2014 13:11:57 -0600
Subject: [PATCH 01/24] Fix where there may be empty values (such as cookies)
 in older configurations

---
 sickbeard/providers/rsstorrent.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sickbeard/providers/rsstorrent.py b/sickbeard/providers/rsstorrent.py
index 3cf27c8a..fe7b5320 100644
--- a/sickbeard/providers/rsstorrent.py
+++ b/sickbeard/providers/rsstorrent.py
@@ -53,9 +53,14 @@ class TorrentRssProvider(generic.TorrentProvider):
         self.cookies = cookies
 
     def configStr(self):
-        return self.name + '|' + self.url + '|' + self.cookies + '|' + str(
-            int(self.enabled)) + '|' + self.search_mode + '|' + str(int(self.search_fallback)) + '|' + str(
-            int(self.enable_daily)) + '|' + str(int(self.enable_backlog))
+        return "%s|%s|%s|%d|%s|%d|%d|%d" % (self.name or '',
+                                            self.url or '',
+                                            self.cookies or '',
+                                            self.enabled,
+                                            self.search_mode or '',
+                                            self.search_fallback,
+                                            self.enable_daily,
+                                            self.enable_backlog)
 
     def imageName(self):
         if ek.ek(os.path.isfile,

From fc23454a1e24df1c9005d519ca31a07da20d00ed Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Mon, 15 Sep 2014 05:59:11 -0700
Subject: [PATCH 02/24] Renamed filename for wgn america network logo

---
 .../network/{wgn american.png => wgn america.png}   | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename gui/slick/images/network/{wgn american.png => wgn america.png} (100%)

diff --git a/gui/slick/images/network/wgn american.png b/gui/slick/images/network/wgn america.png
similarity index 100%
rename from gui/slick/images/network/wgn american.png
rename to gui/slick/images/network/wgn america.png

From bdac98db4b8d8962fa3d9deea200c42899c01b73 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Mon, 15 Sep 2014 15:01:18 +0200
Subject: [PATCH 03/24] Implemented the queuing functionality also for Failed
 downloads. ajaxEpSearch.js now also processes the clicks for Retries. SO
 merged those together and removed ajaxEpRetry.js.

---
 gui/slick/interfaces/default/displayShow.tmpl |  1 -
 gui/slick/js/ajaxEpRetry.js                   | 51 -------------------
 gui/slick/js/ajaxEpSearch.js                  |  2 +-
 gui/slick/js/displayShow.js                   |  1 -
 sickbeard/search_queue.py                     |  5 ++
 sickbeard/webserve.py                         | 27 +++-------
 6 files changed, 14 insertions(+), 73 deletions(-)
 delete mode 100644 gui/slick/js/ajaxEpRetry.js

diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl
index f38aa998..be41bd28 100644
--- a/gui/slick/interfaces/default/displayShow.tmpl
+++ b/gui/slick/interfaces/default/displayShow.tmpl
@@ -26,7 +26,6 @@
 <script type="text/javascript" src="$sbRoot/js/sceneExceptionsTooltip.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/ajaxEpSearch.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/ajaxEpSubtitles.js?$sbPID"></script>
-<script type="text/javascript" src="$sbRoot/js/ajaxEpRetry.js?$sbPID"></script>
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){
diff --git a/gui/slick/js/ajaxEpRetry.js b/gui/slick/js/ajaxEpRetry.js
deleted file mode 100644
index 1f10c3e5..00000000
--- a/gui/slick/js/ajaxEpRetry.js
+++ /dev/null
@@ -1,51 +0,0 @@
-(function () {
-
-    $.ajaxEpRetry = {
-        defaults: {
-            size:               16,
-            colorRow:           false,
-            loadingImage:       'loading16_dddddd.gif',
-            noImage:            'no16.png',
-            yesImage:           'yes16.png'
-        }
-    };
-
-    $.fn.ajaxEpRetry = function (options) {
-        options = $.extend({}, $.ajaxEpRetry.defaults, options);
-
-        $('.epRetry').click(function () {
-            if ( !confirm("Mark download as bad and retry?") )
-                return false;
-
-            var parent = $(this).parent();
-
-            // put the ajax spinner (for non white bg) placeholder while we wait
-            parent.empty();
-            parent.append($("<img/>").attr({"src": sbRoot + "/images/" + options.loadingImage, "height": options.size, "alt": "", "title": "loading"}));
-
-            $.getJSON($(this).attr('href'), function (data) {
-                // if they failed then just put the red X
-                if (data.result == 'failure') {
-                    img_name = options.noImage;
-                    img_result = 'failed';
-
-                // if the snatch was successful then apply the corresponding class and fill in the row appropriately
-                } else {
-                    img_name = options.yesImage;
-                    img_result = 'success';
-                    // color the row
-                    if (options.colorRow) {
-                        parent.parent().removeClass('skipped wanted qual good unaired snatched').addClass('snatched');
-                    }
-                }
-
-                // put the corresponding image as the result for the the row
-                parent.empty();
-                parent.append($("<img/>").attr({"src": sbRoot + "/images/" + img_name, "height": options.size, "alt": img_result, "title": img_result}));
-            });
-
-            // don't follow the link
-            return false;
-        });
-    };
-})();
diff --git a/gui/slick/js/ajaxEpSearch.js b/gui/slick/js/ajaxEpSearch.js
index ffe6f6f0..c3c33bdc 100644
--- a/gui/slick/js/ajaxEpSearch.js
+++ b/gui/slick/js/ajaxEpSearch.js
@@ -123,7 +123,7 @@ function disableLink(el) {
 	$.fn.ajaxEpSearch = function(options){
 		options = $.extend({}, $.ajaxEpSearch.defaults, options);
 		
-	    $('.epSearch').click(function(event){
+	    $('.epSearch, .epRetry').click(function(event){
 	    	event.preventDefault();
 	        
 	    	// Check if we have disabled the click
diff --git a/gui/slick/js/displayShow.js b/gui/slick/js/displayShow.js
index 0abf94d9..ec77a195 100644
--- a/gui/slick/js/displayShow.js
+++ b/gui/slick/js/displayShow.js
@@ -1,7 +1,6 @@
 $(document).ready(function () {
 
     $('#sbRoot').ajaxEpSearch({'colorRow': true});
-    //$('#sbRoot').ajaxEpRetry({'colorRow': true});
 
     $('#sbRoot').ajaxEpSubtitlesSearch();
 
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 27b429dd..6d196258 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -241,12 +241,14 @@ class FailedQueueItem(generic_queue.QueueItem):
         self.show = show
         self.segment = segment
         self.success = None
+        self.started = None
 
     def run(self):
         generic_queue.QueueItem.run(self)
 
         try:
             logger.log(u"Marking episode as bad: [" + self.segment.prettyName() + "]")
+            self.started = True
             failed_history.markFailed(self.segment)
 
             (release, provider) = failed_history.findRelease(self.segment)
@@ -271,6 +273,9 @@ class FailedQueueItem(generic_queue.QueueItem):
                 logger.log(u"No valid episode found to retry for: [" + self.segment.prettyName() + "]")
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
+            
+        ### Keep a list with the 100 last executed searches
+        fifo(MANUAL_SEARCH_HISTORY, self, MANUAL_SEARCH_HISTORY_SIZE)
 
         if self.success is None:
             self.success = False
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index eeb32fc7..f391a544 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4510,26 +4510,15 @@ class Home(MainHandler):
         ep_queue_item = search_queue.FailedQueueItem(ep_obj.show, ep_obj)
         sickbeard.searchQueueScheduler.action.add_item(ep_queue_item)  # @UndefinedVariable
 
-        # wait until the queue item tells us whether it worked or not
-        while ep_queue_item.success is None:  # @UndefinedVariable
-            time.sleep(cpu_presets[sickbeard.CPU_PRESET])
-
-        # return the correct json value
         if ep_queue_item.success:
-            # Find the quality class for the episode
-            quality_class = Quality.qualityStrings[Quality.UNKNOWN]
-            ep_status, ep_quality = Quality.splitCompositeStatus(ep_obj.status)
-            for x in (SD, HD720p, HD1080p):
-                if ep_quality in Quality.splitQuality(x)[0]:
-                    quality_class = qualityPresetStrings[x]
-                    break
-
-            return json.dumps({'result': statusStrings[ep_obj.status],
-                               'quality': quality_class
-            })
-
-        return json.dumps({'result': 'failure'})
-
+            return returnManualSearchResult(ep_queue_item)
+        if not ep_queue_item.started and ep_queue_item.success is None:
+            return json.dumps({'result': 'success'}) #I Actually want to call it queued, because the search hasnt been started yet!
+        if ep_queue_item.started and ep_queue_item.success is None:
+            return json.dumps({'result': 'success'})
+        else:
+            return json.dumps({'result': 'failure'})
+        
 
 class UI(MainHandler):
     def add_message(self):

From 4a03885956551cd62f1f9c5d711674670e7a6a5b Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Mon, 15 Sep 2014 06:23:15 -0700
Subject: [PATCH 04/24] Bottom of page backlog nextrun shows time as well as
 date now

---
 gui/slick/interfaces/default/inc_bottom.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/slick/interfaces/default/inc_bottom.tmpl b/gui/slick/interfaces/default/inc_bottom.tmpl
index debb3d10..16fa603b 100644
--- a/gui/slick/interfaces/default/inc_bottom.tmpl
+++ b/gui/slick/interfaces/default/inc_bottom.tmpl
@@ -39,7 +39,7 @@
 			#set $ep_total = 0
 		#end if
 		
-		<b>$shows_total</b> Shows (<b>$shows_active</b> Active) <b>|</b> <b><%=ep_downloaded%>#if $ep_snatched > 0 then " (+" + str($ep_snatched) + " snatched)" else ""# / $ep_total</b> Episodes Downloaded <b>|</b> Daily Search: <b><%=str(sickbeard.dailySearchScheduler.timeLeft()).split('.')[0]%></b> <b>|</b> Backlog Search: <b>$sbdatetime.sbdatetime.sbfdate($sickbeard.backlogSearchScheduler.nextRun())</b>
+		<b>$shows_total</b> Shows (<b>$shows_active</b> Active) <b>|</b> <b><%=ep_downloaded%>#if $ep_snatched > 0 then " (+" + str($ep_snatched) + " snatched)" else ""# / $ep_total</b> Episodes Downloaded <b>|</b> Daily Search: <b><%=str(sickbeard.dailySearchScheduler.timeLeft()).split('.')[0]%></b> <b>|</b> Backlog Search: <b>$sbdatetime.sbdatetime.sbfdatetime($sickbeard.backlogSearchScheduler.nextRun())</b>
         <p>
         <a href="$sbRoot/manage/manageSearches/forceVersionCheck"><img src="$sbRoot/images/menu/update16.png" alt="" width="16" height="16" />Force Version Check</a>
         <a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/restart16.png" alt="" width="16" height="16" />Restart</a>

From 41dbbbaa9bdf08fe42c45a2772a0ab1628f97be1 Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Mon, 15 Sep 2014 06:29:16 -0700
Subject: [PATCH 05/24] Fix backlog nextrun to return datetime instead of just
 date

---
 sickbeard/searchBacklog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index b5f9ff86..7256d1cd 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -37,9 +37,9 @@ class BacklogSearchScheduler(scheduler.Scheduler):
 
     def nextRun(self):
         if self.action._lastBacklog <= 1:
-            return datetime.date.today()
+            return datetime.datetime.today()
         else:
-            return datetime.date.fromordinal(self.action._lastBacklog + self.action.cycleTime)
+            return datetime.datetime.fromordinal(self.action._lastBacklog + self.action.cycleTime)
 
 
 class BacklogSearcher:

From 9eec99cd14e4dceb59df2e1338b4b7a33db6a38d Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Mon, 15 Sep 2014 06:42:24 -0700
Subject: [PATCH 06/24] Reverted backlog search nextrun changes

---
 gui/slick/interfaces/default/inc_bottom.tmpl | 2 +-
 sickbeard/searchBacklog.py                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/slick/interfaces/default/inc_bottom.tmpl b/gui/slick/interfaces/default/inc_bottom.tmpl
index 16fa603b..debb3d10 100644
--- a/gui/slick/interfaces/default/inc_bottom.tmpl
+++ b/gui/slick/interfaces/default/inc_bottom.tmpl
@@ -39,7 +39,7 @@
 			#set $ep_total = 0
 		#end if
 		
-		<b>$shows_total</b> Shows (<b>$shows_active</b> Active) <b>|</b> <b><%=ep_downloaded%>#if $ep_snatched > 0 then " (+" + str($ep_snatched) + " snatched)" else ""# / $ep_total</b> Episodes Downloaded <b>|</b> Daily Search: <b><%=str(sickbeard.dailySearchScheduler.timeLeft()).split('.')[0]%></b> <b>|</b> Backlog Search: <b>$sbdatetime.sbdatetime.sbfdatetime($sickbeard.backlogSearchScheduler.nextRun())</b>
+		<b>$shows_total</b> Shows (<b>$shows_active</b> Active) <b>|</b> <b><%=ep_downloaded%>#if $ep_snatched > 0 then " (+" + str($ep_snatched) + " snatched)" else ""# / $ep_total</b> Episodes Downloaded <b>|</b> Daily Search: <b><%=str(sickbeard.dailySearchScheduler.timeLeft()).split('.')[0]%></b> <b>|</b> Backlog Search: <b>$sbdatetime.sbdatetime.sbfdate($sickbeard.backlogSearchScheduler.nextRun())</b>
         <p>
         <a href="$sbRoot/manage/manageSearches/forceVersionCheck"><img src="$sbRoot/images/menu/update16.png" alt="" width="16" height="16" />Force Version Check</a>
         <a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm"><img src="$sbRoot/images/menu/restart16.png" alt="" width="16" height="16" />Restart</a>
diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index 7256d1cd..b3119dd7 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -37,9 +37,9 @@ class BacklogSearchScheduler(scheduler.Scheduler):
 
     def nextRun(self):
         if self.action._lastBacklog <= 1:
-            return datetime.datetime.today()
+            return datetime.date.today()
         else:
-            return datetime.datetime.fromordinal(self.action._lastBacklog + self.action.cycleTime)
+            return datetime.date.fromordinal(self.action._lastBacklog + self.action.cycleTime)
 
 
 class BacklogSearcher:
@@ -86,7 +86,7 @@ class BacklogSearcher:
 
         if not which_shows and not curDate - self._lastBacklog >= self.cycleTime:
             logger.log(u"Running limited backlog on missed episodes " + sickbeard.BACKLOG_DAYS + " day(s) and older only")
-            fromDate = datetime.date.today() - datetime.timedelta(days=sickbeard.BACKLOG_DAYS)
+            fromDate = datetime.date.today() - datetime.timedelta(days=sickbeard)
 
         self.amActive = True
         self.amPaused = False

From f5a6d45d8f8cecb3ee5884e8eba5bdb0a38961e8 Mon Sep 17 00:00:00 2001
From: echel0n <echel0n@users.noreply.github.com>
Date: Mon, 15 Sep 2014 12:13:16 -0700
Subject: [PATCH 07/24] Fixed unicode error

---
 sickbeard/searchBacklog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index b3119dd7..031472ed 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -85,7 +85,7 @@ class BacklogSearcher:
         fromDate = datetime.date.fromordinal(1)
 
         if not which_shows and not curDate - self._lastBacklog >= self.cycleTime:
-            logger.log(u"Running limited backlog on missed episodes " + sickbeard.BACKLOG_DAYS + " day(s) and older only")
+            logger.log(u"Running limited backlog on missed episodes " + str(sickbeard.BACKLOG_DAYS) + " day(s) and older only")
             fromDate = datetime.date.today() - datetime.timedelta(days=sickbeard)
 
         self.amActive = True

From 9f926012621f55235b1540c533d3fff0d08d1cbc Mon Sep 17 00:00:00 2001
From: Adam <adam111316@users.noreply.github.com>
Date: Tue, 16 Sep 2014 01:43:49 +0800
Subject: [PATCH 08/24] Add first revision of calendar to coming episodes

---
 .../interfaces/default/comingEpisodes.tmpl    | 39 ++++++++++++++++++-
 sickbeard/webserve.py                         | 11 +++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index ec0a34a9..a633ed09 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -199,7 +199,7 @@
     </tbody>
     </table>
 <!-- end list view //-->
-#else:
+#else if $layout in ['banner', 'poster']:
 <!-- start non list view //-->
 <script type="text/javascript" charset="utf-8">
 <!--
@@ -387,6 +387,43 @@
 <!-- end non list view //-->
 #end if
 
+#if $layout == 'calendar':
+
+#set $today = datetime.date.today()
+#set $dates = [$today + datetime.timedelta(days=$i) for $i in range(7)]
+
+<input type="hidden" id="sbRoot" value="$sbRoot" />
+    #for $day in $dates
+        <table class="sickbeardTable tablesorter" cellspacing="0" border="0" cellpadding="0" style="float:left;width:125px;white-space: nowrap; table-layout: fixed;">
+        <thead><tr><th>$day.strftime("%A").decode($sickbeard.SYS_ENCODING).capitalize()</th></tr></thead>
+        <tbody>
+
+        #for $cur_result in $sql_results:
+            #set $cur_indexer = int($cur_result["indexer"])
+            #set $runtime = $cur_result["runtime"]
+            #set $airday = $cur_result["localtime"].date()
+
+            #if $airday == $day:
+                
+                <tr>
+                <td style="overflow: hidden; text-overflow: ellipsis;  font-size: 11px;  LINE-HEIGHT:12px";>
+                        <a href="$sbRoot/home/displayShow?show=${cur_result["showid"]}"><img alt="" src="$sbRoot/showPoster/?show=${cur_result["showid"]}&amp;which=poster_thumb" width="125"  /></a>
+                        <br> $cur_result["localtime"].strftime("%H:%M") on $cur_result["network"]
+                        #set $episodestring = "%sx%s %s" % ($cur_result["season"], $cur_result["episode"], $cur_result["name"])
+                        <br> $episodestring
+                    </td>
+                </tr>
+            #end if
+        
+        <!-- end $cur_result["show_name"] //-->
+        #end for
+        </tbody>
+        </table>
+    #end for
+
+<!-- end calender view //-->
+#end if
+
 <script type="text/javascript" charset="utf-8">
 <!--
 window.setInterval( "location.reload(true)", 600000); // Refresh every 10 minutes
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index f391a544..11e08e89 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -305,9 +305,12 @@ class MainHandler(RequestHandler):
         redirect("/home/displayShow?show=" + show)
 
     def setComingEpsLayout(self, layout):
-        if layout not in ('poster', 'banner', 'list'):
+        if layout not in ('poster', 'banner', 'list', 'calendar'):
             layout = 'banner'
 
+        if layout == 'calendar':
+            sickbeard.COMING_EPS_SORT = 'date'
+
         sickbeard.COMING_EPS_LAYOUT = layout
 
         redirect("/comingEpisodes/")
@@ -321,6 +324,9 @@ class MainHandler(RequestHandler):
     def setComingEpsSort(self, sort):
         if sort not in ('date', 'network', 'show'):
             sort = 'date'
+        
+        if sickbeard.COMING_EPS_LAYOUT == 'calendar':
+            sort = 'date'
 
         sickbeard.COMING_EPS_SORT = sort
 
@@ -390,6 +396,7 @@ class MainHandler(RequestHandler):
             {'title': 'Layout:', 'path': {'Banner': 'setComingEpsLayout/?layout=banner',
                                           'Poster': 'setComingEpsLayout/?layout=poster',
                                           'List': 'setComingEpsLayout/?layout=list',
+                                          'Calendar': 'setComingEpsLayout/?layout=calendar',
             }},
             paused_item,
         ]
@@ -399,7 +406,7 @@ class MainHandler(RequestHandler):
         t.sql_results = sql_results
 
         # Allow local overriding of layout parameter
-        if layout and layout in ('poster', 'banner', 'list'):
+        if layout and layout in ('poster', 'banner', 'list','calendar'):
             t.layout = layout
         else:
             t.layout = sickbeard.COMING_EPS_LAYOUT

From f0d8bcb62c7ce19f7e082a2e35784c464ace838c Mon Sep 17 00:00:00 2001
From: Adam <adam111316@users.noreply.github.com>
Date: Tue, 16 Sep 2014 17:57:13 +0800
Subject: [PATCH 09/24] Fix some of the unit tests

---
 sickbeard/common.py          | 3 ++-
 tests/scene_helpers_tests.py | 8 ++++----
 tests/xem_tests.py           | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sickbeard/common.py b/sickbeard/common.py
index ca945555..d646617f 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -205,7 +205,8 @@ class Quality:
             else:
                 return Quality.UNKNOWN
 
-        if checkName(["(pdtv|hdtv|dsr|tvrip).(xvid|x264|h.?264)"], all) and not checkName(["(720|1080)[pi]"], all):
+        if checkName(["(pdtv|hdtv|dsr|tvrip).(xvid|x264|h.?264)"], all) and not checkName(["(720|1080)[pi]"], all) and\
+                not checkName(["hr.ws.pdtv.x264"], any):
             return Quality.SDTV
         elif checkName(["web.dl|webrip", "xvid|x264|h.?264"], all) and not checkName(["(720|1080)[pi]"], all):
             return Quality.SDTV
diff --git a/tests/scene_helpers_tests.py b/tests/scene_helpers_tests.py
index 68fec0e2..e9abd7fb 100644
--- a/tests/scene_helpers_tests.py
+++ b/tests/scene_helpers_tests.py
@@ -100,12 +100,12 @@ class SceneExceptionTestCase(test.SickbeardTestDBCase):
         self.assertEqual(sorted(scene_exceptions.get_scene_exceptions(70726)), ['Babylon 5', 'Babylon5'])
 
     def test_sceneExceptionByName(self):
-        self.assertEqual(scene_exceptions.get_scene_exception_by_name('Babylon5'), 70726)
-        self.assertEqual(scene_exceptions.get_scene_exception_by_name('babylon 5'), 70726)
-        self.assertEqual(scene_exceptions.get_scene_exception_by_name('Carlos 2010'), 164451)
+        self.assertEqual(scene_exceptions.get_scene_exception_by_name('Babylon5'), (70726, -1))
+        self.assertEqual(scene_exceptions.get_scene_exception_by_name('babylon 5'), (70726, -1))
+        self.assertEqual(scene_exceptions.get_scene_exception_by_name('Carlos 2010'), (164451, -1))
 
     def test_sceneExceptionByNameEmpty(self):
-        self.assertEqual(scene_exceptions.get_scene_exception_by_name('nothing useful'), None)
+        self.assertEqual(scene_exceptions.get_scene_exception_by_name('nothing useful'), (None, None))
 
     def test_sceneExceptionsResetNameCache(self):
         # clear the exceptions
diff --git a/tests/xem_tests.py b/tests/xem_tests.py
index c4ef196d..a2b26579 100644
--- a/tests/xem_tests.py
+++ b/tests/xem_tests.py
@@ -68,15 +68,15 @@ class XEMBasicTests(test.SickbeardTestDBCase):
         name = "Game.of.Thrones.S03.720p.HDTV.x264-CtrlHD"
         release = "Game of Thrones"
 
-        m = re.match('(?P<ep_ab_num>(?>\d{1,3})(?![ip])).+', name)
+        # m = re.match('(?P<ep_ab_num>(?>\d{1,3})(?![ip])).+', name)
 
         escaped_name = re.sub('\\\\[\\s.-]', '\W+', re.escape(release))
         curRegex = '^' + escaped_name + '\W+(?:(?:S\d[\dE._ -])|(?:\d\d?x)|(?:\d{4}\W\d\d\W\d\d)|(?:(?:part|pt)[\._ -]?(\d|[ivx]))|Season\W+\d+\W+|E\d+\W+|(?:\d{1,3}.+\d{1,}[a-zA-Z]{2}\W+[a-zA-Z]{3,}\W+\d{4}.+))'
-        print(u"Checking if show " + name + " matches " + curRegex)
+        # print(u"Checking if show " + name + " matches " + curRegex)
 
         match = re.search(curRegex, name, re.I)
-        if match:
-            print(u"Matched " + curRegex + " to " + name)
+        # if match:
+        #     print(u"Matched " + curRegex + " to " + name)
 
 
 if __name__ == "__main__":

From f3c1fa6b61102b041595023b6018d5336c11eb18 Mon Sep 17 00:00:00 2001
From: "Scott D. Barker" <scott@sdbarker.com>
Date: Tue, 16 Sep 2014 22:11:21 -0700
Subject: [PATCH 10/24] Update comingEpisodes.tmpl to prevent a 'NotFound'
 error for cur_ep_enddate

---
 gui/slick/interfaces/default/comingEpisodes.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index ec0a34a9..f6480fe6 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -287,6 +287,7 @@
                 #set $today_header = True
             #end if
             #if $runtime:
+                #set $cur_ep_enddate = $cur_result["localtime"] + datetime.timedelta(minutes=$runtime)
                 #if $cur_ep_enddate < $today:
                     #set $show_div = "ep_listing listing_overdue"
                 #elif $cur_ep_airdate >= $next_week.date():

From 4bfb271e8d447c2aad5b42cdbcbb37c3dc95f62f Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Wed, 17 Sep 2014 10:18:47 +0200
Subject: [PATCH 11/24] Can't += dicts. Need to dict.copy() Bug in master while
 doing daily search:
 https://sickrage.tv/forums/forum/help-support/bug-issue-reports/8358-unsupported-operand-type-s-for-dict-and-dict

---
 sickbeard/providers/generic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index 59b1decb..a58c14a5 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -207,7 +207,7 @@ class GenericProvider:
         results = {}
 
         for ep in episode:
-            results += self.cache.findNeededEpisodes(ep)
+            results.copy(self.cache.findNeededEpisodes(ep))
 
         return results
 

From 4c8b100be9b603c3b0b3e806c595f9613b1536ef Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Wed, 17 Sep 2014 13:43:10 +0200
Subject: [PATCH 12/24] Shouldn't be copy() but update(). Tested now, and at
 least the exception is gone.

---
 sickbeard/providers/generic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index a58c14a5..ec13997f 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -207,7 +207,7 @@ class GenericProvider:
         results = {}
 
         for ep in episode:
-            results.copy(self.cache.findNeededEpisodes(ep))
+            results.update(self.cache.findNeededEpisodes(ep))
 
         return results
 

From 50dc83892f0fcc98c6a0502be60a8d42973b7ef0 Mon Sep 17 00:00:00 2001
From: "Scott D. Barker" <scott@sdbarker.com>
Date: Wed, 17 Sep 2014 20:24:27 -0700
Subject: [PATCH 13/24] - Update Pushbullet notifier to no longer base64 encode
 the API key which was causing Pushbullet to reject the key and connections -
 Update Pushbullet notifier's authorization header to reflect their API -
 Update the JS that populates the Pushbullet device list to provide an "All
 Devices" option

---
 gui/slick/js/configNotifications.js | 1 +
 sickbeard/notifiers/pushbullet.py   | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gui/slick/js/configNotifications.js b/gui/slick/js/configNotifications.js
index 342bec4f..847236c6 100644
--- a/gui/slick/js/configNotifications.js
+++ b/gui/slick/js/configNotifications.js
@@ -267,6 +267,7 @@ $(document).ready(function(){
             function (data) {
                 var devices = jQuery.parseJSON(data).devices;
                 $("#pushbullet_device_list").html('');
+                $("#pushbullet_device_list").append('<option value="" selected>-- All Devices --</option>')
                 for (var i = 0; i < devices.length; i++) {
                     if(devices[i].active == true) {
                         if(current_pushbullet_device == devices[i].iden) {
diff --git a/sickbeard/notifiers/pushbullet.py b/sickbeard/notifiers/pushbullet.py
index fedf3fa2..64c24fed 100644
--- a/sickbeard/notifiers/pushbullet.py
+++ b/sickbeard/notifiers/pushbullet.py
@@ -79,13 +79,11 @@ class PushbulletNotifier:
 
         http_handler = HTTPSConnection("api.pushbullet.com")
 
-        authString = base64.encodestring('%s:' % (pushbullet_api)).replace('\n', '')
-
         if notificationType == None:
             testMessage = True
             try:
                 logger.log(u"Testing Pushbullet authentication and retrieving the device list.", logger.DEBUG)
-                http_handler.request(method, uri, None, headers={'Authorization': 'Basic %s:' % authString})
+                http_handler.request(method, uri, None, headers={'Authorization': 'Bearer %s' % pushbullet_api})
             except (SSLError, HTTPException, socket.error):
                 logger.log(u"Pushbullet notification failed.", logger.ERROR)
                 return False
@@ -99,7 +97,7 @@ class PushbulletNotifier:
                     'type': notificationType}
                 data = json.dumps(data)
                 http_handler.request(method, uri, body=data,
-                                     headers={'Content-Type': 'application/json', 'Authorization': 'Basic %s' % authString})
+                                     headers={'Content-Type': 'application/json', 'Authorization': 'Bearer %s' % pushbullet_api})
                 pass
             except (SSLError, HTTPException, socket.error):
                 return False

From 47cd8b53f0d83ae72c0b4996c9a1eb76d5243d64 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 10:49:37 +0200
Subject: [PATCH 14/24] Fixed typo in searchBacklog. Introduced with search
 from delta functionality.

---
 sickbeard/searchBacklog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py
index 031472ed..ee171e8a 100644
--- a/sickbeard/searchBacklog.py
+++ b/sickbeard/searchBacklog.py
@@ -86,7 +86,7 @@ class BacklogSearcher:
 
         if not which_shows and not curDate - self._lastBacklog >= self.cycleTime:
             logger.log(u"Running limited backlog on missed episodes " + str(sickbeard.BACKLOG_DAYS) + " day(s) and older only")
-            fromDate = datetime.date.today() - datetime.timedelta(days=sickbeard)
+            fromDate = datetime.date.today() - datetime.timedelta(days=sickbeard.BACKLOG_DAYS)
 
         self.amActive = True
         self.amPaused = False

From a4c8c53c9141c2050caf230c12ec080faff9c0ca Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Wed, 17 Sep 2014 12:24:54 +0200
Subject: [PATCH 15/24] Fixed SearchFailedDownload when selecting multiple ep's
 as failed in displayShow

Searched for other occurrences for the search_queue.FailedQueueItem() call.
Changed segment to [segment]

The failedDownloadQueueItem always expects a single epObj in the segment. But when checking multiple episodes as "Failed" in displayShow, an array is provided. I've changed the queueItem to always iterate over it as an array. And i've made sure that when retry a single episode, it's also send to the queueItem as an array (with a single element).
I've had to adapt the queuing functionality in webserve for this.
---
 sickbeard/failedProcessor.py |  2 +-
 sickbeard/search_queue.py    | 32 +++++++++++---------
 sickbeard/webserve.py        | 57 ++++++++++++++++++++++++------------
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/sickbeard/failedProcessor.py b/sickbeard/failedProcessor.py
index 586c5aed..b66f9be2 100644
--- a/sickbeard/failedProcessor.py
+++ b/sickbeard/failedProcessor.py
@@ -67,7 +67,7 @@ class FailedProcessor(object):
         for episode in parsed.episode_numbers:
             segment = parsed.show.getEpisode(parsed.season_number, episode)
 
-            cur_failed_queue_item = search_queue.FailedQueueItem(parsed.show, segment)
+            cur_failed_queue_item = search_queue.FailedQueueItem(parsed.show, [segment])
             sickbeard.searchQueueScheduler.action.add_item(cur_failed_queue_item)
 
         return True
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 6d196258..34bdcf8e 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -245,21 +245,24 @@ class FailedQueueItem(generic_queue.QueueItem):
 
     def run(self):
         generic_queue.QueueItem.run(self)
-
+        self.started = True
+        
         try:
-            logger.log(u"Marking episode as bad: [" + self.segment.prettyName() + "]")
-            self.started = True
-            failed_history.markFailed(self.segment)
+            for epObj in self.segment:
+            
+                logger.log(u"Marking episode as bad: [" + epObj.prettyName() + "]")
+                
+                failed_history.markFailed(epObj)
+    
+                (release, provider) = failed_history.findRelease(epObj)
+                if release:
+                    failed_history.logFailed(release)
+                    history.logFailed(epObj, release, provider)
+    
+                failed_history.revertEpisode(epObj)
+                logger.log("Beginning failed download search for: [" + epObj.prettyName() + "]")
 
-            (release, provider) = failed_history.findRelease(self.segment)
-            if release:
-                failed_history.logFailed(release)
-                history.logFailed(self.segment, release, provider)
-
-            failed_history.revertEpisode(self.segment)
-            logger.log("Beginning failed download search for: [" + self.segment.prettyName() + "]")
-
-            searchResult = search.searchProviders(self.show, [self.segment], True)
+            searchResult = search.searchProviders(self.show, self.segment, True)
 
             if searchResult:
                 for result in searchResult:
@@ -270,7 +273,8 @@ class FailedQueueItem(generic_queue.QueueItem):
                     # give the CPU a break
                     time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
             else:
-                logger.log(u"No valid episode found to retry for: [" + self.segment.prettyName() + "]")
+                pass
+                #logger.log(u"No valid episode found to retry for: [" + self.segment.prettyName() + "]")
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
             
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 11e08e89..f5189539 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4204,7 +4204,7 @@ class Home(MainHandler):
             msg = "Retrying Search was automatically started for the following season of <b>" + showObj.name + "</b>:<br />"
 
             for season, segment in segments.items():
-                cur_failed_queue_item = search_queue.FailedQueueItem(showObj, segment)
+                cur_failed_queue_item = search_queue.FailedQueueItem(showObj, [segment])
                 sickbeard.searchQueueScheduler.action.add_item(cur_failed_queue_item)  # @UndefinedVariable
 
                 msg += "<li>Season " + str(season) + "</li>"
@@ -4358,20 +4358,28 @@ class Home(MainHandler):
         if currentManualSearchThreadsQueued:
             for searchThread in currentManualSearchThreadsQueued:
                 searchstatus = 'queued'
-                    
-                episodes.append({'episode': searchThread.segment.episode,
-                                 'episodeindexid': searchThread.segment.indexerid, 
-                                 'season' : searchThread.segment.season, 
-                                 'searchstatus' : searchstatus, 
-                                 'status' : statusStrings[searchThread.segment.status], 
-                                 'quality': self.getQualityClass(searchThread.segment)})
+                if isinstance(searchThread, sickbeard.search_queue.ManualSearchQueueItem):    
+                    episodes.append({'episode': searchThread.segment.episode,
+                                     'episodeindexid': searchThread.segment.indexerid, 
+                                     'season' : searchThread.segment.season, 
+                                     'searchstatus' : searchstatus, 
+                                     'status' : statusStrings[searchThread.segment.status], 
+                                     'quality': self.getQualityClass(searchThread.segment)})
+                else:
+                    for epObj in searchThread.segment:
+                        episodes.append({'episode': epObj.episode,
+                             'episodeindexid': epObj.indexerid,
+                             'season' : epObj.season, 
+                             'searchstatus' : searchstatus, 
+                             'status' : statusStrings[epObj.status], 
+                             'quality': self.getQualityClass(epObj)})
         
         if currentManualSearchThreadActive:
             searchThread = currentManualSearchThreadActive
             searchstatus = 'searching'
             if searchThread.success:
                 searchstatus = 'finished'
-            episodes.append({'episode': searchThread.segment.episode,
+                episodes.append({'episode': searchThread.segment.episode,
                              'episodeindexid': searchThread.segment.indexerid,
                          'season' : searchThread.segment.season, 
                          'searchstatus' : searchstatus, 
@@ -4380,14 +4388,27 @@ class Home(MainHandler):
         
         if finishedManualSearchThreadItems:
             for searchThread in finishedManualSearchThreadItems:
-                if str(searchThread.show.indexerid) == show and not [x for x in episodes if x['episodeindexid'] == searchThread.segment.indexerid]:
-                    searchstatus = 'finished'
-                    episodes.append({'episode': searchThread.segment.episode,
-                                     'episodeindexid': searchThread.segment.indexerid,
-                             'season' : searchThread.segment.season, 
-                             'searchstatus' : searchstatus, 
-                             'status' : statusStrings[searchThread.segment.status], 
-                             'quality': self.getQualityClass(searchThread.segment)})
+                if isinstance(searchThread, sickbeard.search_queue.ManualSearchQueueItem):
+                    if str(searchThread.show.indexerid) == show and not [x for x in episodes if x['episodeindexid'] == searchThread.segment.indexerid]:
+                        searchstatus = 'finished'
+                        episodes.append({'episode': searchThread.segment.episode,
+                                         'episodeindexid': searchThread.segment.indexerid,
+                                 'season' : searchThread.segment.season, 
+                                 'searchstatus' : searchstatus, 
+                                 'status' : statusStrings[searchThread.segment.status], 
+                                 'quality': self.getQualityClass(searchThread.segment)})
+                else:
+                    ### These are only Failed Downloads/Retry SearchThreadItems.. lets loop through the segement/episodes
+                    if str(searchThread.show.indexerid) == show:
+                        for epObj in searchThread.segment:
+                            if not [x for x in episodes if x['episodeindexid'] == epObj.indexerid]:
+                                searchstatus = 'finished'
+                                episodes.append({'episode': epObj.episode,
+                                                 'episodeindexid': epObj.indexerid,
+                                         'season' : epObj.season, 
+                                         'searchstatus' : searchstatus, 
+                                         'status' : statusStrings[epObj.status], 
+                                         'quality': self.getQualityClass(epObj)})
         
         return json.dumps({'show': show, 'episodes' : episodes})
 
@@ -4514,7 +4535,7 @@ class Home(MainHandler):
             return json.dumps({'result': 'failure'})
 
         # make a queue item for it and put it on the queue
-        ep_queue_item = search_queue.FailedQueueItem(ep_obj.show, ep_obj)
+        ep_queue_item = search_queue.FailedQueueItem(ep_obj.show, [ep_obj])
         sickbeard.searchQueueScheduler.action.add_item(ep_queue_item)  # @UndefinedVariable
 
         if ep_queue_item.success:

From 8b678445cc45638d3c2ab15afe6901fbe7e0ec89 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 12:05:50 +0200
Subject: [PATCH 16/24] Fix exception for when no results returned.

---
 sickbeard/providers/tokyotoshokan.py | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/sickbeard/providers/tokyotoshokan.py b/sickbeard/providers/tokyotoshokan.py
index 35034595..12286b07 100644
--- a/sickbeard/providers/tokyotoshokan.py
+++ b/sickbeard/providers/tokyotoshokan.py
@@ -105,20 +105,21 @@ class TokyoToshokanProvider(generic.TorrentProvider):
             with BS4Parser(data, features=["html5lib", "permissive"]) as soup:
                 torrent_table = soup.find('table', attrs={'class': 'listing'})
                 torrent_rows = torrent_table.find_all('tr') if torrent_table else []
-                if torrent_rows[0].find('td', attrs={'class': 'centertext'}):
-                    a = 1
-                else:
-                    a = 0
-
-                for top, bottom in zip(torrent_rows[a::2], torrent_rows[a::2]):
-                    title = top.find('td', attrs={'class': 'desc-top'}).text
-                    url = top.find('td', attrs={'class': 'desc-top'}).find('a')['href']
-
-                    if not title or not url:
-                        continue
-
-                    item = title.lstrip(), url
-                    results.append(item)
+                if torrent_rows: 
+                    if torrent_rows[0].find('td', attrs={'class': 'centertext'}):
+                        a = 1
+                    else:
+                        a = 0
+    
+                    for top, bottom in zip(torrent_rows[a::2], torrent_rows[a::2]):
+                        title = top.find('td', attrs={'class': 'desc-top'}).text
+                        url = top.find('td', attrs={'class': 'desc-top'}).find('a')['href']
+    
+                        if not title or not url:
+                            continue
+    
+                        item = title.lstrip(), url
+                        results.append(item)
 
         except Exception, e:
             logger.log(u"Failed to parsing " + self.name + " Traceback: " + traceback.format_exc(), logger.ERROR)

From 4b1b3c6488d68cb73b4d535a561bace7447ee847 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 12:06:59 +0200
Subject: [PATCH 17/24] When no absolute episode number retrieved, fall backto
 the scene_episode. Else search will be done for episode: 00

---
 sickbeard/show_name_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index f5df5d65..f5657083 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -190,7 +190,7 @@ def makeSceneSearchString(show, ep_obj):
     if (show.air_by_date or show.sports) and ep_obj.airdate != datetime.date.fromordinal(1):
         epStrings = [str(ep_obj.airdate)]
     elif show.is_anime:
-        epStrings = ["%02i" % int(ep_obj.scene_absolute_number)]
+        epStrings = ["%02i" % int(ep_obj.scene_absolute_number if ep_obj.scene_absolute_number > 0 else ep_obj.scene_episode)]
     else:
         epStrings = ["S%02iE%02i" % (int(ep_obj.scene_season), int(ep_obj.scene_episode)),
                      "%ix%02i" % (int(ep_obj.scene_season), int(ep_obj.scene_episode))]

From c54e70e99b741d62cc36df1a9ec0e249a2fe983d Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 13:56:49 +0200
Subject: [PATCH 18/24] Fixed displaying of currently running searches

---
 sickbeard/webserve.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index f5189539..3ae7792f 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4379,13 +4379,15 @@ class Home(MainHandler):
             searchstatus = 'searching'
             if searchThread.success:
                 searchstatus = 'finished'
-                episodes.append({'episode': searchThread.segment.episode,
+            else:
+                searchstatus = 'searching'
+            episodes.append({'episode': searchThread.segment.episode,
                              'episodeindexid': searchThread.segment.indexerid,
-                         'season' : searchThread.segment.season, 
-                         'searchstatus' : searchstatus, 
-                         'status' : statusStrings[searchThread.segment.status], 
-                         'quality': self.getQualityClass(searchThread.segment)})
-        
+                             'season' : searchThread.segment.season, 
+                             'searchstatus' : searchstatus, 
+                             'status' : statusStrings[searchThread.segment.status], 
+                             'quality': self.getQualityClass(searchThread.segment)})
+            
         if finishedManualSearchThreadItems:
             for searchThread in finishedManualSearchThreadItems:
                 if isinstance(searchThread, sickbeard.search_queue.ManualSearchQueueItem):

From 7e3b9848bd87a58b93d5a9273f832ebfed758d62 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 15:43:31 +0200
Subject: [PATCH 19/24] Fixed the qualityparsing for nyaatorrent search results

---
 sickbeard/providers/nyaatorrents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py
index 48b973f2..88d93f9d 100644
--- a/sickbeard/providers/nyaatorrents.py
+++ b/sickbeard/providers/nyaatorrents.py
@@ -52,7 +52,7 @@ class NyaaProvider(generic.TorrentProvider):
 
     def getQuality(self, item, anime=False):
         title = item.title
-        quality = Quality.sceneQuality(title)
+        quality = Quality.sceneQuality(title, anime)
         return quality
 
     def findSearchResults(self, show, episodes, search_mode, manualSearch=False):

From fd4e26795f8c870d6adc228467b0c9958f950142 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Fri, 19 Sep 2014 15:49:26 +0200
Subject: [PATCH 20/24] Fix offset calculation. No more unnecessary (double)
 searches. For anime shows: if no absolute numbering is available, use the
 default numbering.

---
 sickbeard/providers/newznab.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
index a0ff556f..0021c962 100755
--- a/sickbeard/providers/newznab.py
+++ b/sickbeard/providers/newznab.py
@@ -189,7 +189,7 @@ class NewznabProvider(generic.NZBProvider):
             params['season'] = date_str.partition('-')[0]
             params['ep'] = date_str.partition('-')[2].replace('-', '/')
         elif ep_obj.show.anime:
-            params['ep'] = "%i" % int(ep_obj.scene_absolute_number)
+            params['ep'] = "%i" % int(ep_obj.scene_absolute_number if int(ep_obj.scene_absolute_number) > 0 else ep_obj.scene_episode)
         else:
             params['season'] = ep_obj.scene_season
             params['ep'] = ep_obj.scene_episode
@@ -302,17 +302,27 @@ class NewznabProvider(generic.NZBProvider):
             if total == 0:
                 total = int(data.feed.newznab_response['total'] or 0)
             offset = int(data.feed.newznab_response['offset'] or 0)
-
+            
+            # No items found, prevent from doing another search
+            if total == 0:
+                break
+                
             if offset != params['offset']:
                 logger.log("Tell your newznab provider to fix their bloody newznab responses")
                 break
-
-            # if there are more items available then the amount given in one call, grab some more
+            
             params['offset'] += params['limit']
-
-            logger.log(str(
-                total - offset) + " more items to be fetched from provider. Fetching another " + str(
-                params['limit']) + " items.", logger.DEBUG)
+            if (total > int(params['offset'])):
+                offset = int(params['offset'])
+                # if there are more items available then the amount given in one call, grab some more
+                logger.log(str(
+                    total - int(params['offset'])) + " more items to be fetched from provider. Fetching another " + str(
+                    params['limit']) + " items.", logger.DEBUG)
+            else:
+                logger.log(str(
+                    total - int(params['offset'])) + " No more searches needed, could find anything I was looking for! " + str(
+                    params['limit']) + " items.", logger.DEBUG)
+                break
 
             time.sleep(0.2)
 

From d0dac45315f717efbbc9e7fa657e6f01ef3b29d7 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Tue, 16 Sep 2014 15:57:32 +0200
Subject: [PATCH 21/24] Made improvements for searching for anime on newznab
 providers, who haven't straitened out there anime episode parsing. Should
 provide more search result using for example: usenet-crawler, nZEDb, spotweb.

Newznab now also searches by q= querystring. Ommits the Ep.

Needed to cast ep (int) to str, for str concatenation

add searchstrings for searching newznab providers excluding the ep= paramater. I've added the episode to the q= param. querystring could look like: ?q=showname%2043
---
 sickbeard/providers/newznab.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
index a0ff556f..db22e831 100755
--- a/sickbeard/providers/newznab.py
+++ b/sickbeard/providers/newznab.py
@@ -189,7 +189,7 @@ class NewznabProvider(generic.NZBProvider):
             params['season'] = date_str.partition('-')[0]
             params['ep'] = date_str.partition('-')[2].replace('-', '/')
         elif ep_obj.show.anime:
-            params['ep'] = "%i" % int(ep_obj.scene_absolute_number)
+            params['ep'] = "%i" % int(ep_obj.scene_absolute_number if int(ep_obj.scene_absolute_number) > 0 else ep_obj.scene_episode)
         else:
             params['season'] = ep_obj.scene_season
             params['ep'] = ep_obj.scene_episode
@@ -207,7 +207,20 @@ class NewznabProvider(generic.NZBProvider):
         for cur_exception in name_exceptions:
             params['q'] = helpers.sanitizeSceneName(cur_exception)
             to_return.append(params)
-
+        
+            if ep_obj.show.anime:
+                # Experimental, add a searchstring without search explicitly for the episode!
+                # Remove the ?ep=e46 paramater and use add the episode number to the query paramater.
+                # Can be usefull for newznab indexers that do not have the episodes 100% parsed.
+                # Start with only applying the searchstring to anime shows
+                params['q'] = helpers.sanitizeSceneName(cur_exception)
+                paramsNoEp = params.copy()
+                
+                paramsNoEp['q'] = paramsNoEp['q'] + " " + str(paramsNoEp['ep'])
+                if "ep" in paramsNoEp:
+                    paramsNoEp.pop("ep")
+                to_return.append(paramsNoEp)
+        
         return to_return
 
     def _doGeneralSearch(self, search_string):

From 7ba97b6b01a00389572174a02e1adef723e1be88 Mon Sep 17 00:00:00 2001
From: darkdragon2000 <darkdragon2000@hotmail.com>
Date: Fri, 19 Sep 2014 16:45:59 -0400
Subject: [PATCH 22/24] Update kat.py

Fix search string for air-by-date to only return episodes for the date searched.
---
 sickbeard/providers/kat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
index fcaff6e9..dc13922e 100644
--- a/sickbeard/providers/kat.py
+++ b/sickbeard/providers/kat.py
@@ -194,7 +194,7 @@ class KATProvider(generic.TorrentProvider):
         if self.show.air_by_date:
             for show_name in set(allPossibleShowNames(self.show)):
                 ep_string = sanitizeSceneName(show_name) + ' ' + \
-                            str(ep_obj.airdate).replace('-', '|')
+                            str(ep_obj.airdate).replace('-', ' ')
                 search_string['Episode'].append(ep_string)
         elif self.show.sports:
             for show_name in set(allPossibleShowNames(self.show)):

From 5ac389560025e06fa37acef4aa60823404e1c746 Mon Sep 17 00:00:00 2001
From: adam <adam111316@users.noreply.github.com>
Date: Sat, 20 Sep 2014 20:03:48 +0800
Subject: [PATCH 23/24] Fixes daily search and speed improvements

---
 sickbeard/dailysearcher.py     | 10 ++-----
 sickbeard/db.py                |  6 ++--
 sickbeard/providers/generic.py |  9 ++----
 sickbeard/search.py            | 55 ++++++++++++++++++++++++++++++----
 sickbeard/search_queue.py      | 17 ++++++-----
 sickbeard/tv.py                |  2 ++
 sickbeard/tvcache.py           | 30 +++++++++++--------
 7 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/sickbeard/dailysearcher.py b/sickbeard/dailysearcher.py
index 61e4dafc..216e017d 100644
--- a/sickbeard/dailysearcher.py
+++ b/sickbeard/dailysearcher.py
@@ -50,13 +50,11 @@ class DailySearcher():
 
         sql_l = []
         show = None
-        wantedEp = {}
 
         for sqlEp in sqlResults:
             try:
                 if not show or int(sqlEp["showid"]) != show.indexerid:
                     show = helpers.findCertainShow(sickbeard.showList, int(sqlEp["showid"]))
-                    wantedEp[show] = []
 
             except exceptions.MultipleShowObjectsException:
                 logger.log(u"ERROR: expected to find a single show matching " + sqlEp["showid"])
@@ -68,7 +66,6 @@ class DailySearcher():
                     ep.status = common.SKIPPED
                 else:
                     ep.status = common.WANTED
-                    wantedEp[show].append(ep)
 
                 sql_l.append(ep.get_sql())
         else:
@@ -78,9 +75,8 @@ class DailySearcher():
             myDB = db.DBConnection()
             myDB.mass_action(sql_l)
 
-        for show, episode in wantedEp.items():
-            # queue episode for daily search
-            dailysearch_queue_item = sickbeard.search_queue.DailySearchQueueItem(show, episode)
-            sickbeard.searchQueueScheduler.action.add_item(dailysearch_queue_item)
+        # queue episode for daily search
+        dailysearch_queue_item = sickbeard.search_queue.DailySearchQueueItem()
+        sickbeard.searchQueueScheduler.action.add_item(dailysearch_queue_item)
 
         self.amActive = False
\ No newline at end of file
diff --git a/sickbeard/db.py b/sickbeard/db.py
index fa48b6a1..b629a7d1 100644
--- a/sickbeard/db.py
+++ b/sickbeard/db.py
@@ -118,7 +118,7 @@ class DBConnection(object):
         else:
             return 0
 
-    def mass_action(self, querylist, logTransaction=False):
+    def mass_action(self, querylist, logTransaction=False, fetchall=False):
 
         with db_lock:
             # remove None types
@@ -136,11 +136,11 @@ class DBConnection(object):
                         if len(qu) == 1:
                             if logTransaction:
                                 logger.log(qu[0], logger.DEBUG)
-                            sqlResult.append(self.execute(qu[0]))
+                            sqlResult.append(self.execute(qu[0], fetchall=fetchall))
                         elif len(qu) > 1:
                             if logTransaction:
                                 logger.log(qu[0] + " with args " + str(qu[1]), logger.DEBUG)
-                            sqlResult.append(self.execute(qu[0], qu[1]))
+                            sqlResult.append(self.execute(qu[0], qu[1], fetchall=fetchall))
 
                     logger.log(u"Transaction with " + str(len(querylist)) + u" queries executed", logger.DEBUG)
 
diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index ec13997f..7c4b637f 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -203,13 +203,8 @@ class GenericProvider:
 
         return True
 
-    def searchRSS(self, episode):
-        results = {}
-
-        for ep in episode:
-            results.update(self.cache.findNeededEpisodes(ep))
-
-        return results
+    def searchRSS(self, episodes):
+        return self.cache.findNeededEpisodes(episodes)
 
     def getQuality(self, item, anime=False):
         """
diff --git a/sickbeard/search.py b/sickbeard/search.py
index 86ae61e4..bc2c8bf8 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -41,6 +41,7 @@ from sickbeard import failed_history
 from sickbeard.exceptions import ex
 from sickbeard.providers.generic import GenericProvider
 from sickbeard.blackandwhitelist import BlackAndWhiteList
+from sickbeard import common
 
 def _downloadResult(result):
     """
@@ -319,16 +320,60 @@ def isFirstBestMatch(result):
 
     return False
 
-def searchForNeededEpisodes(show, episode):
+def wantedEpisodes(show, fromDate):
+    anyQualities, bestQualities = common.Quality.splitQuality(show.quality) # @UnusedVariable
+    allQualities = list(set(anyQualities + bestQualities))
+
+    logger.log(u"Seeing if we need anything from " + show.name)
+    myDB = db.DBConnection()
+
+    if show.air_by_date:
+        sqlResults = myDB.select(
+            "SELECT ep.status, ep.season, ep.episode FROM tv_episodes ep, tv_shows show WHERE season != 0 AND ep.showid = show.indexer_id AND show.paused = 0 AND ep.airdate > ? AND ep.showid = ? AND show.air_by_date = 1",
+        [fromDate.toordinal(), show.indexerid])
+    else:
+        sqlResults = myDB.select(
+            "SELECT status, season, episode FROM tv_episodes WHERE showid = ? AND season > 0 and airdate > ?",
+            [show.indexerid, fromDate.toordinal()])
+
+    # check through the list of statuses to see if we want any
+    wanted = []
+    for result in sqlResults:
+        curCompositeStatus = int(result["status"])
+        curStatus, curQuality = common.Quality.splitCompositeStatus(curCompositeStatus)
+
+        if bestQualities:
+            highestBestQuality = max(allQualities)
+        else:
+            highestBestQuality = 0
+
+        # if we need a better one then say yes
+        if (curStatus in (common.DOWNLOADED, common.SNATCHED, common.SNATCHED_PROPER,
+            common.SNATCHED_BEST) and curQuality < highestBestQuality) or curStatus == common.WANTED:
+
+            epObj = show.getEpisode(int(result["season"]), int(result["episode"]))
+            epObj.wantedQuality = [i for i in allQualities if (i > curQuality and i != common.Quality.UNKNOWN)]
+            wanted.append(epObj)
+
+    return wanted
+
+def searchForNeededEpisodes():
     foundResults = {}
 
     didSearch = False
 
-    # build name cache for show
-    sickbeard.name_cache.buildNameCache(show)
-
     origThreadName = threading.currentThread().name
 
+    show_list = sickbeard.showList
+    fromDate = datetime.date.fromordinal(1)
+    episodes = []
+
+    for curShow in show_list:
+        if curShow.paused:
+            continue
+
+        episodes.extend(wantedEpisodes(curShow, fromDate))
+
     providers = [x for x in sickbeard.providers.sortedProviderList() if x.isActive() and x.enable_daily]
     for curProvider in providers:
 
@@ -336,7 +381,7 @@ def searchForNeededEpisodes(show, episode):
 
         try:
             curProvider.cache.updateCache()
-            curFoundResults = curProvider.searchRSS(episode)
+            curFoundResults = curProvider.searchRSS(episodes)
         except exceptions.AuthException, e:
             logger.log(u"Authentication error: " + ex(e), logger.ERROR)
             continue
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 34bdcf8e..62aa6589 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -116,8 +116,11 @@ class SearchQueue(generic_queue.GenericQueue):
 
 
     def add_item(self, item):
-        if isinstance(item, (DailySearchQueueItem, BacklogQueueItem)) and not self.is_in_queue(item.show, item.segment):
-            # daily and backlog searches
+        if isinstance(item, DailySearchQueueItem):
+            # daily searches
+            generic_queue.GenericQueue.add_item(self, item)
+        elif isinstance(item, BacklogQueueItem) and not self.is_in_queue(item.show, item.segment):
+            # backlog searches
             generic_queue.GenericQueue.add_item(self, item)
         elif isinstance(item, (ManualSearchQueueItem, FailedQueueItem)) and not self.is_ep_in_queue(item.segment):
             # manual and failed searches
@@ -126,20 +129,18 @@ class SearchQueue(generic_queue.GenericQueue):
             logger.log(u"Not adding item, it's already in the queue", logger.DEBUG)
 
 class DailySearchQueueItem(generic_queue.QueueItem):
-    def __init__(self, show, segment):
+    def __init__(self):
         generic_queue.QueueItem.__init__(self, 'Daily Search', DAILY_SEARCH)
-        self.show = show
-        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)
+            logger.log("Beginning daily search for new episodes")
+            foundResults = search.searchForNeededEpisodes()
 
             if not len(foundResults):
-                logger.log(u"No needed episodes found during daily search for: [" + self.show.name + "]")
+                logger.log(u"No needed episodes found")
             else:
                 for result in foundResults:
                     # just use the first result for now
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 862838f3..e9735b23 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -1305,6 +1305,8 @@ class TVEpisode(object):
 
         self.checkForMetaFiles()
 
+        self.wantedQuality = []
+
     name = property(lambda self: self._name, dirty_setter("_name"))
     season = property(lambda self: self._season, dirty_setter("_season"))
     episode = property(lambda self: self._episode, dirty_setter("_episode"))
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index f257a10d..0d790d4f 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -32,6 +32,7 @@ from sickbeard.exceptions import AuthException
 from name_parser.parser import NameParser, InvalidNameException, InvalidShowException
 from sickbeard.rssfeeds import RSSFeeds
 from sickbeard import clients
+import itertools
 
 class CacheDBConnection(db.DBConnection):
     def __init__(self, providerName):
@@ -279,7 +280,10 @@ class TVCache():
 
     def searchCache(self, episode, manualSearch=False):
         neededEps = self.findNeededEpisodes(episode, manualSearch)
-        return neededEps[episode]
+        if len(neededEps) > 0:
+            return neededEps[episode]
+        else:
+            return []
 
     def listPropers(self, date=None, delimiter="."):
         myDB = self._getDB()
@@ -291,19 +295,24 @@ class TVCache():
         return filter(lambda x: x['indexerid'] != 0, myDB.select(sql))
 
 
-    def findNeededEpisodes(self, episode=None, manualSearch=False):
+    def findNeededEpisodes(self, episode, manualSearch=False):
         neededEps = {}
-
-        if episode:
-            neededEps[episode] = []
+        cl = []
 
         myDB = self._getDB()
-        if not episode:
-            sqlResults = myDB.select("SELECT * FROM [" + self.providerID + "]")
-        else:
+        if type(episode) != list:
             sqlResults = myDB.select(
                 "SELECT * FROM [" + self.providerID + "] WHERE indexerid = ? AND season = ? AND episodes LIKE ?",
                 [episode.show.indexerid, episode.season, "%|" + str(episode.episode) + "|%"])
+        else:
+            for epObj in episode:
+                cl.append([
+                    "SELECT * FROM [" + self.providerID + "] WHERE indexerid = ? AND season = ? AND episodes LIKE ? "
+                    "AND quality IN (" + ",".join([str(x) for x in epObj.wantedQuality]) + ")",
+                    [epObj.show.indexerid, epObj.season, "%|" + str(epObj.episode) + "|%"]])
+
+            sqlResults = myDB.mass_action(cl, fetchall=True)
+            sqlResults = list(itertools.chain(*sqlResults))
 
         # for each cache entry
         for curResult in sqlResults:
@@ -341,10 +350,7 @@ class TVCache():
                            Quality.qualityStrings[curQuality], logger.DEBUG)
                 continue
 
-            if episode:
-                epObj = episode
-            else:
-                epObj = showObj.getEpisode(curSeason, curEp)
+            epObj = showObj.getEpisode(curSeason, curEp)
 
             # build a result object
             title = curResult["name"]

From 69bb4d6373b5d6df712fbf2f1b35c8a307261a82 Mon Sep 17 00:00:00 2001
From: KontiSR <sickrage@headshots.nl>
Date: Sun, 21 Sep 2014 12:18:43 +0200
Subject: [PATCH 24/24] Fix for updating queue icon when DailySearchQueueItem
 is running. Did not had any impact on searching.. only unexpected behavior
 when updating the spinner or queue img.

---
 sickbeard/search_queue.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 62aa6589..1a03f031 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -84,9 +84,8 @@ class SearchQueue(generic_queue.GenericQueue):
         return self.min_priority >= generic_queue.QueuePriorities.NORMAL
 
     def is_manualsearch_in_progress(self):
-        for cur_item in self.queue + [self.currentItem]:
-            if isinstance(cur_item, (ManualSearchQueueItem, FailedQueueItem)):
-                return True
+        if isinstance(self.currentItem, (ManualSearchQueueItem, FailedQueueItem)):
+            return True
         return False
     
     def is_backlog_in_progress(self):