anson.py3 0.2.2__tar.gz → 0.2.4__tar.gz

{anson_py3-0.2.2 → anson_py3-0.2.4}/.idea/workspace.xml

@@ -7,6 +7,7 @@
     <list default="true" id="8abd2f88-f467-4ea4-848e-e32bbaf197e2" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/anson/io/odysz/anson.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/anson/io/odysz/anson.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/res/__version__.bat" beforeDir="false" afterPath="$PROJECT_DIR$/test/res/__version__.bat" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

{anson_py3-0.2.2 → anson_py3-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anson.py3
-Version: 0.2.2
+Version: 0.2.4
 Summary: Anson for Python3
 Project-URL: Homepage, https://github.com/odys-z/antson
 Project-URL: Issues, https://github.com/odys-z/antson/issues

{anson_py3-0.2.2 → anson_py3-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "anson.py3"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
   { name="Ody Z", email="odys.zhou@gmail.com" },
 ]

{anson_py3-0.2.2 → anson_py3-0.2.4}/src/anson/io/odysz/common.py

@@ -126,6 +126,7 @@ class Utils:
         with open(file, 'r') as f:
             lines = f.readlines()
 
+        cnt = 0
         # updated_content = re.sub(pattern, repl, content)
         for i, line in enumerate(lines):
             updated = set()
@@ -134,6 +135,7 @@ class Utils:
                     lines[i] = re.sub(k, v, line)
                     updated.add(k)
                     print('Updated line:', lines[i])
+                    cnt += 1
 
                 if len(updated) == len(patterns):
                     break
@@ -141,7 +143,7 @@ class Utils:
         with open(file, 'w') as f:
             f.writelines(lines)
 
-        print('JAR version updated successfully.', file)
+        print(f'[{cnt / len(patterns)}] lines updated. Patterns updating finsiedh.', file)
 
         return None
 

anson_py3-0.2.4/src/anson/io/odysz/utils.py

@@ -0,0 +1,67 @@
+import fnmatch
+import os
+import re
+import zipfile
+
+
+def zip2(distzip, resources, exclude_patterns=[]):
+    """
+    example: zip2('registry-zsu.zip', {"zsu": "registry-deploy/*"}, ['*.zip'])
+    :param distzip:
+    :param resources:
+    :param exclude_patterns:
+    :return: None
+    """
+    def matches_patterns(filename, patterns):
+        """
+        Check if a filename matches any of the given patterns.
+
+        Args:
+            filename (str): The filename to check (e.g., "data.logs").
+            patterns (list): List of patterns (e.g., ["*.logs", "*.dat"]).
+
+        Returns:
+            bool: True if the filename matches any pattern, False otherwise.
+        """
+        return any(fnmatch.fnmatch(os.path.basename(filename), pattern) for pattern in patterns)
+
+    with zipfile.ZipFile(distzip, 'w', zipfile.ZIP_DEFLATED) as zipf:
+        err = False
+        # resources
+        for rk, rv in resources.items():
+            if "*" in rv:
+                count = 0
+                srcroot = re.sub('\\*$', '', rv.replace('\\', '/'))
+                for pth, _dir, fs in os.walk(srcroot):
+                    for file in fs:
+                        if not matches_patterns(file, exclude_patterns):
+                            file_path = os.path.join(pth, file)
+                            relative_path = os.path.relpath(file_path, srcroot)
+                            # print(file, file_path, pth, srcroot, relative_path)
+
+                            visited = set()
+                            while os.path.islink(file_path):
+                                if file_path in visited:
+                                    raise ValueError(f"Cycle detected in symbolic links at {relative_path}")
+                                visited.add(file_path)
+                                print(file_path, '->', os.path.realpath(file_path))
+                                file_path = os.path.realpath(file_path)
+
+                            relative_path = os.path.relpath(relative_path)
+                            arcname = os.path.join(rk, relative_path)
+                            zipf.write(file_path, arcname)
+                            count += 1
+                            print(f"Added to ZIP: {relative_path} as {arcname}")
+                if count == 0:
+                    err = True
+                    raise FileNotFoundError(f'[ERROR] No files found in {rv}.')
+            else:  # Handle single files (jserv.jar and exiftool.exe)
+                file = rk if rv == '.' else rv
+                if os.path.exists(file):
+                    zipf.write(file, rk)
+                    print(f"Added to ZIP: {file} as {rk}")
+                else:
+                    err = True
+                    raise FileNotFoundError(f"[ERROR]: Resource '{rk}': '{file}' not found.")
+
+    print(f'Created ZIP file successfully: {distzip}' if not err else 'Errors while making target (creaded zip file)')