Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries

SickBeard.py

@@ -52,6 +52,7 @@
 from sickbeard.tv import TVShow
 from sickbeard import logger
 from sickbeard.version import SICKBEARD_VERSION
+from sickbeard.databases.mainDB import MAX_DB_VERSION
 
 from sickbeard.webserveInit import initWebServer
 
@@ -162,9 +163,9 @@ def main():
     threading.currentThread().name = "MAIN"
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "qfdp::", ['quiet', 'forceupdate', 'daemon', 'port=', 'pidfile=', 'nolaunch', 'config=', 'datadir='])  # @UnusedVariable
+        opts, args = getopt.getopt(sys.argv[1:], "qfdp::", ['quiet', 'forceupdate', 'port=', 'daemon', 'noresize', 'pidfile=', 'nolaunch', 'config=', 'datadir='])  # @UnusedVariable
     except getopt.GetoptError:
-        print "Available Options: --quiet, --forceupdate, --port, --daemon, --pidfile, --config, --datadir"
+        print "Available Options: --quiet, --forceupdate, --port, --daemon, --noresize, --pidfile, --nolaunch, --config, --datadir"
         sys.exit()
 
     forceUpdate = False
@@ -198,6 +199,10 @@ def main():
                 consoleLogging = False
                 sickbeard.DAEMON = True
 
+        # Prevent resizing of the banner/posters even if PIL is installed
+        if o in ('--noresize',):
+            sickbeard.NO_RESIZE = True
+
         # Specify folder to load the config file from
         if o in ('--config',):
             sickbeard.CONFIG_FILE = os.path.abspath(a)
@@ -257,6 +262,14 @@ def main():
 
     sickbeard.CFG = ConfigObj(sickbeard.CONFIG_FILE)
 
+    if db.DBConnection().checkDBVersion() > MAX_DB_VERSION:
+        print 'Your database version has been incremented'
+        print 'past what this version of Sick Beard supports.'
+        print
+        print 'If you have used other forks of SB which have'
+        print 'modified your database it may now be unusable.'
+        sys.exit(1)
+
     # Initialize the config and our threads
     sickbeard.initialize(consoleLogging=consoleLogging)
 

data/css/style.css

@@ -531,7 +531,9 @@ displayShow.tmpl + manage_backlogOverview.tmpl
 .wanted {
   background-color: #ffb0b0;
 }
-
+.snatched {
+  background-color: #ebc1ea;
+}
 /* =======================================================================
 manage_backlogOverview.tmpl
 ========================================================================== */
@@ -1056,12 +1058,20 @@ span.quality {
 }
 span.Custom {
   background: none repeat scroll 0 0 #449;
-  /* blue */
+  /* purplish blue */
+}
+span.HD {
+  background: none repeat scroll 0 0 #008fbb;
+  /* greenish blue */
 }
-span.HD,span.WEB-DL,span.BluRay {
+span.HD720p {
   background: none repeat scroll 0 0 #494;
   /* green */
 }
+span.HD1080p {
+  background: none repeat scroll 0 0 #499;
+  /* blue */
+}
 span.SD {
   background: none repeat scroll 0 0 #944;
   /* red */
@@ -1070,6 +1080,10 @@ span.Any {
   background: none repeat scroll 0 0 #444;
   /* black */
 }
+span.RawHD {
+  background: none repeat scroll 0 0 #999944;
+  /* dark orange */
+}
 /* unused boolean tags */
 span.false {
   color: #933;

data/interfaces/default/apiBuilder.tmpl

@@ -190,14 +190,19 @@ addList("show.setquality", "$curShow.name", "&tvdbid=$curShow.tvdbid", "quality"
 //build out generic quality options
 addOptGroup("quality", "Quality Templates");
 addOption("quality", "SD", "&initial=sdtv|sddvd");
-addOption("quality", "HD", "&initial=hdtv|hdwebdl|hdbluray");
-addOption("quality", "ANY", "&initial=sdtv|sddvd|hdtv|hdwebdl|hdbluray|unknown");
+addOption("quality", "HD", "&initial=hdtv|fullhdtv|hdwebdl|fullhdwebdl|hdbluray|fullhdbluray");
+addOption("quality", "HD720p", "&initial=hdtv|hdwebdl|hdbluray");
+addOption("quality", "HD1080p", "&initial=fullhdtv|fullhdwebdl|fullhdbluray");
+addOption("quality", "ANY", "&initial=sdtv|sddvd|hdtv|fullhdtv|hdwebdl|fullhdwebdl|hdbluray|fullhdbluray|unknown");
 endOptGroup("quality");
 addOptGroup("quality", "Inital (Custom)");
 addList("quality", "SD TV", "&initial=sdtv", "quality-archive");
 addList("quality", "SD DVD", "&initial=sddvd", "quality-archive");
 addList("quality", "HD TV", "&initial=hdtv", "quality-archive");
+addList("quality", "RawHD TV", "&initial=rawhdtv", "quality-archive");
+addList("quality", "1080p HD TV", "&initial=fullhdtv", "quality-archive");
 addList("quality", "720p Web-DL", "&initial=hdwebdl", "quality-archive");
+addList("quality", "1080p Web-DL", "&initial=fullhdwebdl", "quality-archive");
 addList("quality", "720p BluRay", "&initial=hdbluray", "quality-archive");
 addList("quality", "1080p BluRay", "&initial=fullhdbluray", "quality-archive");
 addList("quality", "Unknown", "&initial=unknown", "quality-archive");
@@ -211,10 +216,12 @@ addOption("quality-archive", "Optional Param", "", 1);
 addOptGroup("quality-archive", "Archive (Custom)");
 addList("quality-archive", "SD DVD", "&archive=sddvd");
 addList("quality-archive", "HD TV", "&archive=hdtv");
+addList("quality-archive", "RawHD TV", "&archive=rawhdtv");
+addList("quality-archive", "1080p HD TV", "&archive=fullhdtv");
 addList("quality-archive", "720p Web-DL", "&archive=hdwebdl");
+addList("quality-archive", "1080p Web-DL", "&archive=fullhdwebdl");
 addList("quality-archive", "720p BluRay", "&archive=hdbluray");
 addList("quality-archive", "1080p BluRay", "&archive=fullhdbluray");
-addList("quality-archive", "Unknown", "&archive=unknown");
 endOptGroup("quality-archive");
 addOptGroup("quality-archive", "Random (Custom)");
 addList("quality-archive", "HD TV/1080p BluRay", "&archive=hdtv|fullhdbluray");

data/interfaces/default/comingEpisodes.tmpl

@@ -43,7 +43,7 @@
         return false;
     },
     format: function(s) {
-        return s.replace('hd',3).replace('sd',1).replace('any',0).replace('best',2).replace('custom',4); 
+        return s.replace('hd1080p',5).replace('hd720p',4).replace('hd',3).replace('sd',2).replace('any',1).replace('best',0).replace('custom',7);
     },
     type: 'numeric'
 });
@@ -132,7 +132,7 @@
     <span class="quality Custom">Custom</span>
 #end if
         </td>
-        <td align="center"><a href="http://www.thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://www.thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}"><img alt="[info]" height="16" width="16" src="$sbRoot/images/thetvdb16.png" /></a></td>
+        <td align="center"><a href="http://thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}"><img alt="[info]" height="16" width="16" src="$sbRoot/images/thetvdb16.png" /></a></td>
         <td align="center">
         <a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&amp;season=$cur_result["season"]&amp;episode=$cur_result["episode"]" title="Manual Search" id="forceUpdate-${cur_result["showid"]}" class="forceUpdate epSearch"><img alt="[search]" height="16" width="16" src="$sbRoot/images/search16.png" id="forceUpdateImage-${cur_result["showid"]}" /></a>
         </td>
@@ -228,7 +228,7 @@
             #end if            
             </a></span>
             <span class="tvshowTitleIcons">
-                <a href="http://www.thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://www.thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}"><img alt="[tvdb]" height="16" width="16" src="$sbRoot/images/thetvdb16.png" /></a>
+                <a href="http://thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}" onclick="window.open(this.href, '_blank'); return false;" title="http://thetvdb.com/?tab=series&amp;id=${cur_result["showid"]}"><img alt="[tvdb]" height="16" width="16" src="$sbRoot/images/thetvdb16.png" /></a>
                 <span><a href="$sbRoot/home/searchEpisode?show=${cur_result["showid"]}&amp;season=$cur_result["season"]&amp;episode=$cur_result["episode"]" title="Manual Search" id="forceUpdate-${cur_result["showid"]}" class="epSearch forceUpdate"><img alt="[search]" height="16" width="16" src="$sbRoot/images/search16.png" id="forceUpdateImage-${cur_result["showid"]}" /></a></span>
             </span>
           </th>