Small update

Author: Kazuki Suzuki Przyborowski

altcatfile.py

@@ -32,7 +32,7 @@
 __file_format_len__ = pycatfile.__file_format_len__
 __file_format_hex__ = pycatfile.__file_format_hex__
 __file_format_delimiter__ = pycatfile.__file_format_delimiter__
-__file_format_list__ = pycatfile.__file_format_list__
+__file_format_dict__ = pycatfile.__file_format_dict__
 __use_new_style__ = pycatfile.__use_new_style__
 __use_advanced_list__ = pycatfile.__use_advanced_list__
 __use_alt_inode__ = pycatfile.__use_alt_inode__

catfile.py

@@ -78,7 +78,7 @@ def handler(signum, frame):
 __file_format_len__ = pycatfile.__file_format_len__
 __file_format_hex__ = pycatfile.__file_format_hex__
 __file_format_delimiter__ = pycatfile.__file_format_delimiter__
-__file_format_list__ = pycatfile.__file_format_list__
+__file_format_dict__ = pycatfile.__file_format_dict__
 __use_new_style__ = pycatfile.__use_new_style__
 __use_advanced_list__ = pycatfile.__use_advanced_list__
 __use_alt_inode__ = pycatfile.__use_alt_inode__
@@ -112,11 +112,11 @@ def handler(signum, frame):
                        help="Re-concatenate files, fixing checksum errors if any.")
 # File manipulation options
 argparser.add_argument(
-    "-F", "--format", default=__file_format_list__[0], help="Specify the format to use.")
+    "-F", "--format", default=__file_format_dict__['format_name'], help="Specify the format to use.")
 argparser.add_argument(
-    "-D", "--delimiter", default=__file_format_list__[5], help="Specify the delimiter to use.")
+    "-D", "--delimiter", default=__file_format_dict__['format_delimiter'], help="Specify the delimiter to use.")
 argparser.add_argument(
-    "-m", "--formatver", default=__file_format_list__[6], help="Specify the format version.")
+    "-m", "--formatver", default=__file_format_dict__['format_ver'], help="Specify the format version.")
 argparser.add_argument("-l", "--list", action="store_true",
                        help="List files included in the concatenated file.")
 # Compression options
@@ -146,7 +146,7 @@ def handler(signum, frame):
 
 fname = getargs.format
 fnamelower = fname.lower()
-if(getargs.format==__file_format_list__[0]):
+if(getargs.format==__file_format_dict__['format_name']):
     fnamemagic = __file_format_magic__
     fnamelen = __file_format_len__
     fnamehex = __file_format_hex__

neocatfile.py

@@ -29,7 +29,7 @@
 __file_format_len__ = pycatfile.__file_format_len__
 __file_format_hex__ = pycatfile.__file_format_hex__
 __file_format_delimiter__ = pycatfile.__file_format_delimiter__
-__file_format_list__ = pycatfile.__file_format_list__
+__file_format_dict__ = pycatfile.__file_format_dict__
 __use_new_style__ = pycatfile.__use_new_style__
 __use_advanced_list__ = pycatfile.__use_advanced_list__
 __use_alt_inode__ = pycatfile.__use_alt_inode__
@@ -99,19 +99,19 @@
 if primary_action == 'create':
     if args.convert == 'tar':
         pycatfile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif args.convert == 'zip':
         pycatfile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif py7zr_support and args.convert == '7zip':
         pycatfile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     elif rarfile_support and args.convert == 'rar':
         pycatfile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], [
-        ], pycatfile.__file_format_list__, args.verbose, False)
+        ], pycatfile.__file_format_dict__, args.verbose, False)
     else:
         pycatfile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pycatfile.compressionlistalt,
-                                  False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_list__, args.verbose, False)
+                                  False, [args.checksum, args.checksum, args.checksum], [], pycatfile.__file_format_dict__, args.verbose, False)
 elif primary_action == 'repack':
     pycatfile.RePackArchiveFile(
         input_file, args.output, args.compression, args.level, pycatfile.compressionlistalt, [args.checksum, args.checksum, args.checksum], args.verbose)