From db6cf0b22b093ff214485fbbb63b507bfc0255dc Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Fri, 30 May 2014 04:06:51 -0700
Subject: [PATCH] Fix for daily searcher NoneType error.

Added XEM icon to show display, indicates if show has scene mapping available or not plus clicking on the icon will take you to the XEM mapping page.
---
 gui/slick/images/xem.png                      | Bin 0 -> 6826 bytes
 gui/slick/interfaces/default/displayShow.tmpl |  14 +++++++-------
 gui/slick/interfaces/default/manage.tmpl      |  15 +++++++++------
 sickbeard/dailysearcher.py                    |   8 ++++----
 sickbeard/webserve.py                         |   2 +-
 5 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 gui/slick/images/xem.png

diff --git a/gui/slick/images/xem.png b/gui/slick/images/xem.png
new file mode 100644
index 0000000000000000000000000000000000000000..634def233941b7029a04dc2e7ffc63c3af727f35
GIT binary patch
literal 6826
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
ZMmSv-#JXlTj;to&=0B#_%dWXR{~uyR<&XdX

literal 0
HcmV?d00001

diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl
index 0c2d7af2..74316b3f 100644
--- a/gui/slick/interfaces/default/displayShow.tmpl
+++ b/gui/slick/interfaces/default/displayShow.tmpl
@@ -72,14 +72,12 @@
 <div class="showInfo">
 <h1 class="title" id="scene_exception_$show.indexerid"><a>$show.name</a></h1>
 <span class="headerInfo" style="color: #b7b7b7; line-height: 16px;">
+<span class="tvshowLink" style="vertical-align: text-top">
 #if not $show.imdbid
 	($show.startyear) - $show.runtime min 
 	#if $show.genre: 
 		- $show.genre[1:-1].replace('|',' | ') 
 	#end if
-	<span class="tvshowLink" style="vertical-align: text-top">
-		<a href="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid" onclick="window.open(this.href, '_blank'); return false;" title="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid"><img alt="$sickbeard.indexerApi($show.indexer).name" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($show.indexer).config["icon"] "style="margin-top: -1px;"/></a>
-	</span>
 #else
     #if 'country_codes' in $show.imdb_info:
         #for $country in $show.imdb_info['country_codes'].split('|')
@@ -89,11 +87,13 @@
     #if 'year' in $show.imdb_info:
         ($show.imdb_info['year']) - $show.imdb_info['runtimes'] min - $show.imdb_info['genres'].replace('|',' | ')
     #end if
-	<span class="tvshowLink" style="vertical-align: text-top">
-		<a href="http://www.imdb.com/title/$show.imdbid" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="http://www.imdb.com/title/$show.imdbid"><img alt="[imdb]" height="16" width="16" src="$sbRoot/images/imdb.png" style="margin-top: -1px;"/>
-		<a href="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid"><img alt="$sickbeard.indexerApi($show.indexer).name" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($show.indexer).config["icon"] "style="margin-top: -1px;"/></a>
-	</span>
+	<a href="http://www.imdb.com/title/$show.imdbid" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="http://www.imdb.com/title/$show.imdbid"><img alt="[imdb]" height="16" width="16" src="$sbRoot/images/imdb.png" style="margin-top: -1px;"/>
 #end if
+<a href="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid" onclick="window.open(this.href, '_blank'); return false;" title="$sickbeard.indexerApi($show.indexer).config["show_url"]$show.indexerid"><img alt="$sickbeard.indexerApi($show.indexer).name" height="16" width="16" src="$sbRoot/images/$sickbeard.indexerApi($show.indexer).config["icon"] "style="margin-top: -1px;"/></a>
+#if $xem_numbering or $xem_absolute_numbering:
+    <a href="http://thexem.de/search?q=$show.name" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;" title="http://thexem.de/search?q-$show.name"><img alt="[xem]" height="16" width="16" src="$sbRoot/images/xem.png" style="margin-top: -1px;"/>
+#end if
+</span>
 </span> 
 #if $seasonResults:
     ##There is a special/season_0?##
diff --git a/gui/slick/interfaces/default/manage.tmpl b/gui/slick/interfaces/default/manage.tmpl
index d3936a62..1138d997 100644
--- a/gui/slick/interfaces/default/manage.tmpl
+++ b/gui/slick/interfaces/default/manage.tmpl
@@ -56,9 +56,12 @@
             6: { sorter: false},
             7: { sorter: false},
             8: { sorter: false},
-            9: { sorter: false}
+            9: { sorter: false},
+           10: { sorter: false},
+           11: { sorter: false},
+           12: { sorter: false}
 #if $sickbeard.USE_SUBTITLES            
-         , 10: { sorter: false}
+         , 13: { sorter: false}
 #end if         	            
         }
     }); 
@@ -79,10 +82,11 @@
       <th width="1%">Edit<br/>
       	<input type="checkbox" class="bulkCheck" id="editCheck" />
       </th>
-<!--       <th>Lang</th>//-->
+
       <th class="nowrap" style="text-align: left;">Show Name</th>
       <th>Quality</th>
       <th>Sports</th>
+      <th>Scene</th>
       <th>Anime</th>
       <th>Flat Folders</th>
       <th>Paused</th>
@@ -100,7 +104,7 @@
 <tfoot>
   <tr>
     <td rowspan="1" colspan="1" class="align-center alt"><input class="btn" type="button" value="Edit Selected" id="submitMassEdit" /></td>
-    <td rowspan="1" colspan="#if $sickbeard.USE_SUBTITLES then 11 else 10#" class="align-right alt"><input class="btn btn-primary" type="button" value="Submit" id="submitMassUpdate" /></td>
+    <td rowspan="1" colspan="#if $sickbeard.USE_SUBTITLES then 13 else 12#" class="align-right alt"><input class="btn btn-primary" type="button" value="Submit" id="submitMassUpdate" /></td>
   </tr>
 </tfoot>
   <tbody>
@@ -137,7 +141,6 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
 
   <tr>
     <td align="center"><input type="checkbox" class="editCheck" id="edit-$curShow.indexerid" /></td>
-<!--     <td align="center"><img src="$sbRoot/images/flags/${curShow.lang}.png" width="16" height="11" alt="$curShow.lang" /></td>//-->
     <td class="tvShow"><a href="$sbRoot/home/displayShow?show=$curShow.indexerid">$curShow.name</a></td>
 #if $curShow.quality in $qualityPresets:
     <td align="center"><span class="quality $qualityPresetStrings[$curShow.quality]">$qualityPresetStrings[$curShow.quality]</span></td>
@@ -145,6 +148,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
     <td align="center"><span class="quality Custom">Custom</span></td>
 #end if
     <td align="center"><img src="$sbRoot/images/#if int($curShow.is_sports) == 1 then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
+    <td align="center"><img src="$sbRoot/images/#if int($curShow.is_scene) == 1 then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
     <td align="center"><img src="$sbRoot/images/#if int($curShow.is_anime) == 1 then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
     <td align="center"><img src="$sbRoot/images/#if int($curShow.flatten_folders) == 1 then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
     <td align="center"><img src="$sbRoot/images/#if int($curShow.paused) == 1 then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
@@ -155,7 +159,6 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
 #if $sickbeard.USE_SUBTITLES:
     <td align="center">$curSubtitle</td>
 #end if
-<!--    <td align="center"><input type="checkbox" class="metadataCheck" id="metadata-$curShow.indexerid" /></td>//-->
     <td align="center">$curDelete</td>
   </tr>
 #end for
diff --git a/sickbeard/dailysearcher.py b/sickbeard/dailysearcher.py
index 02009a04..f7c9672b 100644
--- a/sickbeard/dailysearcher.py
+++ b/sickbeard/dailysearcher.py
@@ -79,11 +79,11 @@ class DailySearcher():
                     else:
                         todaysEps[show].append(ep)
 
-                    sql_l.append(ep.get_sql())
+                sql_l.append(ep.get_sql())
 
-            if len(sql_l) > 0:
-                myDB = db.DBConnection()
-                myDB.mass_action(sql_l)
+        if len(sql_l) > 0:
+            myDB = db.DBConnection()
+            myDB.mass_action(sql_l)
 
         if len(todaysEps):
             for show in todaysEps:
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 38a5524d..70f219f3 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -2963,7 +2963,7 @@ class Home:
         showObj.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid)
 
         # Update scene numbering in DB
-        sickbeard.scene_numbering.xem_refresh(showObj.indexerid, showObj.indexer, True)
+        sickbeard.scene_numbering.xem_refresh(showObj.indexerid, showObj.indexer)
 
         myDB = db.DBConnection()