Browse Source

Move 'Use tags from indexer' to Specials

The user should always use this, there is no bad thing about it.
This cleans up the Switches page a bit. Eventually the option can just be completly removed.
pull/832/head
Safihre 8 years ago
parent
commit
dde5258b59
  1. 5
      interfaces/Config/templates/config_switches.tmpl
  2. 4
      sabnzbd/interface.py
  3. 2
      sabnzbd/skintext.py

5
interfaces/Config/templates/config_switches.tmpl

@ -269,11 +269,6 @@
</div>
<!--#end if#-->
<div class="field-pair">
<label class="config" for="enable_meta">$T('opt-enable_meta')</label>
<input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
<span class="desc">$T('explain-enable_meta')</span>
</div>
<div class="field-pair">
<button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
<button class="btn btn-default restoreDefaults"><span class="glyphicon glyphicon-asterisk"></span> $T('button-restoreDefaults')</button>
</div>

4
sabnzbd/interface.py

@ -1411,7 +1411,7 @@ SWITCH_LIST = \
'quota_size', 'quota_day', 'quota_resume', 'quota_period',
'pre_check', 'max_art_tries', 'max_art_opt', 'fail_hopeless_jobs', 'enable_all_par',
'enable_recursive', 'no_series_dupes', 'script_can_fail', 'new_nzb_on_failure',
'unwanted_extensions', 'action_on_unwanted_extensions', 'enable_meta', 'sanitize_safe',
'unwanted_extensions', 'action_on_unwanted_extensions', 'sanitize_safe',
'rating_enable', 'rating_host', 'rating_api_key', 'rating_feedback', 'rating_filter_enable',
'rating_filter_abort_audio', 'rating_filter_abort_video', 'rating_filter_abort_encrypted',
'rating_filter_abort_encrypted_confirm', 'rating_filter_abort_spam', 'rating_filter_abort_spam_confirm',
@ -1479,7 +1479,7 @@ class ConfigSwitches(object):
##############################################################################
SPECIAL_BOOL_LIST = \
('start_paused', 'no_penalties', 'ignore_wrong_unrar', 'create_group_folders',
('start_paused', 'no_penalties', 'ignore_wrong_unrar', 'create_group_folders', 'enable_meta',
'queue_complete_pers', 'quick_check', 'api_warnings', 'allow_64bit_tools', 'ampm',
'enable_unrar', 'enable_unzip', 'enable_7zip', 'enable_filejoin', 'enable_tsjoin',
'prospective_par_download', 'never_repair', 'allow_streaming', 'ignore_unrar_dates',

2
sabnzbd/skintext.py

@ -445,8 +445,6 @@ SKIN_TEXT = {
'explain-script_can_fail' : TT('When the user script returns a non-zero exit code, the job will be flagged as failed.'),
'opt-new_nzb_on_failure' : TT('On failure, try alternative NZB'),
'explain-new_nzb_on_failure' : TT('Some servers provide an alternative NZB when a download fails.'),
'opt-enable_meta' : TT('Use tags from indexer'),
'explain-enable_meta' : TT('Use tags from indexer for title, season, episode, etc. Otherwise all naming is derived from the NZB name.'),
'opt-folder_rename' : TT('Enable folder rename'),
'explain-folder_rename' : TT('Use temporary names during post processing. Disable when your system doesn\'t handle that properly.'),
'opt-pre_script' : TT('Pre-queue user script'),

Loading…
Cancel
Save