Commit 945ec1f9 authored by echel0n's avatar echel0n

Merge branch 'release/9.4.71'

parents 0583b271 b86d9d2e
# Changelog
- * 70c9691 - 2019-02-23: Release v9.4.70
- * ccafe85 - 2019-02-23: Release v9.4.71
- * 342b1de - 2019-02-23: Added ability to save `add_show_year` as a default option when adding new shows.
- * ea526d2 - 2019-02-23: Release v9.4.70
- * 2e4fa85 - 2019-02-23: Pre-Release v9.4.70.dev1
- * 4a8b635 - 2019-02-23: Fixed issue with sending direct messages via twitter API.
- * 502eb01 - 2019-02-23: Release v9.4.69
......
......@@ -118,6 +118,7 @@ class Config(object):
self.scene_default = False
self.anime_default = False
self.skip_downloaded_default = False
self.add_show_year_default = False
self.naming_multi_ep = False
self.naming_anime_multi_ep = False
self.naming_pattern = ""
......@@ -739,6 +740,7 @@ class Config(object):
'tv_download_dir': '',
'naming_custom_abd': False,
'skip_downloaded_default': False,
'add_show_year_default': False,
'naming_sports_pattern': '%SN - %A-D - %EN',
'create_missing_show_dirs': False,
'trash_rotate_logs': False,
......@@ -1452,6 +1454,7 @@ class Config(object):
self.anime_default = self.check_setting_bool('General', 'anime_default')
self.scene_default = self.check_setting_bool('General', 'scene_default')
self.skip_downloaded_default = self.check_setting_bool('General', 'skip_downloaded_default')
self.add_show_year_default = self.check_setting_bool('General', 'add_show_year_default')
self.naming_pattern = self.check_setting_str('General', 'naming_pattern')
self.naming_abd_pattern = self.check_setting_str('General', 'naming_abd_pattern')
self.naming_custom_abd = self.check_setting_bool('General', 'naming_custom_abd')
......@@ -1958,6 +1961,7 @@ class Config(object):
'anime_default': int(self.anime_default),
'scene_default': int(self.scene_default),
'skip_downloaded_default': int(self.skip_downloaded_default),
'add_show_year_default': int(self.add_show_year_default),
'enable_upnp': int(self.enable_upnp),
'version_notify': int(self.version_notify),
'auto_update': int(self.auto_update),
......
......@@ -2005,7 +2005,8 @@ class CMD_ShowAddNew(ApiCall):
self.skip_downloaded, args = self.check_params("skip_downloaded",
bool(sickrage.app.config.skip_downloaded_default), False, "bool",
[], *args, **kwargs)
self.add_show_year, args = self.check_params("add_show_year", False, False, "bool", [], *args, **kwargs)
self.add_show_year, args = self.check_params("add_show_year", bool(sickrage.app.config.add_show_year_default),
False, "bool", [], *args, **kwargs)
def run(self):
""" Add a new show to SiCKRAGE """
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -3745,7 +3745,8 @@ class ConfigGeneral(Config):
@staticmethod
def saveAddShowDefaults(defaultStatus, anyQualities, bestQualities, defaultFlattenFolders, subtitles=False,
anime=False, scene=False, defaultStatusAfter=WANTED, skip_downloaded=False):
anime=False, scene=False, defaultStatusAfter=WANTED, skip_downloaded=False,
add_show_year=False):
if anyQualities:
anyQualities = anyQualities.split(',')
......@@ -3770,6 +3771,7 @@ class ConfigGeneral(Config):
sickrage.app.config.anime_default = checkbox_to_value(anime)
sickrage.app.config.scene_default = checkbox_to_value(scene)
sickrage.app.config.skip_downloaded_default = checkbox_to_value(skip_downloaded)
sickrage.app.config.add_show_year_default = checkbox_to_value(add_show_year)
sickrage.app.config.save()
......
......@@ -70,7 +70,7 @@
<div class="col-lg-9 col-md-8 col-sm-7 component-desc">
<label>
<input type="checkbox" class="toggle color-primary is-material" name="add_show_year"
id="add_show_year" />
id="add_show_year" ${('', 'checked')[bool(sickrage.app.config.add_show_year_default)]} />
</label>
</div>
</div>
......
This diff is collapsed.
9.4.70
\ No newline at end of file
9.4.71
\ No newline at end of file
......@@ -2801,7 +2801,8 @@ $(document).ready(function ($) {
anime: $('#anime').prop('checked'),
scene: $('#scene').prop('checked'),
defaultStatusAfter: $('#statusSelectAfter').val(),
skip_downloaded: $('#skip_downloaded').prop('checked')
skip_downloaded: $('#skip_downloaded').prop('checked'),
add_show_year: $('#add_show_year').prop('checked')
});
$(this).attr('disabled', true);
......@@ -2809,7 +2810,7 @@ $(document).ready(function ($) {
SICKRAGE.notify('info', gt('Saved Defaults'), gt('Your "add show" defaults have been set to your current selections.'));
});
$('#statusSelect, #qualityPreset, #flatten_folders, #anyQualities, #bestQualities, #subtitles, #scene, #anime, #statusSelectAfter, #skip_downloaded').change(function () {
$('#statusSelect, #qualityPreset, #flatten_folders, #anyQualities, #bestQualities, #subtitles, #scene, #anime, #statusSelectAfter, #skip_downloaded', '#add_show_year').change(function () {
$('#saveDefaultsButton').attr('disabled', false);
});
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment