PyCatFile 0.28.4__tar.gz → 0.28.6__tar.gz

{pycatfile-0.28.4 → pycatfile-0.28.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCatFile
-Version: 0.28.4
+Version: 0.28.6
 Summary: A tar like file format name archivefile.
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.28.4 → pycatfile-0.28.6}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCatFile
-Version: 0.28.4
+Version: 0.28.6
 Summary: A tar like file format name archivefile.
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.28.4 → pycatfile-0.28.6}/catfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: catfile.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1  - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 2/6/2026 Ver. 0.28.6 RC 1  - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -203,7 +203,7 @@ if active_action:
                 sys.exit(1)
             input_file = tempout
         pycatfile.UnPackCatFile(input_file, getargs.output, False, getargs.filestart, 0, 0, getargs.skipchecksum,
-                                    fnamedict, getargs.verbose, getargs.preserve, getargs.preserve, False, False)
+                                    fnamedict, getargs.insecretkey, getargs.preserve, getargs.preserve, False, getargs.verbose, False)
     elif active_action == 'list':
         if getargs.convert:
             checkcompressfile = pycatfile.CheckCompressionSubType(

{pycatfile-0.28.4 → pycatfile-0.28.6}/catfile_py3.py

@@ -13,7 +13,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: catfile_py3.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile_py3.py - Last Update: 2/6/2026 Ver. 0.28.6 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import annotations
@@ -378,10 +378,11 @@ def main(argv: Optional[list[str]] = None) -> int:
             0,
             getargs.skipchecksum,
             fnamedict,
-            getargs.verbose,
+            getargs.insecretkey,
             getargs.preserve,
             getargs.preserve,
             False,
+            getargs.verbose,
             False,
         )
 

{pycatfile-0.28.4 → pycatfile-0.28.6}/pycatfile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1  - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 2/4/2026 Ver. 0.28.2 RC 1  - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -661,12 +661,12 @@ __project__ = __program_name__
 __program_alt_name__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
 __project_release_url__ = __project_url__+"/releases/latest"
-__version_info__ = (0, 28, 4, "RC 1", 1)
-__version_date_info__ = (2026, 2, 6, "RC 1", 1)
+__version_info__ = (0, 28, 2, "RC 1", 1)
+__version_date_info__ = (2026, 2, 4, "RC 1", 1)
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: a87c7aadb79d3eebf05d8e955d7294c74e99a96e $"
+__revision_id__ = "$Id: f8886b7c437cd32b61d83c2d05b30b03e0e152bc $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -11419,238 +11419,250 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
     else:
         if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not (sys.version_info[0] >= 3 and isinstance(infile, bytes))):
             infile = RemoveWindowsPath(infile)
-        listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
-    if(not listarrayfiles):
+        listarrayfiles = ArchiveFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
+    if(not listarrayfilespre):
         return False
-    lenlist = len(listarrayfiles['ffilelist'])
-    fnumfiles = int(listarrayfiles['fnumfiles'])
-    lcfi = 0
-    lcfx = int(listarrayfiles['fnumfiles'])
-    if(lenlist > listarrayfiles['fnumfiles'] or lenlist < listarrayfiles['fnumfiles']):
-        lcfx = int(lenlist)
-    else:
+    if(not isinstance(listarrayfilespre, list)):
+        listarrayfilespre = [listarrayfilespre]
+    fplist = []
+    if os.path.exists(outdir) and os.path.isdir(outdir):
+        pass
+    elif os.path.exists(outdir) and os.path.isdir(outdir):
+        return False
+    elif not os.path.exists(outdir):
+        os.makedirs(outdir)
+    for listarrayfiles in listarrayfilespre:
+        lenlist = len(listarrayfiles['ffilelist'])
+        fnumfiles = int(listarrayfiles['fnumfiles'])
+        lcfi = 0
         lcfx = int(listarrayfiles['fnumfiles'])
-    while(lcfi < lcfx):
-        funame = ""
-        try:
-            import pwd
-            try:
-                userinfo = pwd.getpwuid(
-                    listarrayfiles['ffilelist'][lcfi]['fuid'])
-                funame = userinfo.pw_name
-            except KeyError:
-                funame = ""
-        except ImportError:
+        if(lenlist > listarrayfiles['fnumfiles'] or lenlist < listarrayfiles['fnumfiles']):
+            lcfx = int(lenlist)
+        else:
+            lcfx = int(listarrayfiles['fnumfiles'])
+        while(lcfi < lcfx):
             funame = ""
-        fgname = ""
-        try:
-            import grp
             try:
-                groupinfo = grp.getgrgid(
-                    listarrayfiles['ffilelist'][lcfi]['fgid'])
-                fgname = groupinfo.gr_name
-            except KeyError:
-                fgname = ""
-        except ImportError:
-            fgname = ""
-        if(verbose):
-            VerbosePrintOut(PrependPath(
-                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 0 or listarrayfiles['ffilelist'][lcfi]['ftype'] == 7):
-            with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                if(not listarrayfiles['ffilelist'][lcfi]['fcontentasfile']):
-                    listarrayfiles['ffilelist'][lcfi]['fcontents'] = MkTempFile(
-                        listarrayfiles['ffilelist'][lcfi]['fcontents'])
-                listarrayfiles['ffilelist'][lcfi]['fcontents'].seek(0, 0)
-                shutil.copyfileobj(
-                    listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc, length=__filebuff_size__)
+                import pwd
                 try:
-                    fpc.flush()
-                    if(hasattr(os, "sync")):
-                        os.fsync(fpc.fileno())
-                except (io.UnsupportedOperation, AttributeError, OSError):
-                    pass
-            if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
-                os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
-                         listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
-            if(preservepermissions):
-                os.chmod(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            if(preservetime):
-                os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                    listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 1):
-            if(followlink):
-                getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
-                flinkid = prelistarrayfiles['filetoid'][getflinkpath]
-                flinkinfo = listarrayfiles['ffilelist'][flinkid]
+                    userinfo = pwd.getpwuid(
+                        listarrayfiles['ffilelist'][lcfi]['fuid'])
+                    funame = userinfo.pw_name
+                except KeyError:
+                    funame = ""
+            except ImportError:
                 funame = ""
+            fgname = ""
+            try:
+                import grp
                 try:
-                    import pwd
+                    groupinfo = grp.getgrgid(
+                        listarrayfiles['ffilelist'][lcfi]['fgid'])
+                    fgname = groupinfo.gr_name
+                except KeyError:
+                    fgname = ""
+            except ImportError:
+                fgname = ""
+            if(verbose):
+                VerbosePrintOut(PrependPath(
+                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 0 or listarrayfiles['ffilelist'][lcfi]['ftype'] == 7):
+                with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                    if(not listarrayfiles['ffilelist'][lcfi]['fcontentasfile']):
+                        listarrayfiles['ffilelist'][lcfi]['fcontents'] = MkTempFile(
+                            listarrayfiles['ffilelist'][lcfi]['fcontents'])
+                    listarrayfiles['ffilelist'][lcfi]['fcontents'].seek(0, 0)
+                    shutil.copyfileobj(
+                        listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc, length=__filebuff_size__)
                     try:
-                        userinfo = pwd.getpwuid(flinkinfo['fuid'])
-                        funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                except ImportError:
+                        fpc.flush()
+                        if(hasattr(os, "sync")):
+                            os.fsync(fpc.fileno())
+                    except (io.UnsupportedOperation, AttributeError, OSError):
+                        pass
+                if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
+                    os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
+                             listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
+                if(preservepermissions):
+                    os.chmod(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                if(preservetime):
+                    os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                        listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 1):
+                if(followlink):
+                    getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
+                    flinkid = prelistarrayfiles['filetoid'][getflinkpath]
+                    flinkinfo = listarrayfiles['ffilelist'][flinkid]
                     funame = ""
-                fgname = ""
-                try:
-                    import grp
                     try:
-                        groupinfo = grp.getgrgid(flinkinfo['fgid'])
-                        fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                except ImportError:
+                        import pwd
+                        try:
+                            userinfo = pwd.getpwuid(flinkinfo['fuid'])
+                            funame = userinfo.pw_name
+                        except KeyError:
+                            funame = ""
+                    except ImportError:
+                        funame = ""
                     fgname = ""
-                if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
-                    with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                        if(not flinkinfo['fcontentasfile']):
-                            flinkinfo['fcontents'] = MkTempFile(
-                                flinkinfo['fcontents'])
-                        flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                    try:
+                        import grp
                         try:
-                            fpc.flush()
-                            if(hasattr(os, "sync")):
-                                os.fsync(fpc.fileno())
-                        except (io.UnsupportedOperation, AttributeError, OSError):
-                            pass
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 1):
-                    os.link(flinkinfo['flinkname'], PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 2):
-                    os.symlink(flinkinfo['flinkname'], PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 5):
-                    if(preservepermissions):
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    else:
-                        os.mkdir(PrependPath(
+                            groupinfo = grp.getgrgid(flinkinfo['fgid'])
+                            fgname = groupinfo.gr_name
+                        except KeyError:
+                            fgname = ""
+                    except ImportError:
+                        fgname = ""
+                    if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
+                        with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                            if(not flinkinfo['fcontentasfile']):
+                                flinkinfo['fcontents'] = MkTempFile(
+                                    flinkinfo['fcontents'])
+                            flinkinfo['fcontents'].seek(0, 0)
+                            shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                            try:
+                                fpc.flush()
+                                if(hasattr(os, "sync")):
+                                    os.fsync(fpc.fileno())
+                            except (io.UnsupportedOperation, AttributeError, OSError):
+                                pass
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 1):
+                        os.link(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 2):
+                        os.symlink(flinkinfo['flinkname'], PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
+                    if(flinkinfo['ftype'] == 5):
+                        if(preservepermissions):
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        else:
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
+                        os.mkfifo(PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
-                    os.mkfifo(PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-            else:
-                os.link(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 2):
-            if(followlink):
-                getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
-                flinkid = prelistarrayfiles['filetoid'][getflinkpath]
-                flinkinfo = listarrayfiles['ffilelist'][flinkid]
-                funame = ""
-                try:
-                    import pwd
-                    try:
-                        userinfo = pwd.getpwuid(flinkinfo['fuid'])
-                        funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                except ImportError:
+                else:
+                    os.link(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 2):
+                if(followlink):
+                    getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
+                    flinkid = prelistarrayfiles['filetoid'][getflinkpath]
+                    flinkinfo = listarrayfiles['ffilelist'][flinkid]
                     funame = ""
-                fgname = ""
-                try:
-                    import grp
                     try:
-                        groupinfo = grp.getgrgid(flinkinfo['fgid'])
-                        fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                except ImportError:
+                        import pwd
+                        try:
+                            userinfo = pwd.getpwuid(flinkinfo['fuid'])
+                            funame = userinfo.pw_name
+                        except KeyError:
+                            funame = ""
+                    except ImportError:
+                        funame = ""
                     fgname = ""
-                if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
-                    with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                        if(not flinkinfo['fcontentasfile']):
-                            flinkinfo['fcontents'] = MkTempFile(
-                                flinkinfo['fcontents'])
-                        flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                    try:
+                        import grp
                         try:
-                            fpc.flush()
-                            if(hasattr(os, "sync")):
-                                os.fsync(fpc.fileno())
-                        except (io.UnsupportedOperation, AttributeError, OSError):
-                            pass
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
+                            groupinfo = grp.getgrgid(flinkinfo['fgid'])
+                            fgname = groupinfo.gr_name
+                        except KeyError:
+                            fgname = ""
+                    except ImportError:
+                        fgname = ""
+                    if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
+                        with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                            if(not flinkinfo['fcontentasfile']):
+                                flinkinfo['fcontents'] = MkTempFile(
+                                    flinkinfo['fcontents'])
+                            flinkinfo['fcontents'].seek(0, 0)
+                            shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                            try:
+                                fpc.flush()
+                                if(hasattr(os, "sync")):
+                                    os.fsync(fpc.fileno())
+                            except (io.UnsupportedOperation, AttributeError, OSError):
+                                pass
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 1):
+                        os.link(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 2):
+                        os.symlink(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 5):
+                        if(preservepermissions):
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        else:
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
+                        os.mkfifo(PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 1):
-                    os.link(flinkinfo['flinkname'], PrependPath(
+                else:
+                    os.symlink(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
                         outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 2):
-                    os.symlink(flinkinfo['flinkname'], PrependPath(
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 5):
+                if(preservepermissions):
+                    os.mkdir(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                else:
+                    os.mkdir(PrependPath(
                         outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 5):
-                    if(preservepermissions):
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    else:
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
-                    os.mkfifo(PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-            else:
-                os.symlink(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 5):
-            if(preservepermissions):
-                os.mkdir(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            else:
-                os.mkdir(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-            if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
-                os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
-                         listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
-            if(preservepermissions):
-                os.chmod(PrependPath(
+                if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
+                    os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
+                             listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
+                if(preservepermissions):
+                    os.chmod(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                if(preservetime):
+                    os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                        listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
+                os.mkfifo(PrependPath(
                     outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            if(preservetime):
-                os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                    listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
-            os.mkfifo(PrependPath(
-                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-        lcfi = lcfi + 1
+            if(returnfp):
+                fplist.append(listarrayfiles['ffilelist'][lcfi]['fp'])
+            lcfi = lcfi + 1
     if(returnfp):
-        return listarrayfiles['ffilelist']['fp']
+        return fplist
     else:
         return True
 

{pycatfile-0.28.4 → pycatfile-0.28.6}/pycatfile_py3.py

@@ -14,7 +14,7 @@
     Copyright 2018-2026 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2026 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pycatfile.py - Last Update: 2/6/2026 Ver. 0.28.4 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 2/6/2026 Ver. 0.28.6 RC 1 - Author: cooldude2k $
 '''
 
 import io
@@ -699,12 +699,12 @@ __project__ = __program_name__
 __program_alt_name__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
 __project_release_url__ = __project_url__+"/releases/latest"
-__version_info__ = (0, 28, 4, "RC 1", 1)
+__version_info__ = (0, 28, 6, "RC 1", 1)
 __version_date_info__ = (2026, 2, 6, "RC 1", 1)
 __version_date__ = str(__version_date_info__[0]) + "." + str(
     __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: 4b086b80d2e6455232a175c7074886caa6d1dff4 $"
+__revision_id__ = "$Id: 28cf85ee56dff68917635a26b6aa12cbe5e348e2 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -10682,242 +10682,254 @@ def UnPackCatFile(infile, outdir=None, followlink=False, filestart=0, seekstart=
     if(outdir is not None):
         outdir = RemoveWindowsPath(outdir)
     if(isinstance(infile, dict)):
-        listarrayfiles = infile
+        listarrayfilespre = infile
     else:
         if(infile != "-" and not hasattr(infile, "read") and not hasattr(infile, "write") and not (sys.version_info[0] >= 3 and isinstance(infile, bytes))):
             infile = RemoveWindowsPath(infile)
-        listarrayfiles = CatFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
-    if(not listarrayfiles):
+        listarrayfilespre = ArchiveFileToArray(infile, "auto", filestart, seekstart, seekend, False, True, True, skipchecksum, formatspecs, saltkey, seektoend, returnfp)
+    if(not listarrayfilespre):
         return False
-    lenlist = len(listarrayfiles['ffilelist'])
-    fnumfiles = int(listarrayfiles['fnumfiles'])
-    lcfi = 0
-    lcfx = int(listarrayfiles['fnumfiles'])
-    if(lenlist > listarrayfiles['fnumfiles'] or lenlist < listarrayfiles['fnumfiles']):
-        lcfx = int(lenlist)
-    else:
+    if(not isinstance(listarrayfilespre, list)):
+        listarrayfilespre = [listarrayfilespre]
+    fplist = []
+    if os.path.exists(outdir) and os.path.isdir(outdir):
+        pass
+    elif os.path.exists(outdir) and os.path.isdir(outdir):
+        return False
+    elif not os.path.exists(outdir):
+        os.makedirs(outdir)
+    for listarrayfiles in listarrayfilespre:
+        lenlist = len(listarrayfiles['ffilelist'])
+        fnumfiles = int(listarrayfiles['fnumfiles'])
+        lcfi = 0
         lcfx = int(listarrayfiles['fnumfiles'])
-    while(lcfi < lcfx):
-        funame = ""
-        try:
-            import pwd
-            try:
-                userinfo = pwd.getpwuid(
-                    listarrayfiles['ffilelist'][lcfi]['fuid'])
-                funame = userinfo.pw_name
-            except KeyError:
-                funame = ""
-        except ImportError:
+        if(lenlist > listarrayfiles['fnumfiles'] or lenlist < listarrayfiles['fnumfiles']):
+            lcfx = int(lenlist)
+        else:
+            lcfx = int(listarrayfiles['fnumfiles'])
+        while(lcfi < lcfx):
             funame = ""
-        fgname = ""
-        try:
-            import grp
             try:
-                groupinfo = grp.getgrgid(
-                    listarrayfiles['ffilelist'][lcfi]['fgid'])
-                fgname = groupinfo.gr_name
-            except KeyError:
-                fgname = ""
-        except ImportError:
-            fgname = ""
-        if(verbose):
-            VerbosePrintOut(PrependPath(
-                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 0 or listarrayfiles['ffilelist'][lcfi]['ftype'] == 7):
-            with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                if(not listarrayfiles['ffilelist'][lcfi]['fcontentasfile']):
-                    listarrayfiles['ffilelist'][lcfi]['fcontents'] = MkTempFile(
-                        listarrayfiles['ffilelist'][lcfi]['fcontents'])
-                listarrayfiles['ffilelist'][lcfi]['fcontents'].seek(0, 0)
-                shutil.copyfileobj(
-                    listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc, length=__filebuff_size__)
+                import pwd
                 try:
-                    fpc.flush()
-                    if(hasattr(os, "sync")):
-                        os.fsync(fpc.fileno())
-                except (io.UnsupportedOperation, AttributeError, OSError):
-                    pass
-            if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
-                os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
-                         listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
-            if(preservepermissions):
-                os.chmod(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            if(preservetime):
-                os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                    listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 1):
-            if(followlink):
-                getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
-                flinkid = prelistarrayfiles['filetoid'][getflinkpath]
-                flinkinfo = listarrayfiles['ffilelist'][flinkid]
+                    userinfo = pwd.getpwuid(
+                        listarrayfiles['ffilelist'][lcfi]['fuid'])
+                    funame = userinfo.pw_name
+                except KeyError:
+                    funame = ""
+            except ImportError:
                 funame = ""
+            fgname = ""
+            try:
+                import grp
                 try:
-                    import pwd
+                    groupinfo = grp.getgrgid(
+                        listarrayfiles['ffilelist'][lcfi]['fgid'])
+                    fgname = groupinfo.gr_name
+                except KeyError:
+                    fgname = ""
+            except ImportError:
+                fgname = ""
+            if(verbose):
+                VerbosePrintOut(PrependPath(
+                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 0 or listarrayfiles['ffilelist'][lcfi]['ftype'] == 7):
+                with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                    if(not listarrayfiles['ffilelist'][lcfi]['fcontentasfile']):
+                        listarrayfiles['ffilelist'][lcfi]['fcontents'] = MkTempFile(
+                            listarrayfiles['ffilelist'][lcfi]['fcontents'])
+                    listarrayfiles['ffilelist'][lcfi]['fcontents'].seek(0, 0)
+                    shutil.copyfileobj(
+                        listarrayfiles['ffilelist'][lcfi]['fcontents'], fpc, length=__filebuff_size__)
                     try:
-                        userinfo = pwd.getpwuid(flinkinfo['fuid'])
-                        funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                except ImportError:
+                        fpc.flush()
+                        if(hasattr(os, "sync")):
+                            os.fsync(fpc.fileno())
+                    except (io.UnsupportedOperation, AttributeError, OSError):
+                        pass
+                if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
+                    os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
+                             listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
+                if(preservepermissions):
+                    os.chmod(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                if(preservetime):
+                    os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                        listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 1):
+                if(followlink):
+                    getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
+                    flinkid = prelistarrayfiles['filetoid'][getflinkpath]
+                    flinkinfo = listarrayfiles['ffilelist'][flinkid]
                     funame = ""
-                fgname = ""
-                try:
-                    import grp
                     try:
-                        groupinfo = grp.getgrgid(flinkinfo['fgid'])
-                        fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                except ImportError:
+                        import pwd
+                        try:
+                            userinfo = pwd.getpwuid(flinkinfo['fuid'])
+                            funame = userinfo.pw_name
+                        except KeyError:
+                            funame = ""
+                    except ImportError:
+                        funame = ""
                     fgname = ""
-                if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
-                    with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                        if(not flinkinfo['fcontentasfile']):
-                            flinkinfo['fcontents'] = MkTempFile(
-                                flinkinfo['fcontents'])
-                        flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                    try:
+                        import grp
                         try:
-                            fpc.flush()
-                            if(hasattr(os, "sync")):
-                                os.fsync(fpc.fileno())
-                        except (io.UnsupportedOperation, AttributeError, OSError):
-                            pass
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 1):
-                    os.link(flinkinfo['flinkname'], PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 2):
-                    os.symlink(flinkinfo['flinkname'], PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 5):
-                    if(preservepermissions):
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    else:
-                        os.mkdir(PrependPath(
+                            groupinfo = grp.getgrgid(flinkinfo['fgid'])
+                            fgname = groupinfo.gr_name
+                        except KeyError:
+                            fgname = ""
+                    except ImportError:
+                        fgname = ""
+                    if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
+                        with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                            if(not flinkinfo['fcontentasfile']):
+                                flinkinfo['fcontents'] = MkTempFile(
+                                    flinkinfo['fcontents'])
+                            flinkinfo['fcontents'].seek(0, 0)
+                            shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                            try:
+                                fpc.flush()
+                                if(hasattr(os, "sync")):
+                                    os.fsync(fpc.fileno())
+                            except (io.UnsupportedOperation, AttributeError, OSError):
+                                pass
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 1):
+                        os.link(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 2):
+                        os.symlink(flinkinfo['flinkname'], PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
+                    if(flinkinfo['ftype'] == 5):
+                        if(preservepermissions):
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        else:
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
+                        os.mkfifo(PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
-                    os.mkfifo(PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-            else:
-                os.link(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 2):
-            if(followlink):
-                getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
-                flinkid = prelistarrayfiles['filetoid'][getflinkpath]
-                flinkinfo = listarrayfiles['ffilelist'][flinkid]
-                funame = ""
-                try:
-                    import pwd
-                    try:
-                        userinfo = pwd.getpwuid(flinkinfo['fuid'])
-                        funame = userinfo.pw_name
-                    except KeyError:
-                        funame = ""
-                except ImportError:
+                else:
+                    os.link(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 2):
+                if(followlink):
+                    getflinkpath = listarrayfiles['ffilelist'][lcfi]['flinkname']
+                    flinkid = prelistarrayfiles['filetoid'][getflinkpath]
+                    flinkinfo = listarrayfiles['ffilelist'][flinkid]
                     funame = ""
-                fgname = ""
-                try:
-                    import grp
                     try:
-                        groupinfo = grp.getgrgid(flinkinfo['fgid'])
-                        fgname = groupinfo.gr_name
-                    except KeyError:
-                        fgname = ""
-                except ImportError:
+                        import pwd
+                        try:
+                            userinfo = pwd.getpwuid(flinkinfo['fuid'])
+                            funame = userinfo.pw_name
+                        except KeyError:
+                            funame = ""
+                    except ImportError:
+                        funame = ""
                     fgname = ""
-                if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
-                    with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
-                        if(not flinkinfo['fcontentasfile']):
-                            flinkinfo['fcontents'] = MkTempFile(
-                                flinkinfo['fcontents'])
-                        flinkinfo['fcontents'].seek(0, 0)
-                        shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                    try:
+                        import grp
                         try:
-                            fpc.flush()
-                            if(hasattr(os, "sync")):
-                                os.fsync(fpc.fileno())
-                        except (io.UnsupportedOperation, AttributeError, OSError):
-                            pass
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
+                            groupinfo = grp.getgrgid(flinkinfo['fgid'])
+                            fgname = groupinfo.gr_name
+                        except KeyError:
+                            fgname = ""
+                    except ImportError:
+                        fgname = ""
+                    if(flinkinfo['ftype'] == 0 or flinkinfo['ftype'] == 7):
+                        with open(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), "wb") as fpc:
+                            if(not flinkinfo['fcontentasfile']):
+                                flinkinfo['fcontents'] = MkTempFile(
+                                    flinkinfo['fcontents'])
+                            flinkinfo['fcontents'].seek(0, 0)
+                            shutil.copyfileobj(flinkinfo['fcontents'], fpc, length=__filebuff_size__)
+                            try:
+                                fpc.flush()
+                                if(hasattr(os, "sync")):
+                                    os.fsync(fpc.fileno())
+                            except (io.UnsupportedOperation, AttributeError, OSError):
+                                pass
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 1):
+                        os.link(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 2):
+                        os.symlink(flinkinfo['flinkname'], PrependPath(
+                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                    if(flinkinfo['ftype'] == 5):
+                        if(preservepermissions):
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        else:
+                            os.mkdir(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
+                        if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
+                            os.chown(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
+                        if(preservepermissions):
+                            os.chmod(PrependPath(
+                                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
+                        if(preservetime):
+                            os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                                flinkinfo['fatime'], flinkinfo['fmtime']))
+                    if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
+                        os.mkfifo(PrependPath(
                             outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 1):
-                    os.link(flinkinfo['flinkname'], PrependPath(
+                else:
+                    os.symlink(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
                         outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 2):
-                    os.symlink(flinkinfo['flinkname'], PrependPath(
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 5):
+                if(preservepermissions):
+                    os.mkdir(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                else:
+                    os.mkdir(PrependPath(
                         outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                if(flinkinfo['ftype'] == 5):
-                    if(preservepermissions):
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    else:
-                        os.mkdir(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-                    if(hasattr(os, "chown") and funame == flinkinfo['funame'] and fgname == flinkinfo['fgname'] and preservepermissions):
-                        os.chown(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fuid'], flinkinfo['fgid'])
-                    if(preservepermissions):
-                        os.chmod(PrependPath(
-                            outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-                    if(preservetime):
-                        os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                            flinkinfo['fatime'], flinkinfo['fmtime']))
-                if(flinkinfo['ftype'] == 6 and hasattr(os, "mkfifo")):
-                    os.mkfifo(PrependPath(
-                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), flinkinfo['fchmode'])
-            else:
-                os.symlink(listarrayfiles['ffilelist'][lcfi]['flinkname'], PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 5):
-            if(preservepermissions):
-                os.mkdir(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            else:
-                os.mkdir(PrependPath(
-                    outdir, listarrayfiles['ffilelist'][lcfi]['fname']))
-            if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
-                os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
-                         listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
-            if(preservepermissions):
-                os.chmod(PrependPath(
+                if(hasattr(os, "chown") and funame == listarrayfiles['ffilelist'][lcfi]['funame'] and fgname == listarrayfiles['ffilelist'][lcfi]['fgname'] and preservepermissions):
+                    os.chown(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']),
+                             listarrayfiles['ffilelist'][lcfi]['fuid'], listarrayfiles['ffilelist'][lcfi]['fgid'])
+                if(preservepermissions):
+                    os.chmod(PrependPath(
+                        outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
+                if(preservetime):
+                    os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
+                        listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
+            if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
+                os.mkfifo(PrependPath(
                     outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-            if(preservetime):
-                os.utime(PrependPath(outdir, listarrayfiles['ffilelist'][lcfi]['fname']), (
-                    listarrayfiles['ffilelist'][lcfi]['fatime'], listarrayfiles['ffilelist'][lcfi]['fmtime']))
-        if(listarrayfiles['ffilelist'][lcfi]['ftype'] == 6 and hasattr(os, "mkfifo")):
-            os.mkfifo(PrependPath(
-                outdir, listarrayfiles['ffilelist'][lcfi]['fname']), listarrayfiles['ffilelist'][lcfi]['fchmode'])
-        lcfi = lcfi + 1
+            if(returnfp):
+                fplist.append(listarrayfiles['ffilelist'][lcfi]['fp'])
+            lcfi = lcfi + 1
     if(returnfp):
-        return listarrayfiles['ffilelist']['fp']
+        return fplist
     else:
         return True
 
@@ -11895,7 +11907,7 @@ __version_date_info__ = (2026, 1, 23, "RC 1", 1)
 __version_date__ = str(__version_date_info__[0])+"."+str(__version_date_info__[
     1]).zfill(2)+"."+str(__version_date_info__[2]).zfill(2)
 __revision__ = __version_info__[3]
-__revision_id__ = "$Id: 4b086b80d2e6455232a175c7074886caa6d1dff4 $"
+__revision_id__ = "$Id: 28cf85ee56dff68917635a26b6aa12cbe5e348e2 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-"+str(__version_date_info__[4])

{pycatfile-0.28.4 → pycatfile-0.28.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
     name = "PyCatFile"
-    version = "0.28.4"
+    version = "0.28.6"
     readme = "README.md"
     license = { text = "BSD-3-Clause" }
     keywords = []