Small update

Author: ReikaNekoUwU

pycatfile/pycatfile.py

@@ -2051,7 +2051,7 @@ def CheckCompressionSubType(infile, formatspecs=__file_format_multi_dict__, file
         return False
     elif(IsNestedDict(formatspecs) and compresscheck in formatspecs):
         return formatspecs[compresscheck]['format_magic']
-    elif(IsSingleDict(formatspecs) and compresscheck == formatspecs['format_magic']):
+    elif(IsSingleDict(formatspecs) and 'format_magic' in formatspecs and compresscheck == formatspecs['format_magic']):
         return formatspecs['format_magic']
     elif(compresscheck == "tarfile"):
         return "tarfile"
@@ -8386,6 +8386,8 @@ def PackCatFileFromInFile(infile, outfile, fmttype="auto", compression="auto", c
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, 0, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         ckformatspecs = formatspecs[checkcompressfile]
+    else:
+        ckformatspecs = formatspecs
     if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
         return PackCatFileFromTarFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, extradata, jsondata, formatspecs, saltkey, verbose, returnfp)
     elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
@@ -8394,7 +8396,7 @@ def PackCatFileFromInFile(infile, outfile, fmttype="auto", compression="auto", c
         return PackCatFileFromRarFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, extradata, jsondata, formatspecs, saltkey, verbose, returnfp)
     elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
         return PackCatFileFromSevenZipFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, extradata, jsondata, formatspecs, saltkey, verbose, returnfp)
-    elif(checkcompressfile == ckformatspecs['format_magic']):
+    elif('format_magic' in ckformatspecs and checkcompressfile == ckformatspecs['format_magic']):
         return RePackCatFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, False, 0, 0, checksumtype, False, extradata, jsondata, formatspecs, saltkey, verbose, returnfp)
     else:
         return PackCatFileFromBSDTarFile(infile, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, checksumtype, extradata, jsondata, formatspecs, saltkey, verbose, returnfp)
@@ -8802,6 +8804,8 @@ def InFileToArray(infile, fmttype=__file_format_default__, filestart=0, seekstar
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         ckformatspecs = formatspecs[checkcompressfile]
+    else:
+        ckformatspecs = formatspecs
     if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
         return TarFileToArray(infile, fmttype, seekstart, seekend, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
     elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
@@ -8810,7 +8814,7 @@ def InFileToArray(infile, fmttype=__file_format_default__, filestart=0, seekstar
         return RarFileToArray(infile, fmttype, seekstart, seekend, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
     elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
         return SevenZipFileToArray(infile, fmttype, seekstart, seekend, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
-    elif(checkcompressfile == ckformatspecs['format_magic']):
+    elif('format_magic' in ckformatspecs and checkcompressfile == ckformatspecs['format_magic']):
         return CatFileToArray(infile, "auto", filestart, seekstart, seekend, listonly, contentasfile, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
     else:
         return BSDTarFileToArray(infile, fmttype, seekstart, seekend, listonly, contentasfile, skipchecksum, formatspecs, seektoend, returnfp)
@@ -10411,6 +10415,8 @@ def InFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0,
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         ckformatspecs = formatspecs[checkcompressfile]
+    else:
+        ckformatspecs = formatspecs
     if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
         return TarFileListFiles(infile, formatspecs, verbose, returnfp)
     elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
@@ -10419,7 +10425,7 @@ def InFileListFiles(infile, fmttype="auto", filestart=0, seekstart=0, seekend=0,
         return RarFileListFiles(infile, verbose, returnfp)
     elif(py7zr_support and checkcompressfile == "7zipfile" and py7zr.is_7zfile(infile)):
         return SevenZipFileListFiles(infile, verbose, returnfp)
-    elif(checkcompressfile == ckformatspecs['format_magic']):
+    elif('format_magic' in ckformatspecs and checkcompressfile == ckformatspecs['format_magic']):
         return ArchiveFileListFiles(infile, fmttype, filestart, seekstart, seekend, skipchecksum, formatspecs, saltkey, seektoend, verbose, newstyle, returnfp)
     else:
         return BSDTarFileListFiles(infile, formatspecs, verbose, returnfp)