osbot-utils 1.28.0__tar.gz → 1.29.0__tar.gz

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.28.0
+Version: 1.29.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.28.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.29.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/README.md

@@ -2,7 +2,7 @@
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v1.28.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.29.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/osbot_utils/helpers/Zip_Bytes.py

@@ -1,16 +1,20 @@
 from osbot_utils.base_classes.Type_Safe import Type_Safe
 from osbot_utils.utils.Dev import pprint
 from osbot_utils.utils.Files import files_list, file_create_from_bytes, temp_file, parent_folder, parent_folder_create
+from osbot_utils.utils.Regex import list__match_regex, list__match_regexes
 from osbot_utils.utils.Zip import zip_bytes_empty, zip_bytes__files, zip_bytes__add_file, zip_bytes__add_files, \
     zip_bytes__replace_files, zip_bytes__replace_file, zip_bytes__file_list, zip_bytes__file, \
-    zip_bytes__add_file__from_disk, zip_bytes__add_files__from_disk, zip_files, zip_file__files
+    zip_bytes__add_file__from_disk, zip_bytes__add_files__from_disk, zip_files, zip_file__files, zip_bytes__remove_files
 
 
 class Zip_Bytes(Type_Safe):
-    zip_bytes : bytes
+    zip_bytes : bytes = None
 
-    def __enter__(self):
+    def __init__(self):
+        super().__init__()
         self.zip_bytes = zip_bytes_empty()
+
+    def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -20,7 +24,9 @@ class Zip_Bytes(Type_Safe):
         self.zip_bytes = zip_bytes__add_file(self.zip_bytes, file_path, file_contents)
         return self
 
-    def add_file__from_disk(self, base_path, file_to_add):
+    def add_file__from_disk(self, file_to_add, base_path=None):
+        if base_path is None:
+            base_path = parent_folder(file_to_add)
         self.zip_bytes = zip_bytes__add_file__from_disk(self.zip_bytes, base_path, file_to_add)
         return self
 
@@ -28,14 +34,22 @@ class Zip_Bytes(Type_Safe):
         self.zip_bytes = zip_bytes__add_files(self.zip_bytes, files_to_add)
         return self
 
-    def add_files__from_disk(self, base_path, files_to_add):
-        self.zip_bytes = zip_bytes__add_files__from_disk(self.zip_bytes, base_path, files_to_add)
+    def add_files__from_disk(self, base_path, files_to_add, path_prefix=None):
+        self.zip_bytes = zip_bytes__add_files__from_disk(self.zip_bytes, base_path, files_to_add, path_prefix=path_prefix)
         return self
 
-    def add_folder__from_disk(self, base_path, folder_to_add, pattern="*"):
-        files_to_add = files_list(folder_to_add, pattern=pattern)
+    def add_folder__from_disk(self, folder_to_add, *patterns):
+        base_path           = folder_to_add
+        all_files_in_folder = files_list(folder_to_add)
+        files_to_add        = list__match_regexes(all_files_in_folder, *patterns)
         return self.add_files__from_disk(base_path, files_to_add)
 
+    def add_folder__from_disk__with_prefix(self, folder_to_add, path_prefix, *patterns):
+        base_path           = folder_to_add
+        all_files_in_folder = files_list(folder_to_add)
+        files_to_add        = list__match_regexes(all_files_in_folder, *patterns)
+        return self.add_files__from_disk(base_path, files_to_add, path_prefix=path_prefix)
+
     def add_from_zip_file(self, path_zip_file):
         files_to_add = zip_file__files(path_zip_file)
         self.add_files(files_to_add)
@@ -47,15 +61,27 @@ class Zip_Bytes(Type_Safe):
     def file(self, file_path):
         return zip_bytes__file(self.zip_bytes, file_path)
 
+    def file_paths(self):
+        return self.files_list()
+
     def files(self):
         return zip_bytes__files(self.zip_bytes)
 
     def files_list(self):
         return zip_bytes__file_list(self.zip_bytes)
 
+    def list(self):
+        return self.files_list()
+
     def print_files_list(self):
         pprint(self.files_list())
         return self
+
+    def remove_files(self, *patterns):
+        files_to_remove = list__match_regexes(self.files_list(), *patterns)
+        self.zip_bytes = zip_bytes__remove_files(self.zip_bytes, files_to_remove)
+        return self
+
     def replace_files(self, files_to_replace):
         self.zip_bytes = zip_bytes__replace_files(self.zip_bytes, files_to_replace)
         return self

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/osbot_utils/testing/Temp_Folder.py

@@ -96,6 +96,13 @@ class Temp_Folder:
         file_path = path_combine(self.full_path, target_file)
         return file_contents(file_path)
 
+    def files_contents(self):
+        result = {}
+        for file_path in self.files():
+            full_path         = path_combine(self.full_path, file_path)
+            result[file_path] = file_contents(full_path)
+        return result
+
     def files(self, show_parent_folder=False, include_folders=False):
         all_files = files_recursive(self.path(), include_folders=include_folders)
         if show_parent_folder:

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/osbot_utils/utils/Files.py

@@ -81,7 +81,7 @@ class Files:
         return glob.glob(path_pattern, recursive=recursive)
 
     @staticmethod
-    def files(path, pattern= '*.*', only_files=True):
+    def files(path, pattern= '*', only_files=True):
         result = []
         for file in Path(path).rglob(pattern):
             if only_files and is_not_file(file):

osbot_utils-1.29.0/osbot_utils/utils/Regex.py

@@ -0,0 +1,25 @@
+import re
+
+from osbot_utils.utils.Status import status_error
+
+
+def list__match_regex(target, pattern):
+    return list__match_regexes(target, [pattern])
+
+def list__match_regexes(target, *patterns):
+    if len (patterns) == 0:
+        return target
+    compiled_patterns = []
+    for pattern in patterns:
+        try:
+            compiled_patterns.append(re.compile(pattern))                           # todo: find better way to handle regex errors
+        except Exception as error:
+            return status_error(message='Error compiling pattern: {pattern}', error=error)
+    matched_files = []
+    if target and type(target) is list:
+        for file in target:
+            for compiled_pattern in compiled_patterns:
+                if compiled_pattern.match(file):
+                    matched_files.append(file)
+                    break
+    return matched_files

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/osbot_utils/utils/Zip.py

@@ -52,14 +52,17 @@ def zip_bytes__add_file(zip_bytes, zip_file_path, file_contents):
 def zip_bytes__add_file__from_disk(zip_bytes, base_path, file_to_add):
     return zip_bytes__add_files__from_disk(zip_bytes, base_path, files_to_add=[file_to_add])
 
-def zip_bytes__add_files__from_disk(zip_bytes, base_path, files_to_add, replace_files=True):
+def zip_bytes__add_files__from_disk(zip_bytes, base_path, files_to_add, replace_files=True, path_prefix=None):
     zip_files_to_add = {}
     if base_path[:-1] != '/':
         base_path += "/"
+
     for file_to_add in files_to_add:
         if file_exists(file_to_add):
             file_contents = file_contents_as_bytes(file_to_add)
             zip_file_path = file_to_add.replace(base_path, '')
+            if path_prefix:
+                zip_file_path = path_prefix + zip_file_path
             zip_files_to_add[zip_file_path] = file_contents
 
     if replace_files:

osbot_utils-1.29.0/osbot_utils/version

@@ -0,0 +1 @@
+v1.29.0

{osbot_utils-1.28.0 → osbot_utils-1.29.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v1.28.0"
+version     = "v1.29.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-1.28.0/osbot_utils/version

@@ -1 +0,0 @@
-v1.28.0