Remove "fail_on_crc" option and move "overwrite_files" from Special to Switches.

interfaces/Config/templates/config_switches.tmpl

@@ -205,20 +205,20 @@
                     <span class="desc">$T('explain-flat_unpack')</span>
                 </div>
                 <div class="field-pair alt">
+                    <label class="config" for="overwrite_files">$T('opt-overwrite_files')</label>
+                    <input type="checkbox" name="overwrite_files" id="overwrite_files" value="1" <!--#if int($overwrite_files) > 0 then 'checked="checked"' else ""#--> />
+                    <span class="desc">$T('explain-overwrite_files')</span>
+                </div>
+                <div class="field-pair">
                     <label class="config" for="enable_filejoin">$T('opt-enable_filejoin')</label>
                     <input type="checkbox" name="enable_filejoin" id="enable_filejoin" value="1" <!--#if int($enable_filejoin) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-enable_filejoin')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair alt">
                     <label class="config" for="enable_tsjoin">$T('opt-enable_tsjoin')</label>
                     <input type="checkbox" name="enable_tsjoin" id="enable_tsjoin" value="1" <!--#if int($enable_tsjoin) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-ts_join')</span>
                 </div>
-                <div class="field-pair alt">
-                    <label class="config" for="fail_on_crc">$T('opt-fail_on_crc')</label>
-                    <input type="checkbox" name="fail_on_crc" id="fail_on_crc" value="1" <!--#if int($fail_on_crc) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-fail_on_crc')</span>
-                </div>
                 <div class="field-pair">
                     <label class="config" for="safe_postproc">$T('opt-safe_postproc')</label>
                     <input type="checkbox" name="safe_postproc" id="safe_postproc" value="1" <!--#if int($safe_postproc) > 0 then 'checked="checked"' else ""#--> />
@@ -254,7 +254,7 @@
                     <input type="text" name="ionice" id="ionice" value="$ionice" size="20" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
                     <span class="desc">$T('explain-ionice')</span>
                 </div>
-                <div class="field-pair alt">
+                <div class="field-pair">
                     <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
                     <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list" size="50"/>
                     <span class="desc">$T('explain-cleanup_list')</span>

interfaces/Plush/templates/config_switches.tmpl

@@ -222,10 +222,10 @@
         </label>
       </div>
       <div class="field-pair alt">
-        <input type="checkbox" name="fail_on_crc" id="fail_on_crc" value="1" <!--#if $fail_on_crc > 0 then "checked=1" else ""#--> />
-        <label class="clearfix" for="fail_on_crc">
-          <span class="component-title">$T('opt-fail_on_crc')</span>
-          <span class="component-desc">$T('explain-fail_on_crc')</span>
+        <input type="checkbox" name="overwrite_files" id="overwrite_files" value="1" <!--#if $overwrite_files > 0 then "checked=1" else ""#--> />
+        <label class="clearfix" for="overwrite_files">
+          <span class="component-title">$T('opt-overwrite_files')</span>
+          <span class="component-desc">$T('explain-overwrite_files')</span>
         </label>
       </div>
       <div class="field-pair">

interfaces/smpl/templates/config_switches.tmpl

@@ -53,9 +53,9 @@
   <span class="tips">$T('explain-flat_unpack')</span></label>
 <br class="clear" />
 
-  <label><span class="label">$T('opt-fail_on_crc'):</span>
-  <input class="radio" type="checkbox" name="fail_on_crc" value="1" <!--#if $fail_on_crc > 0 then 'checked="1"' else ""#--> />
-  <span class="tips">$T('explain-fail_on_crc')</span></label>
+  <label><span class="label">$T('opt-overwrite_files'):</span>
+  <input class="radio" type="checkbox" name="overwrite_files" value="1" <!--#if $overwrite_files > 0 then 'checked="1"' else ""#--> />
+  <span class="tips">$T('explain-overwrite_files')</span></label>
 <br class="clear" />
 
   <label><span class="label">$T('opt-top_only'):</span>

sabnzbd/cfg.py

@@ -65,7 +65,6 @@ else:
 # Configuration instances
 #
 quick_check = OptionBool('misc', 'quick_check', True)
-fail_on_crc = OptionBool('misc', 'fail_on_crc', True)
 sfv_check = OptionBool('misc', 'sfv_check', True)
 
 email_server  = OptionStr('misc', 'email_server', validation=validate_server)

sabnzbd/decoder.py

@@ -122,12 +122,6 @@ class Decoder(Thread):
 
                     data = e.data
 
-                    if cfg.fail_on_crc():
-                        new_server_found = self.__search_new_server(article)
-                        if new_server_found:
-                            register = False
-                            logme = None
-
                 except BadYenc:
                     # Handles precheck and badly formed articles
                     killed = False

sabnzbd/interface.py

@@ -1183,7 +1183,7 @@ class ConfigFolders(object):
 
 SWITCH_LIST = \
             ('par2_multicore', 'par_option', 'enable_unrar', 'enable_unzip', 'enable_filejoin',
-             'enable_tsjoin', 'fail_on_crc', 'top_only',
+             'enable_tsjoin', 'overwrite_files', 'top_only',
              'auto_sort', 'check_new_rel', 'auto_disconnect', 'flat_unpack',
              'safe_postproc', 'no_dupes', 'replace_spaces', 'replace_dots', 'replace_illegal', 'auto_browser',
              'ignore_samples', 'pause_on_post_processing', 'quick_check', 'nice', 'ionice',
@@ -1257,7 +1257,7 @@ SPECIAL_BOOL_LIST = \
               'queue_complete_pers', 'api_warnings', 'allow_64bit_tools',
               'never_repair', 'allow_streaming', 'ignore_unrar_dates', 'rss_filenames',
               'osx_menu', 'osx_speed', 'win_menu', 'uniconfig', 'use_pickle', 'allow_incomplete_nzb',
-              'randomize_server_ip', 'no_ipv6', 'keep_awake', 'overwrite_files', 'empty_postproc',
+              'randomize_server_ip', 'no_ipv6', 'keep_awake', 'empty_postproc',
               'web_watchdog', 'wait_for_dfolder', 'warn_empty_nzb', 'enable_bonjour', 'script_can_fail',
               'warn_dupl_jobs', 'new_nzb_on_failure', 'enable_par_cleanup'
             )

sabnzbd/skintext.py

@@ -411,8 +411,8 @@ SKIN_TEXT = {
     'explain-ts_join' : TT('Join files ending in .001.ts, .002.ts etc. into one file.'),
     'opt-enable_par_cleanup' : TT('Enable Par Cleanup'),
     'explain-enable_par_cleanup' : TT('Cleanup par files (if verifiying/repairing succeded).'),
-    'opt-fail_on_crc' : TT('Fail on yEnc CRC Errors'),
-    'explain-fail_on_crc' : TT('When article has a CRC error, try to get it from another server.'),
+    'opt-overwrite_files' : TT('When unpacking, overwrite exiting files'),
+    'explain-overwrite_files' : TT('This will overwrite existing files instead of creating an alternative name.'),
     'opt-top_only' : TT('Only Get Articles for Top of Queue'),
     'explain-top_only' : TT('Enable for less memory usage. Disable to prevent slow jobs from blocking the queue.'),
     'opt-safe_postproc' : TT('Post-Process Only Verified Jobs'),