Small update

Author: YuukaNekoUwU

archivefile.ini

@@ -9,6 +9,9 @@ usememfd = true
 usespoolfile = false
 spoolfilesize = 4194304
 filebuffsize = 262144
+advancedlist = true
+altinode = false
+newstyle = true
 
 [ArchiveFile]
 len = 11
@@ -18,9 +21,6 @@ name = ArchiveFile
 magic = ArchiveFile
 delimiter = \x00
 extension = .arc
-newstyle = true
-advancedlist = true
-altinode = true
 
 [NeoFile]
 len = 7
@@ -30,6 +30,3 @@ name = NeoFile
 magic = NeoFile
 delimiter = \x00
 extension = .neo
-newstyle = true
-advancedlist = true
-altinode = true

archivefile.json

@@ -7,7 +7,10 @@
         "usememfd": true,
         "usespoolfile": false,
         "spoolfilesize": 4194304,
-        "filebuffsize": 262144
+        "filebuffsize": 262144,
+        "advancedlist": true,
+        "altinode": false,
+        "newstyle": true
     },
     "ArchiveFile": {
         "len": 11,
@@ -16,10 +19,7 @@
         "name": "ArchiveFile",
         "magic": "ArchiveFile",
         "delimiter": "\u0000",
-        "extension": ".arc",
-        "newstyle": true,
-        "advancedlist": true,
-        "altinode": false
+        "extension": ".arc"
     },
     "NeoFile": {
         "len": 7,
@@ -28,9 +28,6 @@
         "name": "NeoFile",
         "magic": "NeoFile",
         "delimiter": "\u0000",
-        "extension": ".neo",
-        "newstyle": true,
-        "advancedlist": true,
-        "altinode": false
+        "extension": ".neo"
     }
 }

pyarchivefile.py

@@ -420,6 +420,9 @@ def _is_printable(ch):
 __use_memfd__ = True
 __use_spoolfile__ = False
 __use_spooldir__ = tempfile.gettempdir()
+__use_new_style__ = True
+__use_advanced_list__ = True
+__use_alt_inode__ = False
 BYTES_PER_KiB = 1024
 BYTES_PER_MiB = 1024 * BYTES_PER_KiB
 # Spool: not tiny, but won’t blow up RAM if many are in use
@@ -467,15 +470,17 @@ def decode_unicode_escape(value):
     __use_memfd__ = config.getboolean('config', 'usememfd')
     __use_spoolfile__ = config.getboolean('config', 'usespoolfile')
     __spoolfile_size__ = config.getint('config', 'spoolfilesize')
+    __use_new_style__ = config.getboolean('config', 'newstyle')
+    __use_advanced_list__ = config.getboolean('config', 'advancedlist')
+    __use_alt_inode__ = config.getboolean('config', 'altinode')
     # Loop through all sections
     for section in config.sections():
         if section == "config":
             continue
 
         required_keys = [
             "len", "hex", "ver", "name",
-            "magic", "delimiter", "extension",
-            "newstyle", "advancedlist", "altinode"
+            "magic", "delimiter", "extension"
         ]
 
         # Py2+Py3 compatible key presence check
@@ -495,9 +500,6 @@ def decode_unicode_escape(value):
                 'format_hex':         config.get(section, 'hex'),
                 'format_delimiter':   delim,
                 'format_ver':         config.get(section, 'ver'),
-                'new_style':          config.getboolean(section, 'newstyle'),
-                'use_advanced_list':  config.getboolean(section, 'advancedlist'),
-                'use_alt_inode':      config.getboolean(section, 'altinode'),
                 'format_extension':   decode_unicode_escape(config.get(section, 'extension')),
             }
         })
@@ -563,12 +565,14 @@ def _get(section_dict, key, default=None):
     __use_memfd__       = _to_bool(_get(cfg_config, 'usememfd', True))
     __use_spoolfile__       = _to_bool(_get(cfg_config, 'usespoolfile', False))
     __spoolfile_size__       = _to_int(_get(cfg_config, 'spoolfilesize', DEFAULT_SPOOL_MAX))
+    __use_new_style__       = _to_bool(_get(cfg_config, 'usespoolfile', True))
+    __use_advanced_list__       = _to_bool(_get(cfg_config, 'usespoolfile', True))
+    __use_alt_inode__       = _to_bool(_get(cfg_config, 'usespoolfile', False))
 
     # --- iterate format sections (everything except "config") ---
     required_keys = [
         "len", "hex", "ver", "name",
-        "magic", "delimiter", "extension",
-        "newstyle", "advancedlist", "altinode"
+        "magic", "delimiter", "extension"
     ]
 
     for section_name, section in cfg.items():
@@ -586,9 +590,6 @@ def _get(section_dict, key, default=None):
         fmt_hex    = decode_unicode_escape(_get(section, 'hex', ''))
         fmt_ver    = decode_unicode_escape(_get(section, 'ver', ''))
         delim      = decode_unicode_escape(_get(section, 'delimiter', ''))
-        new_style  = _to_bool(_get(section, 'newstyle', False))
-        adv_list   = _to_bool(_get(section, 'advancedlist', False))
-        alt_inode  = _to_bool(_get(section, 'altinode', False))
         extension  = decode_unicode_escape(_get(section, 'extension', ''))
 
         # keep your delimiter validation semantics
@@ -603,9 +604,6 @@ def _get(section_dict, key, default=None):
                 'format_hex':         fmt_hex,
                 'format_delimiter':   delim,
                 'format_ver':         fmt_ver,
-                'new_style':          new_style,
-                'use_advanced_list':  adv_list,
-                'use_alt_inode':      alt_inode,
                 'format_extension':   extension,
             }
         })
@@ -636,9 +634,6 @@ def _get(section_dict, key, default=None):
 __file_format_hex__ = __file_format_multi_dict__[__file_format_default__]['format_hex']
 __file_format_delimiter__ = __file_format_multi_dict__[__file_format_default__]['format_delimiter']
 __file_format_ver__ = __file_format_multi_dict__[__file_format_default__]['format_ver']
-__use_new_style__ = __file_format_multi_dict__[__file_format_default__]['new_style']
-__use_advanced_list__ = __file_format_multi_dict__[__file_format_default__]['use_advanced_list']
-__use_alt_inode__ = __file_format_multi_dict__[__file_format_default__]['use_alt_inode']
 __file_format_extension__ = __file_format_multi_dict__[__file_format_default__]['format_extension']
 __file_format_dict__ = __file_format_multi_dict__[__file_format_default__]
 __project__ = __program_name__
@@ -4237,7 +4232,7 @@ def ReadFileHeaderDataWithContent(fp, listonly=False, uncompress=True, skipcheck
     if(not hasattr(fp, "read")):
         return False
     delimiter = formatspecs['format_delimiter']
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         HeaderOut = ReadFileHeaderDataBySize(fp, delimiter)
     else:
         HeaderOut = ReadFileHeaderDataWoSize(fp, delimiter)
@@ -4395,7 +4390,7 @@ def ReadFileHeaderDataWithContentToArray(fp, listonly=False, contentasfile=True,
         return False
     delimiter = formatspecs['format_delimiter']
     fheaderstart = fp.tell()
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         HeaderOut = ReadFileHeaderDataBySize(fp, delimiter)
     else:
         HeaderOut = ReadFileHeaderDataWoSize(fp, delimiter)
@@ -4617,7 +4612,7 @@ def ReadFileHeaderDataWithContentToList(fp, listonly=False, contentasfile=False,
         return False
     delimiter = formatspecs['format_delimiter']
     fheaderstart = fp.tell()
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         HeaderOut = ReadFileHeaderDataBySize(fp, delimiter)
     else:
         HeaderOut = ReadFileHeaderDataWoSize(fp, delimiter)
@@ -4842,7 +4837,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
         return False
     if(formdel != formatspecs['format_delimiter']):
         return False
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         inheader = ReadFileHeaderDataBySize(
             fp, formatspecs['format_delimiter'])
     else:
@@ -4913,7 +4908,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
         return False
     if(formdel != formatspecs['format_delimiter']):
         return False
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         inheader = ReadFileHeaderDataBySize(
             fp, formatspecs['format_delimiter'])
     else:
@@ -5164,7 +5159,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
         return False
     if(formdel != formatspecs['format_delimiter']):
         return False
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         inheader = ReadFileHeaderDataBySize(
             fp, formatspecs['format_delimiter'])
     else:
@@ -5246,7 +5241,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
         il = 0
         while(il < seekstart):
             prefhstart = fp.tell()
-            if(formatspecs['new_style']):
+            if(__use_new_style__):
                 preheaderdata = ReadFileHeaderDataBySize(
                     fp, formatspecs['format_delimiter'])
             else:
@@ -5960,8 +5955,8 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
 def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], jsondata={}, compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, checksumtype=["md5", "md5", "md5", "md5", "md5"], formatspecs=__file_format_dict__, saltkey=None, verbose=False):
     if(not hasattr(fp, "write")):
         return False
-    advancedlist = formatspecs['use_advanced_list']
-    altinode = formatspecs['use_alt_inode']
+    advancedlist = __use_advanced_list__
+    altinode = __use_alt_inode__
     if(verbose):
         logging.basicConfig(format="%(message)s",
                             stream=PY_STDOUT_TEXT, level=logging.DEBUG)
@@ -9712,7 +9707,7 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_
         return False
     if(formdel != formatspecs['format_delimiter']):
         return False
-    if(formatspecs['new_style']):
+    if(__use_new_style__):
         inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
     else:
         inheader = ReadFileHeaderDataWoSize(fp, formatspecs['format_delimiter'])
@@ -9798,7 +9793,7 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_
     # Iterate either until EOF (seektoend) or fixed count
     while (fp.tell() < CatSizeEnd) if seektoend else (il < fnumfiles):
         outfhstart = fp.tell()
-        if(formatspecs['new_style']):
+        if(__use_new_style__):
             inheaderdata = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
         else:
             inheaderdata = ReadFileHeaderDataWoSize(fp, formatspecs['format_delimiter'])