mirror of
https://github.com/SickGear/SickGear.git
synced 2024-12-03 01:43:37 +00:00
Merge branch 'feature/AddAnimeTreatAsHDTV' into develop
This commit is contained in:
JackDandy
commit
f1de451516
5 changed files with 59 additions and 33 deletions
16
CHANGES.md
16
CHANGES.md
|
|
@ -1,20 +1,24 @@
|
|||
### 0.x.x (2014-11-xx xx:xx:xx UTC)
|
||||
|
||||
* Change footer stats to not add newlines when copy/pasting from them
|
||||
* Remove redundant references from Config / Help & Info
|
||||
* Remove redundant references from Config/Help & Info
|
||||
* Fix poster preview on small poster layout
|
||||
* Change overhaul Config Anime to be in line with General Configuration
|
||||
* Change overhaul Config/Anime to be in line with General Configuration
|
||||
* Remove output of source code line when warnings highlight libraries not used with IMDb
|
||||
* Add dropdown on Add Trending Shows to display all shows, shows not in library, or shows in library
|
||||
* Change Help and Info icon sprites to color and text of Arguments if unused
|
||||
* Change sharper looking heart image on the Add Show page
|
||||
* Change Add Show on Add Trending Show Page to use the full Add New Show flow
|
||||
* Change Add Show on Add Trending Show page to use the full Add New Show flow
|
||||
* Fix adding shows with titles that contain "&" on Add Trending Show page
|
||||
* Fix unset vars on Add New Shows Page used in the Add Existing Shows context
|
||||
* Fix unset vars on Add New Shows page used in the Add Existing Shows context
|
||||
* Remove unneeded datetime convert from Coming Episodes page
|
||||
* Fix the log output of the limited backlog search for episodes missed
|
||||
* Remove unsupported t411 provider
|
||||
* Remove obsolete Animezb provider
|
||||
* Remove unsupported t411 search provider
|
||||
* Remove obsolete Animezb search provider
|
||||
* Add option to treat anime releases that lack a quality tag as HDTV instead of "unknown"
|
||||
|
||||
[develop changelog]
|
||||
* Change descriptions and layout on Config/Anime page
|
||||
|
||||
|
||||
### 0.3.0 (2014-11-12 14:30:00 UTC)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#from sickbeard.helpers import anon_url
|
||||
|
||||
#set global $title = 'Config - Anime'
|
||||
#set global $header = 'Anime Configuration'
|
||||
#set global $header = 'Anime'
|
||||
|
||||
#set global $sbPath = '../..'
|
||||
|
||||
|
|
@ -25,16 +25,48 @@
|
|||
<div id="config-components">
|
||||
|
||||
<ul>
|
||||
<li><a href="#core-component-group1">AniDB Settings</a></li>
|
||||
<li><a href="#core-component-group1">Anime Settings</a></li>
|
||||
</ul>
|
||||
|
||||
<div id="core-component-group1">
|
||||
<div class="component-group">
|
||||
|
||||
<div class="component-group-desc">
|
||||
<h3>Misc</h3>
|
||||
<p>User interface and general configuration.</p>
|
||||
</div>
|
||||
|
||||
<fieldset class="component-group-list">
|
||||
<div class="field-pair">
|
||||
<label for="split_home">
|
||||
<span class="component-title">Split show lists</span>
|
||||
<span class="component-desc">
|
||||
<input type="checkbox" class="enabler" name="split_home" id="split_home" #if $sickbeard.ANIME_SPLIT_HOME then 'checked="checked"' else ""# />
|
||||
<p>separate anime from other shows on the home page</p>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="field-pair">
|
||||
<label for="anime_treat_as_hdtv">
|
||||
<span class="component-title">Quality control</span>
|
||||
<span class="component-desc">
|
||||
<input type="checkbox" class="enabler" name="anime_treat_as_hdtv" id="anime_treat_as_hdtv" #if $sickbeard.ANIME_TREAT_AS_HDTV then 'checked="checked"' else ""# />
|
||||
<p>treat anime releases that lack a quality tag as HDTV instead of "unknown". This may improve snatch success</p>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn config_submitter" value="Save Changes" />
|
||||
</fieldset>
|
||||
</div><!-- /component-group //-->
|
||||
|
||||
<div class="component-group">
|
||||
|
||||
<div class="component-group-desc">
|
||||
<img class="notifier-icon" src="$sbRoot/images/providers/anidb.gif" alt="AniDB" title="AniDB" width="24" height="24" />
|
||||
<h3><a href="<%= anon_url('http://anidb.info') %>" onclick="window.open(this.href, '_blank'); return false;">AniDB</a></h3>
|
||||
<p>Keep track of your anime downloads with AniDB</p>
|
||||
<p>Manage anime releases with AniDB.</p>
|
||||
</div>
|
||||
|
||||
<fieldset class="component-group-list">
|
||||
|
|
@ -43,7 +75,7 @@
|
|||
<span class="component-title">Enable</span>
|
||||
<span class="component-desc">
|
||||
<input type="checkbox" class="enabler" name="use_anidb" id="use_anidb" #if $sickbeard.USE_ANIDB then 'checked="checked"' else ""# />
|
||||
<p>use data from AniDB</p>
|
||||
<p>fetch data for scene exceptions (alternative release names) and available 'release groups' per show</p>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
|
@ -82,27 +114,6 @@
|
|||
</fieldset>
|
||||
</div><!-- /component-group //-->
|
||||
|
||||
<div class="component-group">
|
||||
|
||||
<div class="component-group-desc">
|
||||
<h3>User Interface</h3>
|
||||
<p>Change how anime appears on the home page.</p>
|
||||
</div>
|
||||
|
||||
<fieldset class="component-group-list">
|
||||
<div class="field-pair">
|
||||
<label for="split_home">
|
||||
<span class="component-title">Split show lists</span>
|
||||
<span class="component-desc">
|
||||
<input type="checkbox" class="enabler" name="split_home" id="split_home" #if $sickbeard.ANIME_SPLIT_HOME then 'checked="checked"' else ""# />
|
||||
<p>separate anime from other shows on the home page</p>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<input type="submit" class="btn config_submitter" value="Save Changes" />
|
||||
</fieldset>
|
||||
</div><!-- /component-group //-->
|
||||
</div><!-- /component-group1 //-->
|
||||
|
||||
<br/><input type="submit" class="btn config_submitter" value="Save Changes" /><br/>
|
||||
|
|
|
|||
|
|
@ -346,6 +346,7 @@ ANIDB_PASSWORD = None
|
|||
ANIDB_USE_MYLIST = False
|
||||
ADBA_CONNECTION = None
|
||||
ANIME_SPLIT_HOME = False
|
||||
ANIME_TREAT_AS_HDTV = False
|
||||
|
||||
USE_SYNOINDEX = False
|
||||
|
||||
|
|
@ -504,7 +505,7 @@ def initialize(consoleLogging=True):
|
|||
USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, DEBUG, PROXY_SETTING, PROXY_INDEXERS, \
|
||||
AUTOPOSTPROCESSER_FREQUENCY, DEFAULT_AUTOPOSTPROCESSER_FREQUENCY, MIN_AUTOPOSTPROCESSER_FREQUENCY, \
|
||||
ANIME_DEFAULT, NAMING_ANIME, ANIMESUPPORT, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST, \
|
||||
ANIME_SPLIT_HOME, SCENE_DEFAULT, BACKLOG_DAYS
|
||||
ANIME_SPLIT_HOME, SCENE_DEFAULT, BACKLOG_DAYS, ANIME_TREAT_AS_HDTV
|
||||
|
||||
if __INITIALIZED__:
|
||||
return False
|
||||
|
|
@ -928,6 +929,7 @@ def initialize(consoleLogging=True):
|
|||
ANIDB_USE_MYLIST = bool(check_setting_int(CFG, 'ANIDB', 'anidb_use_mylist', 0))
|
||||
|
||||
ANIME_SPLIT_HOME = bool(check_setting_int(CFG, 'ANIME', 'anime_split_home', 0))
|
||||
ANIME_TREAT_AS_HDTV = bool(check_setting_int(CFG, 'ANIME', 'anime_treat_as_hdtv', 0))
|
||||
|
||||
METADATA_XBMC = check_setting_str(CFG, 'General', 'metadata_xbmc', '0|0|0|0|0|0|0|0|0|0')
|
||||
METADATA_XBMC_12PLUS = check_setting_str(CFG, 'General', 'metadata_xbmc_12plus', '0|0|0|0|0|0|0|0|0|0')
|
||||
|
|
@ -1794,6 +1796,7 @@ def save_config():
|
|||
|
||||
new_config['ANIME'] = {}
|
||||
new_config['ANIME']['anime_split_home'] = int(ANIME_SPLIT_HOME)
|
||||
new_config['ANIME']['anime_treat_as_hdtv'] = int(ANIME_TREAT_AS_HDTV)
|
||||
|
||||
new_config.write()
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ import platform
|
|||
import re
|
||||
import uuid
|
||||
|
||||
import logger
|
||||
import sickbeard
|
||||
|
||||
INSTANCE_ID = str(uuid.uuid1())
|
||||
USER_AGENT = ('SickGear/(' + platform.system() + '; ' + platform.release() + '; ' + INSTANCE_ID + ')')
|
||||
|
||||
|
|
@ -202,6 +205,10 @@ class Quality:
|
|||
return Quality.HDBLURAY
|
||||
elif blueRayOptions and fullHD and not hdOptions:
|
||||
return Quality.FULLHDBLURAY
|
||||
elif sickbeard.ANIME_TREAT_AS_HDTV:
|
||||
logger.log(u'Treating file: ' + name + ' with "unknown" quality as HDTV per user settings',
|
||||
logger.DEBUG)
|
||||
return Quality.HDTV
|
||||
else:
|
||||
return Quality.UNKNOWN
|
||||
|
||||
|
|
|
|||
|
|
@ -2642,7 +2642,7 @@ class ConfigAnime(MainHandler):
|
|||
|
||||
|
||||
def saveAnime(self, use_anidb=None, anidb_username=None, anidb_password=None, anidb_use_mylist=None,
|
||||
split_home=None):
|
||||
split_home=None, anime_treat_as_hdtv=None):
|
||||
|
||||
results = []
|
||||
|
||||
|
|
@ -2651,6 +2651,7 @@ class ConfigAnime(MainHandler):
|
|||
sickbeard.ANIDB_PASSWORD = anidb_password
|
||||
sickbeard.ANIDB_USE_MYLIST = config.checkbox_to_value(anidb_use_mylist)
|
||||
sickbeard.ANIME_SPLIT_HOME = config.checkbox_to_value(split_home)
|
||||
sickbeard.ANIME_TREAT_AS_HDTV = config.checkbox_to_value(anime_treat_as_hdtv)
|
||||
|
||||
sickbeard.save_config()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue