PyCatFile 0.14.14__tar.gz → 0.14.18__tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.14
+Version: 0.14.18
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.18}/PyCatFile.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCatFile
-Version: 0.14.14
+Version: 0.14.18
 Summary: A tar like file format name catfile after unix cat command (concatenate files) .
 Home-page: https://github.com/GameMaker2k/PyCatFile
 Download-URL: https://github.com/GameMaker2k/PyCatFile/archive/master.tar.gz

{pycatfile-0.14.14 → pycatfile-0.14.18}/catfile.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: catfile.py - ast Update: 10/22/2024 Ver. 0.14.2 RC 1 - Author: cooldude2k $
+    $FileInfo: catfile.py - Last Update: 12/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

{pycatfile-0.14.14 → pycatfile-0.14.18}/neocatfile.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: neocatfile.py - ast Update: 10/22/2024 Ver. 0.14.2 RC 1 - Author: cooldude2k $
+    $FileInfo: neocatfile.py - Last Update: 12/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes

{pycatfile-0.14.14 → pycatfile-0.14.18}/pycatfile.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: pycatfile.py - Last Update: 12/3/2024 Ver. 0.14.14 RC 1 - Author: cooldude2k $
+    $FileInfo: pycatfile.py - Last Update: 12/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
 '''
 
 from __future__ import absolute_import, division, print_function, unicode_literals, generators, with_statement, nested_scopes
@@ -303,12 +303,12 @@ __file_format_dict__ = {'format_name': __file_format_name__, 'format_magic': __f
                         'format_delimiter': __file_format_delimiter__, 'format_ver': __file_format_ver__, 'new_style': __use_new_style__, 'use_advanced_list': __use_advanced_list__, 'use_alt_inode': __use_alt_inode__}
 __project__ = __program_name__
 __project_url__ = "https://github.com/GameMaker2k/PyCatFile"
-__version_info__ = (0, 14, 14, "RC 1", 1)
-__version_date_info__ = (2024, 12, 3, "RC 1", 1)
+__version_info__ = (0, 14, 18, "RC 1", 1)
+__version_date_info__ = (2024, 12, 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: 3ddc69234c08a55463f598d89770c82c7cdf2f9b $"
+__revision_id__ = "$Id: c90abbff71adacac4de6eafc28f0cff10ced1e38 $"
 if(__version_info__[4] is not None):
     __version_date_plusrc__ = __version_date__ + \
         "-" + str(__version_date_info__[4])
@@ -519,22 +519,28 @@ def VerbosePrintOutReturn(dbgtxt, outtype="log", dbgenable=True, dgblevel=20):
 
 
 def RemoveWindowsPath(dpath):
-    if(dpath is None):
+    """
+    Normalizes a path by converting Windows-style separators to Unix-style and stripping trailing slashes.
+    """
+    if dpath is None:
         dpath = ""
-    if(os.sep != "/"):
+    if os.sep != "/":
         dpath = dpath.replace(os.path.sep, "/")
     dpath = dpath.rstrip("/")
-    if(dpath == "." or dpath == ".."):
+    if dpath in [".", ".."]:
         dpath = dpath + "/"
     return dpath
 
 
 def NormalizeRelativePath(inpath):
+    """
+    Ensures the path is relative unless it is absolute. Prepares consistent relative paths.
+    """
     inpath = RemoveWindowsPath(inpath)
-    if(os.path.isabs(inpath)):
+    if os.path.isabs(inpath):
         outpath = inpath
     else:
-        if(inpath.startswith("./") or inpath.startswith("../")):
+        if inpath.startswith("./") or inpath.startswith("../"):
             outpath = inpath
         else:
             outpath = "./" + inpath
@@ -557,53 +563,94 @@ def PrependPath(base_dir, child_path):
         return base_dir + child_path.lstrip('/')
 
 
-def ListDir(dirpath, followlink=False, duplicates=False):
-    if isinstance(dirpath, (list, tuple, )):
+def ListDir(dirpath, followlink=False, duplicates=False, include_regex=None, exclude_regex=None):
+    """
+    Simplified directory listing function with regex support for inclusion and exclusion.
+    Compatible with Python 2 and 3.
+
+    Parameters:
+        dirpath (str or list): A string or list of directory paths to process.
+        followlink (bool): Whether to follow symbolic links (default: False).
+        duplicates (bool): Whether to include duplicate paths (default: False).
+        include_regex (str): Regex pattern to include matching files/directories (default: None).
+        exclude_regex (str): Regex pattern to exclude matching files/directories (default: None).
+
+    Returns:
+        list: A list of files and directories matching the criteria.
+    """
+    if isinstance(dirpath, (list, tuple)):
         dirpath = list(filter(None, dirpath))
-    elif isinstance(dirpath, str):
+    elif isinstance(dirpath, basestring):
         dirpath = list(filter(None, [dirpath]))
     retlist = []
-    fs_encoding = sys.getfilesystemencoding()
+    fs_encoding = sys.getfilesystemencoding() or 'utf-8'
+    include_pattern = re.compile(include_regex) if include_regex else None
+    exclude_pattern = re.compile(exclude_regex) if exclude_regex else None
     for mydirfile in dirpath:
         if not os.path.exists(mydirfile):
             return False
         mydirfile = NormalizeRelativePath(mydirfile)
-        if os.path.exists(mydirfile) and os.path.islink(mydirfile):
+        if os.path.exists(mydirfile) and os.path.islink(mydirfile) and followlink:
             mydirfile = RemoveWindowsPath(os.path.realpath(mydirfile))
         if os.path.exists(mydirfile) and os.path.isdir(mydirfile):
             for root, dirs, filenames in os.walk(mydirfile):
-                dpath = root
-                dpath = RemoveWindowsPath(dpath)
-                if fs_encoding != 'utf-8':
-                    dpath = dpath.encode(fs_encoding).decode('utf-8')
-                if dpath not in retlist and not duplicates:
-                    retlist.append(dpath)
-                if duplicates:
-                    retlist.append(dpath)
+                dpath = RemoveWindowsPath(root)
+                if not isinstance(dpath, basestring):
+                    dpath = dpath.decode(fs_encoding)
+                # Apply regex filtering for directories
+                if ((not include_pattern or include_pattern.search(dpath)) and
+                    (not exclude_pattern or not exclude_pattern.search(dpath))):
+                    if not duplicates and dpath not in retlist:
+                        retlist.append(dpath)
+                    elif duplicates:
+                        retlist.append(dpath)
                 for files in filenames:
                     fpath = os.path.join(root, files)
                     fpath = RemoveWindowsPath(fpath)
-                    if fs_encoding != 'utf-8':
-                        fpath = fpath.encode(fs_encoding).decode('utf-8')
-                    if fpath not in retlist and not duplicates:
-                        retlist.append(fpath)
-                    if duplicates:
-                        retlist.append(fpath)
+                    if not isinstance(fpath, basestring):
+                        fpath = fpath.decode(fs_encoding)
+                    # Apply regex filtering for files
+                    if ((not include_pattern or include_pattern.search(fpath)) and
+                        (not exclude_pattern or not exclude_pattern.search(fpath))):
+                        if not duplicates and fpath not in retlist:
+                            retlist.append(fpath)
+                        elif duplicates:
+                            retlist.append(fpath)
         else:
             path = RemoveWindowsPath(mydirfile)
-            if fs_encoding != 'utf-8':
-                path = path.encode(fs_encoding).decode('utf-8')
-            retlist.append(path)
+            if not isinstance(path, basestring):
+                path = path.decode(fs_encoding)
+
+            # Apply regex filtering for single paths
+            if ((not include_pattern or include_pattern.search(path)) and
+                (not exclude_pattern or not exclude_pattern.search(path))):
+                retlist.append(path)
     return retlist
 
 
-def ListDirAdvanced(dirpath, followlink=False, duplicates=False):
-    if isinstance(dirpath, (list, tuple, )):
+def ListDirAdvanced(dirpath, followlink=False, duplicates=False, include_regex=None, exclude_regex=None):
+    """
+    Advanced directory listing function with regex support for inclusion and exclusion.
+    Compatible with Python 2 and 3.
+
+    Parameters:
+        dirpath (str or list): A string or list of directory paths to process.
+        followlink (bool): Whether to follow symbolic links (default: False).
+        duplicates (bool): Whether to include duplicate paths (default: False).
+        include_regex (str): Regex pattern to include matching files/directories (default: None).
+        exclude_regex (str): Regex pattern to exclude matching files/directories (default: None).
+
+    Returns:
+        list: A list of files and directories matching the criteria.
+    """
+    if isinstance(dirpath, (list, tuple)):
         dirpath = list(filter(None, dirpath))
-    elif isinstance(dirpath, str):
+    elif isinstance(dirpath, basestring):
         dirpath = list(filter(None, [dirpath]))
     retlist = []
-    fs_encoding = sys.getfilesystemencoding()
+    fs_encoding = sys.getfilesystemencoding() or 'utf-8'
+    include_pattern = re.compile(include_regex) if include_regex else None
+    exclude_pattern = re.compile(exclude_regex) if exclude_regex else None
     for mydirfile in dirpath:
         if not os.path.exists(mydirfile):
             return False
@@ -612,30 +659,41 @@ def ListDirAdvanced(dirpath, followlink=False, duplicates=False):
             mydirfile = RemoveWindowsPath(os.path.realpath(mydirfile))
         if os.path.exists(mydirfile) and os.path.isdir(mydirfile):
             for root, dirs, filenames in os.walk(mydirfile):
-                # Sort dirs and filenames alphabetically in place
+                # Sort directories and files
                 dirs.sort(key=lambda x: x.lower())
                 filenames.sort(key=lambda x: x.lower())
                 dpath = RemoveWindowsPath(root)
-                if fs_encoding != 'utf-8':
-                    dpath = dpath.encode(fs_encoding).decode('utf-8')
-                if not duplicates and dpath not in retlist:
-                    retlist.append(dpath)
-                elif duplicates:
-                    retlist.append(dpath)
+                if not isinstance(dpath, basestring):
+                    dpath = dpath.decode(fs_encoding)
+                # Apply regex filtering for directories
+                if ((not include_pattern or include_pattern.search(dpath)) and
+                    (not exclude_pattern or not exclude_pattern.search(dpath))):
+                    if not duplicates and dpath not in retlist:
+                        retlist.append(dpath)
+                    elif duplicates:
+                        retlist.append(dpath)
                 for files in filenames:
                     fpath = os.path.join(root, files)
                     fpath = RemoveWindowsPath(fpath)
-                    if fs_encoding != 'utf-8':
-                        fpath = fpath.encode(fs_encoding).decode('utf-8')
-                    if not duplicates and fpath not in retlist:
-                        retlist.append(fpath)
-                    elif duplicates:
-                        retlist.append(fpath)
+                    if not isinstance(fpath, basestring):
+                        fpath = fpath.decode(fs_encoding)
+
+                    # Apply regex filtering for files
+                    if ((not include_pattern or include_pattern.search(fpath)) and
+                        (not exclude_pattern or not exclude_pattern.search(fpath))):
+                        if not duplicates and fpath not in retlist:
+                            retlist.append(fpath)
+                        elif duplicates:
+                            retlist.append(fpath)
         else:
             path = RemoveWindowsPath(mydirfile)
-            if fs_encoding != 'utf-8':
-                path = path.encode(fs_encoding).decode('utf-8')
-            retlist.append(path)
+            if not isinstance(path, basestring):
+                path = path.decode(fs_encoding)
+            # Apply regex filtering for single paths
+            if ((not include_pattern or include_pattern.search(path)) and
+                (not exclude_pattern or not exclude_pattern.search(path))):
+                retlist.append(path)
+
     return retlist
 
 
@@ -3504,6 +3562,18 @@ def CompressOpenFile(outfile, compressionenable=True, compressionlevel=None):
     return outfp
 
 
+def makedevalt(major, minor):
+    """
+    Replicates os.makedev functionality to create a device number.
+    :param major: Major device number
+    :param minor: Minor device number
+    :return: Device number
+    """
+    # The device number is typically represented as:
+    # (major << 8) | minor
+    return (major << 8) | minor
+
+
 def GetDevMajorMinor(fdev):
     retdev = []
     if(hasattr(os, "minor")):
@@ -4015,7 +4085,10 @@ def PackArchiveFileFromTarFile(infile, outfile, compression="auto", compresswhol
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = member.linkname
-        fdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
+        try:
+            fdev = format(int(os.makedev(member.devmajor, member.devminor)), 'x').lower()
+        except AttributeError:
+            fdev = format(int(makedevalt(member.devmajor, member.devminor)), 'x').lower()
         fdev_minor = format(int(member.devminor), 'x').lower()
         fdev_major = format(int(member.devmajor), 'x').lower()
         if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):
@@ -6534,7 +6607,10 @@ def TarFileToArrayAlt(infile, listonly=False, contentasfile=True, checksumtype="
         curfid = curfid + 1
         if(ftype == 2):
             flinkname = member.linkname
-        fdev = os.makedev(member.devmajor, member.devminor)
+        try:
+            fdev = os.makedev(member.devmajor, member.devminor)
+        except AttributeError:
+            fdev = makedevalt(member.devmajor, member.devminor)
         fdev_minor = member.devminor
         fdev_major = member.devmajor
         if(ftype == 1 or ftype == 2 or ftype == 3 or ftype == 4 or ftype == 5 or ftype == 6):

{pycatfile-0.14.14 → pycatfile-0.14.18}/setup.py

@@ -13,7 +13,7 @@
     Copyright 2016-2024 Game Maker 2k - http://intdb.sourceforge.net/
     Copyright 2016-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski
 
-    $FileInfo: setup.py - Last Update: 10/22/2024 Ver. 0.14.0 RC 1 - Author: cooldude2k $
+    $FileInfo: setup.py - Last Update: 12/4/2024 Ver. 0.14.18 RC 1 - Author: cooldude2k $
 '''
 
 import os