dockeruser
/
SickGear
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add option "Add paused" to Options/"More Options" at the final step of adding a show. 

Fix subtitles option and allow/block list at the final step of adding a show.
tags/release_0.25.1
JackDandy 4 years ago
parent
39b0611333
commit
5fb94ea72b
8 changed files with 145 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGES.md
  2. 14
      gui/slick/interfaces/default/inc_addShowOptions.tmpl
  3. 15
      gui/slick/js/addShowOptions.js
  4. 30
      sickbeard/__init__.py
  5. 63
      sickbeard/show_queue.py
  6. 10
      sickbeard/traktChecker.py
  7. 43
      sickbeard/webapi.py
  8. 80
      sickbeard/webserve.py

1
CHANGES.md
View File

@ -42,6 +42,7 @@
* Update urllib3 1.25.11 (00f1769) to 1.26.2 (eae04d6) * Update urllib3 1.25.11 (00f1769) to 1.26.2 (eae04d6)
* Add menu Shows/"Next Episode Cards" * Add menu Shows/"Next Episode Cards"
* Change improve SQL performance * Change improve SQL performance
* Add option "Add paused" to Options/"More Options" at the final step of adding a show
[develop changelog] [develop changelog]

14
gui/slick/interfaces/default/inc_addShowOptions.tmpl
View File

@ -65,6 +65,16 @@
<div id="options-addshow" style="display:none"> <div id="options-addshow" style="display:none">
<div class="field-pair alt" style="margin-top:10px"> <div class="field-pair alt" style="margin-top:10px">
<label for="pause">
<span class="component-title">Add paused</span>
<span class="component-desc">
<input class="cb" type="checkbox" name="pause" id="pause"#if $sg_var('PAUSE_DEFAULT') then $checked else ''#>
<p>pause search tasks to allow edits</p>
</span>
</label>
</div>
<div class="field-pair alt">
<label for="prune"> <label for="prune">
<span class="component-title">Keep up to</span> <span class="component-title">Keep up to</span>
<span class="component-desc"> <span class="component-desc">
@ -99,10 +109,10 @@
#if $sg_var('USE_SUBTITLES'): #if $sg_var('USE_SUBTITLES'):
<div class="field-pair alt"> <div class="field-pair alt">
<label for="subtitles"> <label for="subs">
<span class="component-title">Subtitles</span> <span class="component-title">Subtitles</span>
<span class="component-desc"> <span class="component-desc">
<input type="checkbox" name="subtitles" id="subtitles"#if $sg_var('SUBTITLES_DEFAULT') then $checked else ''# /> <input type="checkbox" name="subs" id="subs"#if $sg_var('SUBTITLES_DEFAULT') then $checked else ''# />
<p>download subtitles for this show</p> <p>download subtitles for this show</p>
</span> </span>
</label> </label>

15
gui/slick/js/addShowOptions.js
View File

@ -16,11 +16,12 @@ $(function(){
best_qualities: bestQualArray.join(','), best_qualities: bestQualArray.join(','),
default_wanted_begin: $('#wanted_begin').val(), default_wanted_begin: $('#wanted_begin').val(),
default_wanted_latest: $('#wanted_latest').val(), default_wanted_latest: $('#wanted_latest').val(),
default_flatten_folders: $('#flatten_folders').prop('checked'), default_tag: $('#tag').val(),
default_pause: $('#pause').prop('checked'),
default_scene: $('#scene').prop('checked'), default_scene: $('#scene').prop('checked'),
default_subtitles: $('#subtitles').prop('checked'), default_subtitles: $('#subs').prop('checked'),
default_anime: $('#anime').prop('checked'), default_flatten_folders: $('#flatten_folders').prop('checked'),
default_tag: $('#tag').val() default_anime: $('#anime').prop('checked')
}); });
new PNotify({ new PNotify({
@ -32,8 +33,8 @@ $(function(){
$(this).attr('disabled', true); $(this).attr('disabled', true);
}); });
$('#statusSelect, #quality-preset, #wanted-qualities, #upgrade-qualities, #wanted_begin, #wanted_latest,' $('#statusSelect, #quality-preset, #wanted-qualities, #upgrade-qualities, #wanted_begin, #wanted_latest, #tag,'
+ ' #flatten_folders, #scene, #subtitles, #anime, #tag').change(function() { + ' #pause, #scene, #subs, #flatten_folders, #anime').change(function() {
$('#saveDefaultsButton').attr('disabled', false); $('#saveDefaultsButton').attr('disabled', false);
}); });
@ -50,10 +51,12 @@ $(function(){
if ('none' === el$.css('display')){ if ('none' === el$.css('display')){
el$.fadeIn('fast', 'linear', function(){ el$.fadeIn('fast', 'linear', function(){
updateOptions(that$, 'More', 'Less'); updateOptions(that$, 'More', 'Less');
el$.css('opacity', 1);
}); });
} else { } else {
el$.fadeOut('fast', 'linear', function(){ el$.fadeOut('fast', 'linear', function(){
updateOptions(that$, 'Less', 'More'); updateOptions(that$, 'Less', 'More');
el$.css('opacity', 0);
}); });
} }
return !1; return !1;

30
sickbeard/__init__.py
View File

@ -212,15 +212,16 @@ METADATA_KODI = None
RESULTS_SORTBY = None RESULTS_SORTBY = None
TVINFO_DEFAULT = 0
TVINFO_TIMEOUT = 20
QUALITY_DEFAULT = SD QUALITY_DEFAULT = SD
STATUS_DEFAULT = SKIPPED
WANTED_BEGIN_DEFAULT = 0 WANTED_BEGIN_DEFAULT = 0
WANTED_LATEST_DEFAULT = 0 WANTED_LATEST_DEFAULT = 0
FLATTEN_FOLDERS_DEFAULT = False PAUSE_DEFAULT = False
SUBTITLES_DEFAULT = False STATUS_DEFAULT = SKIPPED
TVINFO_DEFAULT = 0
TVINFO_TIMEOUT = 20
SCENE_DEFAULT = False SCENE_DEFAULT = False
SUBTITLES_DEFAULT = False
FLATTEN_FOLDERS_DEFAULT = False
ANIME_DEFAULT = False ANIME_DEFAULT = False
USE_IMDB_INFO = True USE_IMDB_INFO = True
IMDB_ACCOUNTS = [] IMDB_ACCOUNTS = []
@ -659,8 +660,8 @@ def init_stage_1(console_logging):
# Add Show Search # Add Show Search
global RESULTS_SORTBY global RESULTS_SORTBY
# Add Show Defaults # Add Show Defaults
global STATUS_DEFAULT, QUALITY_DEFAULT, SHOW_TAG_DEFAULT, FLATTEN_FOLDERS_DEFAULT, SUBTITLES_DEFAULT, \ global QUALITY_DEFAULT, WANTED_BEGIN_DEFAULT, WANTED_LATEST_DEFAULT, SHOW_TAG_DEFAULT, PAUSE_DEFAULT, \
WANTED_BEGIN_DEFAULT, WANTED_LATEST_DEFAULT, SCENE_DEFAULT, ANIME_DEFAULT STATUS_DEFAULT, SCENE_DEFAULT, SUBTITLES_DEFAULT, FLATTEN_FOLDERS_DEFAULT, ANIME_DEFAULT
# Post processing # Post processing
global KEEP_PROCESSED_DIR, PROCESS_LAST_DIR, PROCESS_LAST_METHOD, PROCESS_LAST_CLEANUP global KEEP_PROCESSED_DIR, PROCESS_LAST_DIR, PROCESS_LAST_METHOD, PROCESS_LAST_CLEANUP
# Views # Views
@ -936,13 +937,15 @@ def init_stage_1(console_logging):
MIN_UPDATE_PACKAGES_INTERVAL, MIN_UPDATE_PACKAGES_INTERVAL,
check_setting_int(CFG, 'General', 'update_packages_interval', DEFAULT_UPDATE_PACKAGES_INTERVAL)) check_setting_int(CFG, 'General', 'update_packages_interval', DEFAULT_UPDATE_PACKAGES_INTERVAL))
FLATTEN_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'flatten_folders_default', 0))
TVINFO_DEFAULT = check_setting_int(CFG, 'General', 'indexer_default', 0) TVINFO_DEFAULT = check_setting_int(CFG, 'General', 'indexer_default', 0)
if TVINFO_DEFAULT and not TVInfoAPI(TVINFO_DEFAULT).config['active']: if TVINFO_DEFAULT and not TVInfoAPI(TVINFO_DEFAULT).config['active']:
TVINFO_DEFAULT = TVINFO_TVDB TVINFO_DEFAULT = TVINFO_TVDB
TVINFO_TIMEOUT = check_setting_int(CFG, 'General', 'indexer_timeout', 20) TVINFO_TIMEOUT = check_setting_int(CFG, 'General', 'indexer_timeout', 20)
ANIME_DEFAULT = bool(check_setting_int(CFG, 'General', 'anime_default', 0))
PAUSE_DEFAULT = bool(check_setting_int(CFG, 'General', 'pause default', 0))
SCENE_DEFAULT = bool(check_setting_int(CFG, 'General', 'scene_default', 0)) SCENE_DEFAULT = bool(check_setting_int(CFG, 'General', 'scene_default', 0))
FLATTEN_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'flatten_folders_default', 0))
ANIME_DEFAULT = bool(check_setting_int(CFG, 'General', 'anime_default', 0))
PROVIDER_ORDER = check_setting_str(CFG, 'General', 'provider_order', '').split() PROVIDER_ORDER = check_setting_str(CFG, 'General', 'provider_order', '').split()
PROVIDER_HOMES = sg_helpers.ast_eval(check_setting_str(CFG, 'General', 'provider_homes', None), {}) PROVIDER_HOMES = sg_helpers.ast_eval(check_setting_str(CFG, 'General', 'provider_homes', None), {})
@ -1864,15 +1867,16 @@ def save_config():
new_config['General']['backlog_nofull'] = int(BACKLOG_NOFULL) new_config['General']['backlog_nofull'] = int(BACKLOG_NOFULL)
new_config['General']['skip_removed_files'] = int(SKIP_REMOVED_FILES) new_config['General']['skip_removed_files'] = int(SKIP_REMOVED_FILES)
new_config['General']['results_sortby'] = str(RESULTS_SORTBY) new_config['General']['results_sortby'] = str(RESULTS_SORTBY)
new_config['General']['indexer_default'] = int(TVINFO_DEFAULT)
new_config['General']['indexer_timeout'] = int(TVINFO_TIMEOUT)
new_config['General']['quality_default'] = int(QUALITY_DEFAULT) new_config['General']['quality_default'] = int(QUALITY_DEFAULT)
new_config['General']['status_default'] = int(STATUS_DEFAULT)
new_config['General']['wanted_begin_default'] = int(WANTED_BEGIN_DEFAULT) new_config['General']['wanted_begin_default'] = int(WANTED_BEGIN_DEFAULT)
new_config['General']['wanted_latest_default'] = int(WANTED_LATEST_DEFAULT) new_config['General']['wanted_latest_default'] = int(WANTED_LATEST_DEFAULT)
new_config['General']['pause default'] = int(PAUSE_DEFAULT)
new_config['General']['status_default'] = int(STATUS_DEFAULT)
new_config['General']['scene_default'] = int(SCENE_DEFAULT)
new_config['General']['flatten_folders_default'] = int(FLATTEN_FOLDERS_DEFAULT) new_config['General']['flatten_folders_default'] = int(FLATTEN_FOLDERS_DEFAULT)
new_config['General']['indexer_default'] = int(TVINFO_DEFAULT)
new_config['General']['indexer_timeout'] = int(TVINFO_TIMEOUT)
new_config['General']['anime_default'] = int(ANIME_DEFAULT) new_config['General']['anime_default'] = int(ANIME_DEFAULT)
new_config['General']['scene_default'] = int(SCENE_DEFAULT)
new_config['General']['provider_order'] = ' '.join(PROVIDER_ORDER) new_config['General']['provider_order'] = ' '.join(PROVIDER_ORDER)
new_config['General']['provider_homes'] = '%s' % dict([(pid, v) for pid, v in list_items(PROVIDER_HOMES) if pid in [ new_config['General']['provider_homes'] = '%s' % dict([(pid, v) for pid, v in list_items(PROVIDER_HOMES) if pid in [
p.get_id() for p in [x for x in providers.sortedProviderList() if GenericProvider.TORRENT == x.providerType]]]) p.get_id() for p in [x for x in providers.sortedProviderList() if GenericProvider.TORRENT == x.providerType]]])

63
sickbeard/show_queue.py
View File

@ -343,10 +343,11 @@ class ShowQueue(generic_queue.GenericQueue):
return queue_item_obj return queue_item_obj
def addShow(self, tvid, prodid, show_dir, default_status=None, quality=None, flatten_folders=None, def add_show(self, tvid, prodid, show_dir,
lang='en', subtitles=None, anime=None, scene=None, paused=None, blocklist=None, allowlist=None, quality=None, upgrade_once=False, wanted_begin=None, wanted_latest=None, tag=None,
wanted_begin=None, wanted_latest=None, prune=None, tag=None, paused=None, prune=None, default_status=None, scene=None, subtitles=None,
new_show=False, show_name=None, upgrade_once=False): flatten_folders=None, anime=None, blocklist=None, allowlist=None,
show_name=None, new_show=False, lang='en'):
""" """
:param tvid: tvid :param tvid: tvid
@ -355,40 +356,40 @@ class ShowQueue(generic_queue.GenericQueue):
:type prodid: int or long :type prodid: int or long
:param show_dir: show dir :param show_dir: show dir
:type show_dir: AnyStr :type show_dir: AnyStr
:param default_status:
:type default_status: int or None
:param quality: :param quality:
:type quality: None or int :type quality: None or int
:param flatten_folders: :param upgrade_once:
:type flatten_folders: int or None :type upgrade_once: bool or None
:param lang: :param wanted_begin:
:type lang: AnyStr :type wanted_begin: int or None
:param wanted_latest:
:type wanted_latest: int or None
:param tag:
:type tag: AnyStr or None
:param paused:
:type paused: None or int
:param prune:
:type prune: int or None
:param default_status:
:type default_status: int or None
:param scene:
:type scene: int or None
:param subtitles: :param subtitles:
:type subtitles: int or None :type subtitles: int or None
:param flatten_folders:
:type flatten_folders: int or None
:param anime: :param anime:
:type anime: int or None :type anime: int or None
:param scene:
:type scene: int or None
:param paused:
:type paused: None or int
:param blocklist: :param blocklist:
:type blocklist: AnyStr or None :type blocklist: AnyStr or None
:param allowlist: :param allowlist:
:type allowlist: AnyStr or None :type allowlist: AnyStr or None
:param wanted_begin:
:type wanted_begin: int or None
:param wanted_latest:
:type wanted_latest: int or None
:param prune:
:type prune: int or None
:param tag:
:type tag: AnyStr or None
:param new_show:
:type new_show: AnyStr or None
:param show_name: :param show_name:
:type show_name: AnyStr or None :type show_name: AnyStr or None
:param upgrade_once: :param new_show:
:type upgrade_once: bool or None :type new_show: AnyStr or None
:param lang:
:type lang: AnyStr
:return: :return:
:rtype: QueueItemAdd :rtype: QueueItemAdd
""" """
@ -695,16 +696,16 @@ class QueueItemAdd(ShowQueueItem):
# set up initial values # set up initial values
self.show_obj.location = self.showDir self.show_obj.location = self.showDir
self.show_obj.subtitles = self.subtitles if None is not self.subtitles else sickbeard.SUBTITLES_DEFAULT
self.show_obj.quality = self.quality if self.quality else sickbeard.QUALITY_DEFAULT self.show_obj.quality = self.quality if self.quality else sickbeard.QUALITY_DEFAULT
self.show_obj.upgrade_once = self.upgrade_once self.show_obj.upgrade_once = self.upgrade_once
self.show_obj.tag = self.tag if None is not self.tag else 'Show List'
self.show_obj.paused = self.paused if None is not self.paused else sickbeard.PAUSE_DEFAULT
self.show_obj.prune = self.prune if None is not self.prune else 0
self.show_obj.scene = self.scene if None is not self.scene else sickbeard.SCENE_DEFAULT
self.show_obj.subtitles = self.subtitles if None is not self.subtitles else sickbeard.SUBTITLES_DEFAULT
self.show_obj.flatten_folders = self.flatten_folders if None is not self.flatten_folders \ self.show_obj.flatten_folders = self.flatten_folders if None is not self.flatten_folders \
else sickbeard.FLATTEN_FOLDERS_DEFAULT else sickbeard.FLATTEN_FOLDERS_DEFAULT
self.show_obj.anime = self.anime if None is not self.anime else sickbeard.ANIME_DEFAULT self.show_obj.anime = self.anime if None is not self.anime else sickbeard.ANIME_DEFAULT
self.show_obj.scene = self.scene if None is not self.scene else sickbeard.SCENE_DEFAULT
self.show_obj.paused = self.paused if None is not self.paused else False
self.show_obj.prune = self.prune if None is not self.prune else 0
self.show_obj.tag = self.tag if None is not self.tag else 'Show List'
if self.show_obj.anime: if self.show_obj.anime:
self.show_obj.release_groups = AniGroupList(self.show_obj.tvid, self.show_obj.release_groups = AniGroupList(self.show_obj.tvid,

10
sickbeard/traktChecker.py
View File

@ -184,10 +184,12 @@ class TraktChecker(object):
else: else:
helpers.chmod_as_parent(showPath) helpers.chmod_as_parent(showPath)
sickbeard.show_queue_scheduler.action.addShow(int(tvid), int(prod_id), showPath, status, sickbeard.show_queue_scheduler.action.add_show(
int(sickbeard.QUALITY_DEFAULT), int(tvid), int(prod_id), showPath,
int(sickbeard.FLATTEN_FOLDERS_DEFAULT), quality=int(sickbeard.QUALITY_DEFAULT),
paused=sickbeard.TRAKT_START_PAUSED) paused=sickbeard.TRAKT_START_PAUSED, default_status=status,
flatten_folders=int(sickbeard.FLATTEN_FOLDERS_DEFAULT)
)
else: else:
logger.log(u"There was an error creating the show, no root directory setting found", logger.ERROR) logger.log(u"There was an error creating the show, no root directory setting found", logger.ERROR)
return return

43
sickbeard/webapi.py
View File

@ -3306,8 +3306,9 @@ class CMD_SickGearShowAddExisting(ApiCall):
"optionalParameters": {"initial": {"desc": "initial quality for the show"}, "optionalParameters": {"initial": {"desc": "initial quality for the show"},
"archive": {"desc": "archive quality for the show"}, "archive": {"desc": "archive quality for the show"},
"upgrade_once": {"desc": "upgrade only once"}, "upgrade_once": {"desc": "upgrade only once"},
"flatten_folders": {"desc": "flatten subfolders for the show"}, "pause": {"desc": "pause show search tasks to allow edits"},
"subtitles": {"desc": "allow search episode subtitle"} "subtitles": {"desc": "allow search episode subtitle"},
"flatten_folders": {"desc": "flatten subfolders for the show"}
} }
} }
@ -3322,6 +3323,7 @@ class CMD_SickGearShowAddExisting(ApiCall):
self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map]) self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map])
self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", []) self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", [])
self.pause, args = self.check_params(args, kwargs, "pause", int(sickbeard.PAUSE_DEFAULT), False, "int", [])
self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders", self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders",
str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", []) str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
self.subtitles, args = self.check_params(args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int", self.subtitles, args = self.check_params(args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int",
@ -3379,9 +3381,11 @@ class CMD_SickGearShowAddExisting(ApiCall):
if iqualityID or aqualityID: if iqualityID or aqualityID:
newQuality = Quality.combineQualities(iqualityID, aqualityID) newQuality = Quality.combineQualities(iqualityID, aqualityID)
sickbeard.show_queue_scheduler.action.addShow(int(self.tvid), int(self.prodid), self.location, SKIPPED, sickbeard.show_queue_scheduler.action.add_show(
newQuality, int(self.flatten_folders), int(self.tvid), int(self.prodid), self.location,
upgrade_once=self.upgradeonce) quality=newQuality, upgrade_once=self.upgradeonce,
paused=self.pause, default_status=SKIPPED, flatten_folders=int(self.flatten_folders)
)
return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added") return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added")
@ -3436,14 +3440,15 @@ class CMD_SickGearShowAddNew(ApiCall):
self.initial, args = self.check_params(args, kwargs, "initial", None, False, "list", [q for q in quality_map]) self.initial, args = self.check_params(args, kwargs, "initial", None, False, "list", [q for q in quality_map])
self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map]) self.archive, args = self.check_params(args, kwargs, "archive", None, False, "list", [q for q in quality_map])
self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", []) self.upgradeonce, args = self.check_params(args, kwargs, "upgrade_once", False, False, "bool", [])
self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders", self.pause, args = self.check_params(args, kwargs, "pause", int(sickbeard.PAUSE_DEFAULT), False, "int", [])
str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
self.status, args = self.check_params(args, kwargs, "status", None, False, "string", self.status, args = self.check_params(args, kwargs, "status", None, False, "string",
["wanted", "skipped", "archived", "ignored"]) ["wanted", "skipped", "archived", "ignored"])
self.scene, args = self.check_params(args, kwargs, "scene", int(sickbeard.SCENE_DEFAULT), False, "int", [])
self.subtitles, args = self.check_params( self.subtitles, args = self.check_params(
args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int", []) args, kwargs, "subtitles", int(sickbeard.USE_SUBTITLES), False, "int", [])
self.flatten_folders, args = self.check_params(args, kwargs, "flatten_folders",
str(sickbeard.FLATTEN_FOLDERS_DEFAULT), False, "bool", [])
self.anime, args = self.check_params(args, kwargs, "anime", int(sickbeard.ANIME_DEFAULT), False, "int", []) self.anime, args = self.check_params(args, kwargs, "anime", int(sickbeard.ANIME_DEFAULT), False, "int", [])
self.scene, args = self.check_params(args, kwargs, "scene", int(sickbeard.SCENE_DEFAULT), False, "int", [])
self.lang = 'en' self.lang = 'en'
# super, missing, help # super, missing, help
@ -3539,10 +3544,13 @@ class CMD_SickGearShowAddNew(ApiCall):
else: else:
helpers.chmod_as_parent(showPath) helpers.chmod_as_parent(showPath)
sickbeard.show_queue_scheduler.action.addShow(int(self.tvid), int(self.prodid), showPath, newStatus, sickbeard.show_queue_scheduler.action.add_show(
newQuality, int(self.tvid), int(self.prodid), showPath,
int(self.flatten_folders), self.lang, self.subtitles, self.anime, quality=newQuality, upgrade_once=self.upgradeonce,
self.scene, new_show=True, upgrade_once=self.upgradeonce) paused=self.pause, default_status=newStatus, scene=self.scene, subtitles=self.subtitles,
flatten_folders=int(self.flatten_folders), anime=self.anime,
new_show=True, lang=self.lang
)
return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added") return _responds(RESULT_SUCCESS, {"name": indexerName}, indexerName + " has been queued to be added")
@ -3551,15 +3559,16 @@ class CMD_ShowAddNew(CMD_SickGearShowAddNew):
_help = {"desc": "add a new show to sickgear", _help = {"desc": "add a new show to sickgear",
"requiredParameters": {"tvdbid": {"desc": "thetvdb.com id"} "requiredParameters": {"tvdbid": {"desc": "thetvdb.com id"}
}, },
"optionalParameters": {"initial": {"desc": "initial quality for the show"}, "optionalParameters": {"location": {"desc": "base path for where the show folder is to be created"},
"location": {"desc": "base path for where the show folder is to be created"}, "initial": {"desc": "initial quality for the show"},
"archive": {"desc": "archive quality for the show"}, "archive": {"desc": "archive quality for the show"},
"flatten_folders": {"desc": "flatten subfolders for the show"}, "pause": {"desc": "pause show search tasks to allow edits"},
"status": {"desc": "status of missing episodes"}, "status": {"desc": "status of missing episodes"},
"lang": {"desc": "the 2 letter lang abbreviation id"}, "scene": {"desc": "show searches episodes by scene numbering"},
"subtitles": {"desc": "allow search episode subtitle"}, "subtitles": {"desc": "allow search episode subtitle"},
"flatten_folders": {"desc": "flatten subfolders for the show"},
"anime": {"desc": "set show to anime"}, "anime": {"desc": "set show to anime"},
"scene": {"desc": "show searches episodes by scene numbering"} "lang": {"desc": "the 2 letter lang abbreviation id"}
}, },
"SickGearCommand": "sg.show.addnew", "SickGearCommand": "sg.show.addnew",
} }

80
sickbeard/webserve.py
View File

@ -5149,12 +5149,13 @@ class AddShows(Home):
return t.respond() return t.respond()
def add_new_show(self, which_series=None, tvinfo_lang='en', root_dir=None, default_status=None, def add_new_show(self, root_dir=None, full_show_path=None, which_series=None, provided_tvid=None, tvinfo_lang='en',
other_shows=None, skip_show=None,
quality_preset=None, any_qualities=None, best_qualities=None, upgrade_once=None, quality_preset=None, any_qualities=None, best_qualities=None, upgrade_once=None,
flatten_folders=None, subs=None, wanted_begin=None, wanted_latest=None, tag=None,
full_show_path=None, other_shows=None, skip_show=None, provided_tvid=None, anime=None, pause=None, prune=None, default_status=None, scene=None, subs=None, flatten_folders=None,
scene=None, allowlist=None, blocklist=None, wanted_begin=None, wanted_latest=None, anime=None, allowlist=None, blocklist=None,
prune=None, tag=None, return_to=None, cancel_form=None, **kwargs): return_to=None, cancel_form=None, **kwargs):
""" """
Receive tvdb id, dir, and other options and create a show from them. If extra show dirs are Receive tvdb id, dir, and other options and create a show from them. If extra show dirs are
provided then it forwards back to new_show, if not it goes to /home. provided then it forwards back to new_show, if not it goes to /home.
@ -5231,26 +5232,14 @@ class AddShows(Home):
if sickbeard.ADD_SHOWS_WO_DIR: if sickbeard.ADD_SHOWS_WO_DIR:
logger.log(u'Skipping initial creation due to config.ini setting (add_shows_wo_dir)') logger.log(u'Skipping initial creation due to config.ini setting (add_shows_wo_dir)')
else: else:
dir_exists = helpers.make_dir(show_dir) if not helpers.make_dir(show_dir):
if not dir_exists:
logger.log(u'Unable to add show because can\'t create folder: ' + show_dir, logger.ERROR) logger.log(u'Unable to add show because can\'t create folder: ' + show_dir, logger.ERROR)
ui.notifications.error('Unable to add show', u'Can\'t create folder: ' + show_dir) ui.notifications.error('Unable to add show', u'Can\'t create folder: ' + show_dir)
return self.redirect('/home/') return self.redirect('/home/')
else: helpers.chmod_as_parent(show_dir)
helpers.chmod_as_parent(show_dir)
# prepare the inputs for passing along # prepare the inputs for passing along
scene = config.checkbox_to_value(scene)
anime = config.checkbox_to_value(anime)
flatten_folders = config.checkbox_to_value(flatten_folders)
subs = config.checkbox_to_value(subs)
if allowlist:
allowlist = short_group_names(allowlist)
if blocklist:
blocklist = short_group_names(blocklist)
if not any_qualities: if not any_qualities:
any_qualities = [] any_qualities = []
if not best_qualities or int(quality_preset): if not best_qualities or int(quality_preset):
@ -5259,19 +5248,33 @@ class AddShows(Home):
any_qualities = [any_qualities] any_qualities = [any_qualities]
if type(best_qualities) != list: if type(best_qualities) != list:
best_qualities = [best_qualities] best_qualities = [best_qualities]
newQuality = Quality.combineQualities(map_list(int, any_qualities), map_list(int, best_qualities)) new_quality = Quality.combineQualities(map_list(int, any_qualities), map_list(int, best_qualities))
upgrade_once = config.checkbox_to_value(upgrade_once) upgrade_once = config.checkbox_to_value(upgrade_once)
wanted_begin = config.minimax(wanted_begin, 0, -1, 10) wanted_begin = config.minimax(wanted_begin, 0, -1, 10)
wanted_latest = config.minimax(wanted_latest, 0, -1, 10) wanted_latest = config.minimax(wanted_latest, 0, -1, 10)
prune = config.minimax(prune, 0, 0, 9999) prune = config.minimax(prune, 0, 0, 9999)
pause = config.checkbox_to_value(pause)
scene = config.checkbox_to_value(scene)
subs = config.checkbox_to_value(subs)
flatten_folders = config.checkbox_to_value(flatten_folders)
anime = config.checkbox_to_value(anime)
if allowlist:
allowlist = short_group_names(allowlist)
if blocklist:
blocklist = short_group_names(blocklist)
# add the show # add the show
sickbeard.show_queue_scheduler.action.addShow(tvid, prodid, show_dir, int(default_status), newQuality, sickbeard.show_queue_scheduler.action.add_show(
flatten_folders, tvinfo_lang, subs, anime, tvid, prodid, show_dir,
scene, None, allowlist, blocklist, quality=new_quality, upgrade_once=upgrade_once,
wanted_begin, wanted_latest, prune, tag, new_show=new_show, wanted_begin=wanted_begin, wanted_latest=wanted_latest, tag=tag,
show_name=show_name, upgrade_once=upgrade_once) paused=pause, prune=prune, default_status=int(default_status), scene=scene, subtitles=subs,
flatten_folders=flatten_folders, anime=anime, allowlist=allowlist, blocklist=blocklist,
show_name=show_name, new_show=new_show, lang=tvinfo_lang
)
# ui.notifications.message('Show added', 'Adding the specified show into ' + show_dir) # ui.notifications.message('Show added', 'Adding the specified show into ' + show_dir)
return finish_add_show() return finish_add_show()
@ -5337,14 +5340,14 @@ class AddShows(Home):
if None is not tvid and None is not prodid: if None is not tvid and None is not prodid:
# add the show # add the show
sickbeard.show_queue_scheduler.action.addShow(tvid, prodid, show_dir, sickbeard.show_queue_scheduler.action.add_show(
default_status=sickbeard.STATUS_DEFAULT, tvid, prodid, show_dir,
quality=sickbeard.QUALITY_DEFAULT, quality=sickbeard.QUALITY_DEFAULT,
flatten_folders=sickbeard.FLATTEN_FOLDERS_DEFAULT, paused=sickbeard.PAUSE_DEFAULT, default_status=sickbeard.STATUS_DEFAULT,
subtitles=sickbeard.SUBTITLES_DEFAULT, scene=sickbeard.SCENE_DEFAULT, subtitles=sickbeard.SUBTITLES_DEFAULT,
anime=sickbeard.ANIME_DEFAULT, flatten_folders=sickbeard.FLATTEN_FOLDERS_DEFAULT, anime=sickbeard.ANIME_DEFAULT,
scene=sickbeard.SCENE_DEFAULT, show_name=show_name
show_name=show_name) )
num_added += 1 num_added += 1
if num_added: if num_added:
@ -7079,21 +7082,22 @@ class ConfigGeneral(Config):
@staticmethod @staticmethod
def save_add_show_defaults(default_status, any_qualities='', best_qualities='', default_wanted_begin=None, def save_add_show_defaults(default_status, any_qualities='', best_qualities='', default_wanted_begin=None,
default_wanted_latest=None, default_flatten_folders=False, default_scene=False, default_wanted_latest=None, default_flatten_folders=False, default_scene=False,
default_subtitles=False, default_anime=False, default_tag=''): default_subs=False, default_anime=False, default_pause=False, default_tag=''):
any_qualities = ([], any_qualities.split(','))[any(any_qualities)] any_qualities = ([], any_qualities.split(','))[any(any_qualities)]
best_qualities = ([], best_qualities.split(','))[any(best_qualities)] best_qualities = ([], best_qualities.split(','))[any(best_qualities)]
sickbeard.STATUS_DEFAULT = int(default_status)
sickbeard.QUALITY_DEFAULT = int(Quality.combineQualities(map_list(int, any_qualities), sickbeard.QUALITY_DEFAULT = int(Quality.combineQualities(map_list(int, any_qualities),
map_list(int, best_qualities))) map_list(int, best_qualities)))
sickbeard.WANTED_BEGIN_DEFAULT = config.minimax(default_wanted_begin, 0, -1, 10) sickbeard.WANTED_BEGIN_DEFAULT = config.minimax(default_wanted_begin, 0, -1, 10)
sickbeard.WANTED_LATEST_DEFAULT = config.minimax(default_wanted_latest, 0, -1, 10) sickbeard.WANTED_LATEST_DEFAULT = config.minimax(default_wanted_latest, 0, -1, 10)
sickbeard.FLATTEN_FOLDERS_DEFAULT = config.checkbox_to_value(default_flatten_folders) sickbeard.SHOW_TAG_DEFAULT = default_tag
sickbeard.PAUSE_DEFAULT = config.checkbox_to_value(default_pause)
sickbeard.STATUS_DEFAULT = int(default_status)
sickbeard.SCENE_DEFAULT = config.checkbox_to_value(default_scene) sickbeard.SCENE_DEFAULT = config.checkbox_to_value(default_scene)
sickbeard.SUBTITLES_DEFAULT = config.checkbox_to_value(default_subtitles) sickbeard.SUBTITLES_DEFAULT = config.checkbox_to_value(default_subs)
sickbeard.FLATTEN_FOLDERS_DEFAULT = config.checkbox_to_value(default_flatten_folders)
sickbeard.ANIME_DEFAULT = config.checkbox_to_value(default_anime) sickbeard.ANIME_DEFAULT = config.checkbox_to_value(default_anime)
sickbeard.SHOW_TAG_DEFAULT = default_tag
sickbeard.save_config() sickbeard.save_config()

Write Preview
Loading…
Cancel
Save