PyArchiveFile 0.27.0__tar.gz → 0.27.2__tar.gz

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/PKG-INFO

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

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/PyArchiveFile.egg-info/PKG-INFO

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

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/PyArchiveFile.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
 archivefile.py
-archiveneofile.py
-neoarchivefile.py
 pyarchivefile.py
 pyproject.toml
 setup.cfg

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/archivefile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: archivefile.py - Last Update: 11/14/2025 Ver. 0.27.0 RC 1 - Author: cooldude2k $
+    $FileInfo: archivefile.py - Last Update: 11/15/2025 Ver. 0.27.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -170,11 +170,11 @@ if active_action:
                 tmpout = pyarchivefile.RePackArchiveFile(input_file, getargs.output, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.insecretkey, getargs.outsecretkey, False, getargs.verbose, False)
             else:
                 tmpout = pyarchivefile.PackArchiveFileFromInFile(
-                    input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.insecretkey, getargs.verbose, False)
+                    input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.outsecretkey, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
-            pyarchivefile.PackArchiveFile(getargs.input, getargs.output, getargs.text, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.insecretkey, getargs.verbose, False)
+            pyarchivefile.PackArchiveFile(getargs.input, getargs.output, getargs.text, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.outsecretkey, getargs.verbose, False)
     elif active_action == 'repack':
         if getargs.convert:
             checkcompressfile = pyarchivefile.CheckCompressionSubType(
@@ -183,7 +183,7 @@ if active_action:
                 pyarchivefile.RePackArchiveFile(input_file, getargs.output, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt,
                                             False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.insecretkey, getargs.outsecretkey, False, getargs.verbose, False)
             else:
-                pyarchivefile.PackArchiveFileFromInFile(input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.insecretkey, getargs.verbose, False)
+                pyarchivefile.PackArchiveFileFromInFile(input_file, getargs.output, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.outsecretkey, getargs.verbose, False)
             if(not tmpout):
                 sys.exit(1)
         else:
@@ -198,7 +198,7 @@ if active_action:
                 tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.insecretkey, getargs.outsecretkey, False, False)
             else:
                 tmpout = pyarchivefile.PackArchiveFileFromInFile(
-                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.insecretkey, False, False)
+                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.outsecretkey, False, False)
             if(not tmpout):
                 sys.exit(1)
             input_file = tempout
@@ -225,7 +225,7 @@ if active_action:
                 tmpout = pyarchivefile.RePackArchiveFile(input_file, tempout, "auto", getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, False, 0, 0, 0, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], getargs.skipchecksum, [], {}, fnamedict, getargs.insecretkey, getargs.outsecretkey, False, False, False)
             else:
                 tmpout = pyarchivefile.PackArchiveFileFromInFile(
-                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.insecretkey, False, False)
+                    input_file, tempout, __file_format_default__, getargs.compression, getargs.wholefile, getargs.level, pyarchivefile.compressionlistalt, [getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum, getargs.checksum], [], {}, fnamedict, getargs.outsecretkey, False, False)
             input_file = tempout
             if(not tmpout):
                 sys.exit(1)

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/pyarchivefile.py

@@ -14,7 +14,7 @@
     Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: pyarchivefile.py - Last Update: 11/14/2025 Ver. 0.27.0 RC 1 - Author: cooldude2k $
+    $FileInfo: pyarchivefile.py - Last Update: 11/15/2025 Ver. 0.27.2 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -47,11 +47,9 @@ except ImportError:
 
 try:
     from http.server import BaseHTTPRequestHandler, HTTPServer
-    from socketserver import TCPServer
     from urllib.parse import urlparse, parse_qs
 except ImportError:
     from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-    from SocketServer import TCPServer
     from urlparse import urlparse, parse_qs
 
 try:
@@ -657,12 +655,12 @@ __project__ = __program_name__
 __program_alt_name__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyArchiveFile"
 __project_release_url__ = __project_url__+"/releases/latest"
-__version_info__ = (0, 27, 0, "RC 1", 1)
-__version_date_info__ = (2025, 11, 14, "RC 1", 1)
+__version_info__ = (0, 27, 2, "RC 1", 1)
+__version_date_info__ = (2025, 11, 15, "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: 1cfe8ace647fdc1e6f8536a80322ea8257584b78 $"
+__revision_id__ = "$Id: 8fdff8949e2d0bce935d7cea2b59865dbf4911af $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -878,16 +876,14 @@ try:
     try:
         import compression.lzma as lzma
     except ImportError:
-        import lzma
+        try:
+            import lzma
+        except ImportError:
+            from backports import lzma
     compressionsupport.append("lzma")
     compressionsupport.append("xz")
 except ImportError:
-    try:
-        from backports import lzma
-        compressionsupport.append("lzma")
-        compressionsupport.append("xz")
-    except ImportError:
-        pass
+    pass
 try:
     try:
         import compression.zlib as zlib
@@ -6496,16 +6492,29 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
     advancedlist = __use_advanced_list__
     altinode = __use_alt_inode__
     infilelist = []
-    if(infiles == "-"):
+    if(not dirlistfromtxt and not isinstance(infiles, (list, tuple, )) and infiles == "-"):
         for line in PY_STDIN_TEXT:
             infilelist.append(line.strip())
         infilelist = list(filter(None, infilelist))
-    elif(infiles != "-" and dirlistfromtxt and os.path.exists(infiles) and (os.path.isfile(infiles) or infiles == os.devnull)):
-        if(not os.path.exists(infiles) or not os.path.isfile(infiles)):
-            return False
-        with UncompressFile(infiles, formatspecs, "r") as finfile:
-            for line in finfile:
-                infilelist.append(line.strip())
+    if(not dirlistfromtxt and isinstance(infiles, (list, tuple, )) and len(infiles)==1 and infiles[0] == "-"):
+        for line in PY_STDIN_TEXT:
+            infilelist.append(line.strip())
+        infilelist = list(filter(None, infilelist))
+    elif(dirlistfromtxt):
+        if(not isinstance(infiles, (list, tuple, ))):
+            infiles = [infiles]
+        if(isinstance(infiles, (list, tuple, ))):
+            for fileloc in infiles:
+                if(fileloc == "-"):
+                    for line in PY_STDIN_TEXT:
+                        infilelist.append(line.strip())
+                else:
+                    if(not os.path.exists(fileloc) or not os.path.isfile(fileloc)):
+                        return False
+                    else:
+                        with UncompressFile(fileloc, formatspecs, "r") as finfile:
+                            for line in finfile:
+                                infilelist.append(line.strip())
         infilelist = list(filter(None, infilelist))
     else:
         if(isinstance(infiles, (list, tuple, ))):
@@ -6841,7 +6850,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
     inodetofile = {}
     filetoinode = {}
     inodetoforminode = {}
-    if(infile == "-"):
+    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -6909,7 +6918,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
         fblocks = 0
         fflags = 0
         ftype = 0
-        if(member.isreg()):
+        if(member.isreg() or member.isfile()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 0
         elif(member.islnk()):
@@ -7067,7 +7076,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
     inodetofile = {}
     filetoinode = {}
     inodetoforminode = {}
-    if(infile == "-"):
+    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -7114,9 +7123,13 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
         ftype = 0
         if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
             ftype = 5
+        elif ((hasattr(member, "symlink") and member.symlink())):
+            ftype = 2
         else:
             ftype = 0
         flinkname = ""
+        if(ftype==2):
+            flinkname = zipfp.read(member.filename).decode("UTF-8")
         fcurfid = format(int(curfid), 'x').lower()
         fcurinode = format(int(curfid), 'x').lower()
         curfid = curfid + 1
@@ -7142,6 +7155,10 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
                 fmode = format(int(stat.S_IFDIR | 0x1ff), 'x').lower()
                 fchmode = stat.S_IMODE(int(stat.S_IFDIR | 0x1ff))
                 ftypemod = stat.S_IFMT(int(stat.S_IFDIR | 0x1ff))
+            elif ((hasattr(member, "symlink") and member.symlink()) or member.filename.endswith('/')):
+                fmode = format(int(stat.S_IFREG | 0x1b6), 'x').lower()
+                fchmode = stat.S_IMODE(int(stat.S_IFREG | 0x1b6))
+                ftypemod = stat.S_IFMT(int(stat.S_IFREG | 0x1b6))
             else:
                 fmode = format(int(stat.S_IFREG | 0x1b6), 'x').lower()
                 fchmode = stat.S_IMODE(int(stat.S_IFREG | 0x1b6))
@@ -7150,6 +7167,17 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
             fwinattributes = format(int(zipinfo.external_attr & 0xFFFF), 'x').lower()
             fmode = format(int((zipinfo.external_attr >> 16) & 0xFFFF), 'x').lower()
             prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
+            if(prefmode==0):
+                fmode = 0
+                prefmode = 0
+            else:
+                file_type = prefmode & 0xF000
+                if(file_type not in (stat.S_IFREG, stat.S_IFDIR, stat.S_IFLNK)):
+                    fmode = 0
+                    prefmode = 0
+                if((mode & 0x1FF) == 0):
+                    fmode = 0
+                    prefmode = 0
             if (prefmode == 0):
                 if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
                     fmode = format(int(stat.S_IFDIR | 0x1ff), 'x').lower()
@@ -7596,7 +7624,10 @@ else:
                 fpremode = int(stat.S_IFREG | 0x1b6)
             elif(member.is_directory):
                 fpremode = int(stat.S_IFDIR | 0x1ff)
-            fwinattributes = format(int(0), 'x').lower()
+            try:
+                fwinattributes = format(int(member.attributes & 0xFFFF), 'x').lower()
+            except AttributeError:
+                fwinattributes = format(int(0), 'x').lower()
             fcompression = ""
             fcsize = format(int(0), 'x').lower()
             flinkcount = 0
@@ -7632,6 +7663,13 @@ else:
                     int(stat.S_IMODE(int(stat.S_IFREG | 0x1b6))), 'x').lower()
                 ftypemod = format(
                     int(stat.S_IFMT(int(stat.S_IFREG | 0x1b6))), 'x').lower()
+            try:
+                ffullmode = member.posix_mode
+                fmode = format(int(ffullmode), 'x').lower()
+                fchmode = format(int(stat.S_IMODE(ffullmode)), 'x').lower()
+                ftypemod = format(int(stat.S_IFMT(ffullmode)), 'x').lower()
+            except AttributeError:
+                pass
             try:
                 fuid = format(int(os.getuid()), 'x').lower()
             except (KeyError, AttributeError):
@@ -10197,7 +10235,7 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_
         if(not fp):
             return False
         fp.seek(filestart, 0)
-    elif(infile == "-"):
+    elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
         fp = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
         fp.seek(filestart, 0)
@@ -11573,8 +11611,8 @@ def ArchiveFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipc
     return listarrayfiles
 
 
-def TarFileListFiles(infile, verbose=False, returnfp=False):
-    if(infile == "-"):
+def TarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -11634,7 +11672,7 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
         ffullmode = member.mode
         flinkcount = 0
         ftype = 0
-        if(member.isreg()):
+        if(member.isreg() or member.isfile()):
             ffullmode = member.mode + stat.S_IFREG
             ftype = 0
         elif(member.islnk()):
@@ -11689,8 +11727,12 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
         return True
 
 
+def TarFileListFile(infile, formatspecs=__file_format_multi_dict__, verbose=False, returnfp=False):
+    return TarFileListFiles(infile, formatspecs, verbose, returnfp)
+
+
 def ZipFileListFiles(infile, verbose=False, returnfp=False):
-    if(infile == "-"):
+    if(not isinstance(infile, (list, tuple, )) and infile == "-"):
         infile = MkTempFile()
         shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
         infile.seek(0, 0)
@@ -11721,35 +11763,59 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
     for member in sorted(zipfp.infolist(), key=lambda x: x.filename):
         zipinfo = zipfp.getinfo(member.filename)
         if(zipinfo.create_system == 0 or zipinfo.create_system == 10):
-            fwinattributes = int(zipinfo.external_attr)
+            fwinattributes = int(zipinfo.external_attr & 0xFFFF)
             if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
                 fmode = int(stat.S_IFDIR | 0x1ff)
-                fchmode = int(stat.S_IMODE(int(stat.S_IFDIR | 0x1ff)))
-                ftypemod = int(stat.S_IFMT(int(stat.S_IFDIR | 0x1ff)))
+                fchmode = stat.S_IMODE(int(stat.S_IFDIR | 0x1ff))
+                ftypemod = stat.S_IFMT(int(stat.S_IFDIR | 0x1ff))
+            elif ((hasattr(member, "symlink") and member.symlink()) or member.filename.endswith('/')):
+                fmode = int(stat.S_IFREG | 0x1b6)
+                fchmode = stat.S_IMODE(int(stat.S_IFREG | 0x1b6))
+                ftypemod = stat.S_IFMT(int(stat.S_IFREG | 0x1b6))
             else:
                 fmode = int(stat.S_IFREG | 0x1b6)
-                fchmode = int(stat.S_IMODE(fmode))
-                ftypemod = int(stat.S_IFMT(fmode))
+                fchmode = stat.S_IMODE(int(stat.S_IFREG | 0x1b6))
+                ftypemod = stat.S_IFMT(int(stat.S_IFREG | 0x1b6))
         elif(zipinfo.create_system == 3):
-            fwinattributes = int(0)
-            try:
-                fmode = int(zipinfo.external_attr)
-                fchmode = stat.S_IMODE(fmode)
-                ftypemod = stat.S_IFMT(fmode)
-            except OverflowError:
-                fmode = int(zipinfo.external_attr >> 16)
-                fchmode = stat.S_IMODE(fmode)
-                ftypemod = stat.S_IFMT(fmode)
+            fwinattributes = int(zipinfo.external_attr & 0xFFFF)
+            fmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
+            prefmode = int((zipinfo.external_attr >> 16) & 0xFFFF)
+            if(prefmode==0):
+                fmode = 0
+                prefmode = 0
+            else:
+                file_type = prefmode & 0xF000
+                if(file_type not in (stat.S_IFREG, stat.S_IFDIR, stat.S_IFLNK)):
+                    fmode = 0
+                    prefmode = 0
+                if((mode & 0x1FF) == 0):
+                    fmode = 0
+                    prefmode = 0
+            if (prefmode == 0):
+                if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
+                    fmode = int(stat.S_IFDIR | 0x1ff)
+                    prefmode = int(stat.S_IFDIR | 0x1ff)
+                    fchmode = stat.S_IMODE(prefmode)
+                    ftypemod = stat.S_IFMT(prefmode)
+                else:
+                    fmode = int(stat.S_IFREG | 0x1b6)
+                    prefmode = int(stat.S_IFREG | 0x1b6)
+                    fchmode = stat.S_IMODE(prefmode)
+                    ftypemod = stat.S_IFMT(prefmode)
+            fchmode = stat.S_IMODE(prefmode)
+            ftypemod = stat.S_IFMT(prefmode)
         else:
-            fwinattributes = int(0)
+            fwinattributes = int(zipinfo.external_attr & 0xFFFF)
             if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
                 fmode = int(stat.S_IFDIR | 0x1ff)
-                fchmode = int(stat.S_IMODE(int(stat.S_IFDIR | 0x1ff)))
-                ftypemod = int(stat.S_IFMT(int(stat.S_IFDIR | 0x1ff)))
+                prefmode = int(stat.S_IFDIR | 0x1ff)
+                fchmode = stat.S_IMODE(prefmode)
+                ftypemod = stat.S_IFMT(prefmode)
             else:
                 fmode = int(stat.S_IFREG | 0x1b6)
-                fchmode = int(stat.S_IMODE(fmode))
-                ftypemod = int(stat.S_IFMT(fmode))
+                prefmode = int(stat.S_IFREG | 0x1b6)
+                fchmode = stat.S_IMODE(prefmode)
+                ftypemod = stat.S_IFMT(prefmode)
         returnval.update({lcfi: member.filename})
         if(not verbose):
             VerbosePrintOut(member.filename)
@@ -11763,10 +11829,17 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
             if ((hasattr(member, "is_dir") and member.is_dir()) or member.filename.endswith('/')):
                 ftype = 5
                 permissionstr = "d" + permissionstr
+            elif ((hasattr(member, "symlink") and member.symlink())):
+                ftype = 2
+                permissionstr = "l" + permissionstr
             else:
                 ftype = 0
                 permissionstr = "-" + permissionstr
             printfname = member.filename
+            if(ftype==2):
+                flinkname = zipfp.read(member.filename).decode("UTF-8")
+            if(ftype==2):
+                printfname = member.filename + " -> " + flinkname
             try:
                 fuid = int(os.getuid())
             except (KeyError, AttributeError):
@@ -11809,6 +11882,10 @@ def ZipFileListFiles(infile, verbose=False, returnfp=False):
         return True
 
 
+def ZipFileListFile(infile, verbose=False, returnfp=False):
+    return ZipFileListFiles(infile, verbose, returnfp)
+
+
 if(not rarfile_support):
     def RarFileListFiles(infile, verbose=False, returnfp=False):
         return False
@@ -11936,6 +12013,11 @@ if(rarfile_support):
         else:
             return True
 
+
+def RarFileListFile(infile, verbose=False, returnfp=False):
+    return RarFileListFiles(infile, verbose, returnfp)
+
+
 if(not py7zr_support):
     def SevenZipFileListFiles(infile, verbose=False, returnfp=False):
         return False
@@ -11973,6 +12055,13 @@ if(py7zr_support):
                 fmode = int(stat.S_IFLNK | 0x1b6)
                 fchmode = int(stat.S_IMODE(int(stat.S_IFLNK | 0x1b6)))
                 ftypemod = int(stat.S_IFMT(int(stat.S_IFLNK | 0x1b6)))
+            try:
+                ffullmode = member.posix_mode
+                fmode = format(int(ffullmode), 'x').lower()
+                fchmode = format(int(stat.S_IMODE(ffullmode)), 'x').lower()
+                ftypemod = format(int(stat.S_IFMT(ffullmode)), 'x').lower()
+            except AttributeError:
+                pass
             returnval.update({lcfi: member.filename})
             if(not verbose):
                 VerbosePrintOut(member.filename)
@@ -12040,12 +12129,16 @@ if(py7zr_support):
             return True
 
 
+def SevenZipFileListFile(infile, verbose=False, returnfp=False):
+    return SevenZipFileListFiles(infile, verbose, returnfp)
+
+
 def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
     checkcompressfile = CheckCompressionSubType(infile, formatspecs, filestart, True)
     if(IsNestedDict(formatspecs) and checkcompressfile in formatspecs):
         formatspecs = formatspecs[checkcompressfile]
     if(checkcompressfile == "tarfile" and TarFileCheck(infile)):
-        return TarFileListFiles(infile, verbose, returnfp)
+        return TarFileListFiles(infile, formatspecs, verbose, returnfp)
     elif(checkcompressfile == "zipfile" and zipfile.is_zipfile(infile)):
         return ZipFileListFiles(infile, verbose, returnfp)
     elif(rarfile_support and checkcompressfile == "rarfile" and (rarfile.is_rarfile(infile) or rarfile.is_rarfile_sfx(infile))):
@@ -12059,6 +12152,10 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_multi_dict_
     return False
 
 
+def InFileListFile(infile, verbose=False, formatspecs=__file_format_multi_dict__, seektoend=False, newstyle=False, returnfp=False):
+    return InFileListFiles(infile, verbose, formatspecs, seektoend, newstyle, returnfp)
+
+
 def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
     outarray = MkTempFile()
     packform = PackArchiveFile(infiles, outarray, dirlistfromtxt, compression, compresswholefile,
@@ -12067,6 +12164,11 @@ def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compress
         outarray, seekstart, seekend, skipchecksum, formatspecs, seektoend, verbose, returnfp)
     return listarrayfiles
 
+
+def ListDirListFiles(infiles, dirlistfromtxt=False, compression="auto", compresswholefile=True, compressionlevel=None, followlink=False, seekstart=0, seekend=0, skipchecksum=False, checksumtype=["md5", "md5", "md5"], formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
+    return ListDirListFiles(infiles, dirlistfromtxt, compression, compresswholefile, compressionlevel, followlink, seekstart, seekend, skipchecksum, checksumtype, formatspecs, seektoend, verbose, returnfp)
+
+
 def detect_cwd(ftp, file_dir):
     """
     Test whether cwd into file_dir works. Returns True if it does,

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/pyproject.toml

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

{pyarchivefile-0.27.0 → pyarchivefile-0.27.2}/setup.py

@@ -79,7 +79,7 @@ pymodule[
 pymodule['platforms'] = 'OS Independent'
 pymodule['zipsafe'] = True
 pymodule['pymodules'] = ['pyarchivefile']
-pymodule['scripts'] = ['archivefile.py', 'neoarchivefile.py', 'archiveneofile.py']
+pymodule['scripts'] = ['archivefile.py']
 pymodule['classifiers'] = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',

pyarchivefile-0.27.0/archiveneofile.py

@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-import sys, os, io, argparse
-
-try:
-    import pyarchivefile as P  # core must provide *_neo functions
-except Exception as e:
-    sys.stderr.write("Failed to import core module 'pyarchivefile': %s\n" % (e,))
-    sys.exit(2)
-
-
-def _expand_combined_short_opts(argv):
-    out = [argv[0]]
-    i = 1
-    while i < len(argv):
-        a = argv[i]
-        if a.startswith("--") or not (a.startswith("-") and len(a) > 2):
-            out.append(a); i += 1; continue
-        for ch in a[1:]:
-            out.append("-" + ch)
-        i += 1
-    return out
-
-
-def main():
-    argv = _expand_combined_short_opts(sys.argv)
-
-    p = argparse.ArgumentParser(
-        description="PyNeoFile CLI (uses pyarchivefile core)")
-    g = p.add_mutually_exclusive_group(required=True)
-    g.add_argument("-l", "--list", action="store_true", help="List archive")
-    g.add_argument("-e", "--extract", action="store_true", help="Extract archive")
-    g.add_argument("-c", "--create", action="store_true", help="Create archive from path")
-    g.add_argument("-r", "--repack", action="store_true", help="Repack (recompress) an archive")
-    g.add_argument("-E", "--empty", action="store_true", help="Create an empty archive")
-
-    p.add_argument("-i", "--input", help="Input file/path", nargs="*")
-    p.add_argument("-o", "--output", help="Output file/dir (or '-' for stdout)")
-    p.add_argument("-d", "--verbose", action="store_true", help="Verbose/detailed listing")
-    p.add_argument("-P", "--compression", default="auto", help="Compression algo (auto, none, zlib, gzip, bz2, lzma)")
-    p.add_argument("-L", "--level", type=int, default=None, help="Compression level/preset")
-    p.add_argument("--checksum", default="crc32", help="Checksum type for header/content/json (default: crc32)")
-
-    args = p.parse_args(argv[1:])
-
-    src = None
-    if args.input:
-        if isinstance(args.input, list) and len(args.input) == 1:
-            src = args.input[0]
-        elif isinstance(args.input, list) and len(args.input) > 1:
-            src = args.input[0]
-        else:
-            src = args.input
-
-    if args.empty:
-        dst = args.output or "-"
-        blob_or_true = P.make_empty_file_neo(dst, fmttype="auto", checksumtype=args.checksum, encoding="UTF-8", returnfp=False)
-        if dst in (None, "-"):
-            data = blob_or_true if isinstance(blob_or_true, (bytes, bytearray)) else b""
-            if hasattr(sys.stdout, "buffer"):
-                sys.stdout.buffer.write(data)
-            else:
-                sys.stdout.write(data.decode("latin1"))
-        return 0
-
-    if args.list:
-        if not src:
-            p.error("list requires -i <archive>")
-        P.archivefilelistfiles_neo(src, advanced=args.verbose, include_dirs=True)
-        return 0
-
-    if args.extract:
-        if not src:
-            p.error("extract requires -i <archive>")
-        outdir = args.output or "."
-        ok = P.unpack_neo(src, outdir, skipchecksum=False, uncompress=True)
-        return 0 if ok else 1
-
-    if args.create:
-        if not src:
-            p.error("create requires -i <path>")
-        if args.verbose:
-            walkroot = src
-            if os.path.isdir(walkroot):
-                print(walkroot)
-                for root, dirs, files in os.walk(walkroot):
-                    relroot = root if root.startswith("./") else "./" + root.replace("\\", "/")
-                    if root != walkroot:
-                        print(relroot)
-                    for name in sorted(files):
-                        path = os.path.join(root, name).replace("\\", "/")
-                        if not path.startswith("./"):
-                            path = "./" + path
-                        print(path)
-            else:
-                path = src if src.startswith("./") else "./" + src
-                print(path)
-
-        outpath = args.output or "-"
-        ok = P.pack_neo(src, outpath, checksumtypes=(args.checksum,args.checksum,args.checksum,args.checksum),
-                        encoding="UTF-8", compression=args.compression, compression_level=args.level)
-        if outpath in (None, "-") and isinstance(ok, (bytes, bytearray)):
-            if hasattr(sys.stdout, "buffer"):
-                sys.stdout.buffer.write(ok)
-            else:
-                sys.stdout.write(ok.decode("latin1"))
-            return 0
-        return 0 if ok else 1
-
-    if args.repack:
-        if not src:
-            p.error("repack requires -i <archive>")
-        outpath = args.output or "-"
-        ok = P.repack_neo(src, outpath, checksumtypes=(args.checksum,args.checksum,args.checksum,args.checksum),
-                          compression=args.compression, compression_level=args.level)
-        if outpath in (None, "-") and isinstance(ok, (bytes, bytearray)):
-            if hasattr(sys.stdout, "buffer"):
-                sys.stdout.buffer.write(ok)
-            else:
-                sys.stdout.write(ok.decode("latin1"))
-            return 0
-        return 0 if ok else 1
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

pyarchivefile-0.27.0/neoarchivefile.py

@@ -1,136 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-'''
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Revised BSD License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Revised BSD License for more details.
-
-    Copyright 2018-2024 Cool Dude 2k - http://idb.berlios.de/
-    Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/
-    Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
-
-    $FileInfo: neoarchivefile.py - Last Update: 8/26/2025 Ver. 0.21.4 RC 1 - Author: cooldude2k $
-'''
-
-from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
-import argparse
-import pyarchivefile
-
-__project__ = pyarchivefile.__project__
-__program_name__ = pyarchivefile.__program_name__
-__file_format_name__ = pyarchivefile.__file_format_name__
-__file_format_magic__ = pyarchivefile.__file_format_magic__
-__file_format_len__ = pyarchivefile.__file_format_len__
-__file_format_hex__ = pyarchivefile.__file_format_hex__
-__file_format_delimiter__ = pyarchivefile.__file_format_delimiter__
-__file_format_dict__ = pyarchivefile.__file_format_dict__
-__file_format_default__ = pyarchivefile.__file_format_default__
-__use_new_style__ = pyarchivefile.__use_new_style__
-__use_advanced_list__ = pyarchivefile.__use_advanced_list__
-__use_alt_inode__ = pyarchivefile.__use_alt_inode__
-__project_url__ = pyarchivefile.__project_url__
-__version_info__ = pyarchivefile.__version_info__
-__version_date_info__ = pyarchivefile.__version_date_info__
-__version_date__ = pyarchivefile.__version_date__
-__version_date_plusrc__ = pyarchivefile.__version_date_plusrc__
-__version__ = pyarchivefile.__version__
-
-# Compatibility layer for Python 2 and 3 input
-try:
-    input = raw_input
-except NameError:
-    pass
-
-# Determine if rar file support is enabled
-rarfile_support = pyarchivefile.rarfile_support
-py7zr_support = pyarchivefile.py7zr_support
-
-# Set up the argument parser
-argparser = argparse.ArgumentParser(
-    description="Manipulates archive files for various operations like creation, extraction, and validation.")
-argparser.add_argument("-V", "--version", action="version", version="{0} {1}".format(
-    __program_name__, __version__), help="Displays the program's version.")
-argparser.add_argument("-i", "--input", nargs="+", required=True,
-                       help="Specifies input file(s) for processing.")
-argparser.add_argument(
-    "-o", "--output", help="Specifies the output file name.")
-argparser.add_argument("-d", "--verbose", action="store_true",
-                       help="Enables verbose mode for detailed information.")
-argparser.add_argument("-c", "--create", action="store_true",
-                       help="Creates a new archive file from input.")
-argparser.add_argument("-e", "--extract", action="store_true",
-                       help="Extracts files from a archive archive.")
-argparser.add_argument("-l", "--list", action="store_true",
-                       help="Lists contents of a specified archive file.")
-argparser.add_argument("-r", "--repack", action="store_true",
-                       help="Repacks an existing archive file.")
-argparser.add_argument("-v", "--validate", action="store_true",
-                       help="Validates a archive file's integrity.")
-argparser.add_argument("--checksum", default="crc32",
-                       help="Specifies the checksum type (default: crc32).")
-argparser.add_argument("--compression", default="auto",
-                       help="Specifies the compression method (default: auto).")
-argparser.add_argument("--level", help="Specifies the compression level.")
-argparser.add_argument("--preserve", action="store_true",
-                       help="Preserves file attributes when extracting.")
-argparser.add_argument("--convert", choices=['tar', 'zip', '7zip', 'rar'],
-                       help="Convert from an archive format (tar, zip, 7zip, rar) to a archive file.")
-args = argparser.parse_args()
-
-# Determine the primary action based on user input
-primary_action = None
-if args.create:
-    primary_action = 'create'
-elif args.repack:
-    primary_action = 'repack'
-elif args.extract:
-    primary_action = 'extract'
-elif args.list:
-    primary_action = 'list'
-elif args.validate:
-    primary_action = 'validate'
-input_file = args.input[0]
-# Functionality mappings
-if primary_action == 'create':
-    if args.convert == 'tar':
-        pyarchivefile.PackArchiveFileFromTarFile(input_file, args.output, args.compression, args.level, pyarchivefile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [
-        ], pyarchivefile.__file_format_dict__, args.verbose, False)
-    elif args.convert == 'zip':
-        pyarchivefile.PackArchiveFileFromZipFile(input_file, args.output, args.compression, args.level, pyarchivefile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [
-        ], pyarchivefile.__file_format_dict__, args.verbose, False)
-    elif py7zr_support and args.convert == '7zip':
-        pyarchivefile.PackArchiveFileFromSevenZipFile(input_file, args.output, args.compression, args.level, pyarchivefile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [
-        ], pyarchivefile.__file_format_dict__, args.verbose, False)
-    elif rarfile_support and args.convert == 'rar':
-        pyarchivefile.PackArchiveFileFromRarFile(input_file, args.output, args.compression, args.level, pyarchivefile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], [
-        ], pyarchivefile.__file_format_dict__, args.verbose, False)
-    else:
-        pyarchivefile.PackArchiveFile(args.input, args.output, args.verbose, args.compression, args.level, pyarchivefile.compressionlistalt,
-                                  False, [args.checksum, args.checksum, args.checksum, args.checksum], [], {}, pyarchivefile.__file_format_dict__, args.verbose, False)
-elif primary_action == 'repack':
-    pyarchivefile.RePackArchiveFile(
-        input_file, args.output, args.compression, args.level, pyarchivefile.compressionlistalt, [args.checksum, args.checksum, args.checksum, args.checksum], False, args.verbose)
-elif primary_action == 'extract':
-    pyarchivefile.UnPackArchiveFile(
-        input_file, args.output, False, args.verbose, args.preserve)
-elif primary_action == 'list':
-    if args.convert == 'tar':
-        pyarchivefile.TarFileListFiles(input_file, verbose=args.verbose)
-    elif args.convert == 'zip':
-        pyarchivefile.ZipFileListFiles(input_file, verbose=args.verbose)
-    elif args.convert == '7zip':
-        pyarchivefile.SevenZipFileListFiles(input_file, verbose=args.verbose)
-    elif rarfile_support and args.convert == 'rar':
-        pyarchivefile.RarFileListFiles(input_file, verbose=args.verbose)
-    else:
-        pyarchivefile.ArchiveFileListFiles(input_file, verbose=args.verbose)
-elif primary_action == 'validate':
-    is_valid = pyarchivefile.ArchiveFileValidate(input_file, verbose=args.verbose)
-    result_msg = "Validation result for {0}: {1}".format(
-        input_file, 'Valid' if is_valid else 'Invalid')
-    print(result_msg)