atomicshop 2.6.11__py3-none-any.whl → 2.6.12__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.6.11'
+__version__ = '2.6.12'

atomicshop/archiver/search_in_archive.py

@@ -1,12 +1,19 @@
 import os
 import zipfile
 from io import BytesIO
+from typing import Union
 
 from . import zip, sevenz
+from ..print_api import print_api
 
 import py7zr
 
 
+# Custom exception if the file is not known archive type.
+class UnknownArchiveType(Exception):
+    pass
+
+
 def _get_unique_filename(directory, filename):
     """
     Generates a unique filename by appending a number if the file already exists.
@@ -21,14 +28,15 @@ def _get_unique_filename(directory, filename):
 
 
 def _is_zip_file(file, zip_obj):
-    try:
-        with zip_obj.open(file) as file_data:
-            with zipfile.ZipFile(BytesIO(file_data.read())) as zip_file:
-                if zip_file.testzip() is None:  # No errors found
-                    return True
-    except zipfile.BadZipFile:
-        return False
-    return False
+    with zip_obj.open(file) as file_data:
+        with BytesIO(file_data.read()) as file_data_bytes_io:
+            return zip.is_zip_zipfile(file_data_bytes_io)
+
+
+def _is_7z_file(file, sevenz_obj):
+    with sevenz_obj.open(file) as file_data:
+        with BytesIO(file_data.read()) as file_data_bytes_io:
+            return sevenz.is_7z(file_data_bytes_io)
 
 
 def _match_file_name(target, current, case_sensitive):
@@ -38,18 +46,6 @@ def _match_file_name(target, current, case_sensitive):
         return current.lower().endswith(target.lower())
 
 
-def _handle_nested_zip(
-        zip_obj, item, archived_file_bytes, file_names, results, found_set, recursive, return_first_only,
-        case_sensitive, callback_functions, extract_file_to_path):
-
-    if recursive and _is_zip_file(item.filename, zip_obj):
-        nested_zip_bytes = BytesIO(archived_file_bytes)
-        with zipfile.ZipFile(nested_zip_bytes) as nested_zip:
-            _search_in_archive(
-                nested_zip, file_names, results, found_set, case_sensitive, return_first_only, recursive,
-                callback_functions, extract_file_to_path)
-
-
 def _handle_file_extraction(item, extract_file_to_path, archived_file_bytes):
     if extract_file_to_path:
         unique_filename = _get_unique_filename(extract_file_to_path, os.path.basename(item.filename))
@@ -113,7 +109,9 @@ def _search_in_archive(
     elif archive_type == '7z':
         file_info_list = arch_obj.list()
 
-    for item in file_info_list:
+    for item_index, item in enumerate(file_info_list):
+        if item_index == 16:
+            pass
         if item.filename.endswith('/'):  # Skip directories
             continue
 
@@ -133,9 +131,10 @@ def _search_in_archive(
         if callback_matched:
             _handle_file_extraction(item, extract_file_to_path, archived_file_bytes)
         else:
-            _handle_nested_zip(
-                arch_obj, item, archived_file_bytes, file_names, results, found_set, recursive, return_first_only,
-                case_sensitive, callback_functions, extract_file_to_path)
+            if recursive and (_is_zip_file(item.filename, arch_obj) or _is_7z_file(item.filename, arch_obj)):
+                _search_archive_content(
+                    archived_file_bytes, file_names, results, found_set, case_sensitive, return_first_only,
+                    recursive, callback_functions, extract_file_to_path)
             if file_names and not callback_matched:
                 _handle_name_matching(
                     item, archived_file_bytes, file_names, case_sensitive, results, found_set, return_first_only)
@@ -151,45 +150,51 @@ def _initialize_results(callback_functions):
         return {}
 
 
-def _open_archive(archive_type, file_like_object):
-    if archive_type == 'zip':
-        return zipfile.ZipFile(file_like_object, 'r')
-    elif archive_type == '7z':
-        return py7zr.SevenZipFile(file_like_object, 'r')
+def _get_archive_type(file_object) -> Union[str, None]:
+    if zip.is_zip_zipfile(file_object):
+        return 'zip'
+    elif sevenz.is_7z(file_object):
+        return '7z'
     else:
-        raise ValueError("Unsupported archive format.")
-
-
-def _get_archive_type(file_path, file_bytes) -> tuple:
-    if file_bytes is not None:
-        file_like_object = BytesIO(file_bytes)
-    elif file_path is not None:
-        file_like_object = file_path
-    else:
-        raise ValueError("Either file_path or file_bytes must be provided.")
-
-    if zip.is_zip_zipfile(file_path=file_like_object):
-        return 'zip', file_like_object
-    elif sevenz.is_7z(file_path=file_like_object):
-        return '7z', file_like_object
-    else:
-        raise ValueError("Unsupported archive format.")
+        raise UnknownArchiveType(f"{file_object[:10]} is not a known archive type.")
+        # print_api(f"{file_object[:10]} is not a known archive type.", color='yellow')
+        # return None
 
 
 def _search_archive_content(
-        file_path, file_bytes, file_names_to_search, results, found_set, case_sensitive, return_first_only, recursive,
+        file_object, file_names_to_search, results, found_set, case_sensitive, return_first_only, recursive,
         callback_functions, extract_file_to_path):
 
-    archive_type, file_like_object = _get_archive_type(file_path, file_bytes)
+    archive_type = _get_archive_type(file_object)
 
-    with _open_archive(archive_type, file_like_object) as archive_ref:
-        _search_in_archive(archive_ref, archive_type, file_names_to_search, results, found_set, case_sensitive, return_first_only,
-                           recursive, callback_functions, extract_file_to_path)
+    if isinstance(file_object, str):
+        if archive_type == 'zip':
+            with zipfile.ZipFile(file_object, 'r') as archive_ref:
+                _search_in_archive(
+                    archive_ref, archive_type, file_names_to_search, results, found_set, case_sensitive,
+                    return_first_only, recursive, callback_functions, extract_file_to_path)
+        elif archive_type == '7z':
+            with py7zr.SevenZipFile(file_object, 'r') as archive_ref:
+                _search_in_archive(
+                    archive_ref, archive_type, file_names_to_search, results, found_set, case_sensitive,
+                    return_first_only, recursive, callback_functions, extract_file_to_path)
+    elif isinstance(file_object, bytes):
+        if archive_type == 'zip':
+            with BytesIO(file_object) as file_like_object:
+                with zipfile.ZipFile(file_like_object, 'r') as archive_ref:
+                    _search_in_archive(
+                        archive_ref, archive_type, file_names_to_search, results, found_set, case_sensitive,
+                        return_first_only, recursive, callback_functions, extract_file_to_path)
+        elif archive_type == '7z':
+            with BytesIO(file_object) as file_like_object:
+                with py7zr.SevenZipFile(file_like_object, 'r') as archive_ref:
+                    _search_in_archive(
+                        archive_ref, archive_type, file_names_to_search, results, found_set, case_sensitive,
+                        return_first_only, recursive, callback_functions, extract_file_to_path)
 
 
 def search_file_in_archive(
-        file_path: str = None,
-        file_bytes: bytes = None,
+        file_object: Union[str, bytes] = None,
         file_names_to_search: list[str] = None,
         case_sensitive: bool = True,
         return_first_only: bool = False,
@@ -201,8 +206,9 @@ def search_file_in_archive(
     """
     Function searches for the file names inside the zip file and returns a dictionary where the keys are the
     names of the callback functions and the values are lists of found file bytes.
-    :param file_path: string, full path to the zip file.
-    :param file_bytes: bytes, the bytes of the zip file.
+    :param file_object: it can be two types:
+        string, full path to the zip file.
+        bytes, the bytes of the zip file.
     :param file_names_to_search: list of strings, the names of the files to search.
     :param case_sensitive: boolean, default is 'True'. Determines if file name search should be case sensitive.
     :param return_first_only: boolean, default is 'False'. Return only the first found file for each file name.
@@ -224,7 +230,7 @@ def search_file_in_archive(
     found_set = set()
 
     _search_archive_content(
-        file_path, file_bytes, file_names_to_search, results, found_set, case_sensitive, return_first_only, recursive,
+        file_object, file_names_to_search, results, found_set, case_sensitive, return_first_only, recursive,
         callback_functions, extract_file_to_path)
 
     if not return_empty_list_per_file_name:

atomicshop/archiver/sevenz.py

@@ -1,16 +1,37 @@
+from io import BytesIO
+from typing import Union
+
 import py7zr
 
 
-def is_7z(file_path: str) -> bool:
+def is_7z(file_object: Union[str, Union[bytes, BytesIO]]) -> bool:
     """
     Function checks if the file is a 7z file.
-    :param file_path: string, full path to the file.
+    :param file_object: can be two types:
+        string, full path to the file.
+        bytes or BytesIO, the bytes of the file.
     :return: boolean.
     """
 
-    try:
-        with py7zr.SevenZipFile(file_path) as archive:
-            archive.testzip()
-            return True
-    except py7zr.Bad7zFile:
+    if isinstance(file_object, (str, BytesIO)):
+        try:
+            with py7zr.SevenZipFile(file_object) as archive:
+                archive.testzip()
+                return True
+        except py7zr.Bad7zFile:
+            return False
+    elif isinstance(file_object, bytes):
+        return is_7z(BytesIO(file_object))
+
+
+def is_7z_magic_number(data):
+    # Check if the data is at least 6 bytes long
+    if len(data) < 6:
         return False
+
+    # 7z file signature (magic number)
+    # The signature is '7z' followed by 'BCAF271C'
+    seven_z_signature = b'7z\xBC\xAF\x27\x1C'
+
+    # Compare the first 6 bytes of the data with the 7z signature
+    return data.startswith(seven_z_signature)

atomicshop/archiver/zip.py

@@ -1,20 +1,27 @@
 import os
 import time
 import zipfile
+from io import BytesIO
+from typing import Union
 
 from .. import filesystem
 from ..print_api import print_api
 
 
-def is_zip_zipfile(file_path: str) -> bool:
+def is_zip_zipfile(file_object: Union[str, Union[bytes, BytesIO]]) -> bool:
     """
     Function checks if the file is a zip file.
-    :param file_path: string, full path to the file.
+    :param file_object: can be two types:
+        string, full path to the file.
+        bytes or BytesIO, the bytes of the file.
     :return: boolean.
     """
 
+    if isinstance(file_object, bytes):
+        file_object = BytesIO(file_object)
+
     try:
-        with zipfile.ZipFile(file_path) as zip_object:
+        with zipfile.ZipFile(file_object) as zip_object:
             zip_object.testzip()
             return True
     except zipfile.BadZipFile:

atomicshop/basics/classes.py

@@ -25,7 +25,7 @@ def create_empty_class():
     return dynamic_class
 
 
-def get_module_name_from_file_path(file_directory_path: str, file_path: str) -> str:
+def get_module_name_from_file_path(working_directory_path: str, file_path: str) -> str:
     """
     Function that extracts module name string from file path.
 
@@ -43,16 +43,18 @@ def get_module_name_from_file_path(file_directory_path: str, file_path: str) ->
     Returns:
         'modules.classes.filesystem'
 
-    :param file_directory_path: string, of file full path to working directory of the main script that need
+    :param working_directory_path: string, of file full path to working directory of the main script that need
         to call the import.
     :param file_path: string, of full file path to the module that needs ot be imported.
     :return: string, of module name.
     """
 
     # Removing suffix.
-    file_path_no_suffix = Path(file_path).stem
+    file_name_no_suffix = Path(file_path).stem
+    file_directory = str(Path(file_path).parent)
+    file_path_no_suffix = file_directory + os.sep + file_name_no_suffix
     # Removing the script directory.
-    path_without_script_directory = file_path_no_suffix.replace(file_directory_path + os.sep, '')
+    path_without_script_directory = file_path_no_suffix.replace(working_directory_path + os.sep, '')
     # Changing slashes to dots.
     module_name_string = path_without_script_directory.replace(os.sep, '.')
 

{atomicshop-2.6.11.dist-info → atomicshop-2.6.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.6.11
+Version: 2.6.12
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.6.11.dist-info → atomicshop-2.6.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=gP8qJqxJnpV4oYVnhjnF7B9Nskus6wWy0__6kb3YrHQ,123
+atomicshop/__init__.py,sha256=dE2EYYltz4iQcAdxQMIKwlWoWucAUIC128o-pjsvjVo,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
 atomicshop/appointment_management.py,sha256=N3wVGJgrqJfsj_lqiRfaL3FxMEe57by5Stzanh189mk,7263
@@ -62,15 +62,15 @@ atomicshop/addons/process_list/compiled/Win10x64/process_list.exp,sha256=VTph513
 atomicshop/addons/process_list/compiled/Win10x64/process_list.lib,sha256=n9c2MVPs3GBNoOQjMesAwzNpv5aFZsW8c-ADS7GYRhA,1886
 atomicshop/archiver/_search_in_zip.py,sha256=dd8qFSvIhcKmtnPj_uYNJFPmMwZp4tZys0kKgTw_ACw,8385
 atomicshop/archiver/archiver.py,sha256=BomnK7zT-nQXA1z0i2R2aTv8eu88wPx7tf2HtOdbmEc,1280
-atomicshop/archiver/search_in_archive.py,sha256=iciz5nbtr0m2pAbWQRR7fH1Z7q9NFxfwRv8Vy_MH6pM,9630
-atomicshop/archiver/sevenz.py,sha256=S90Nuc-Ay3spQBP-sZqasqoDIhJx331cPPyQ0uuylks,371
-atomicshop/archiver/zip.py,sha256=ZbVMEMD4xSvddQWWCf73B7wYePWt354Qk1kib5bA--4,13959
+atomicshop/archiver/search_in_archive.py,sha256=o8tQVm38tXhoE-VEnpAWtTjeqksUHtYcs5UqmdfH64Y,10269
+atomicshop/archiver/sevenz.py,sha256=YUxNoh3qf6NvTB2qdC0uAoFwQtJXbrnl4XNPlWAIaVw,1082
+atomicshop/archiver/zip.py,sha256=_JrLb-hjlzkxqjd7maUE8WsaiHx8kibsipCSUSGvIUQ,14208
 atomicshop/basics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/basics/ansi_escape_codes.py,sha256=WtIkm-BjSZS5J5irDUdAMBNvdX-qXFZcTX98jcBMpJE,3140
 atomicshop/basics/argparse_template.py,sha256=S-BIdKd45bmNdqO3Dj3yOxBgb0O90spZxG4OcnedBHw,5836
 atomicshop/basics/booleans.py,sha256=-4JnSQ1pSb6CNY_62wtHBW8NltjPJEKM-gYOxFujunA,1772
 atomicshop/basics/bytes_arrays.py,sha256=WvSRDhIGt1ywF95t-yNgpxLm1nlZUbM1Dz6QckcyE8Y,5915
-atomicshop/basics/classes.py,sha256=-l0dqbKKDc89ABQ_wvELJub8gWl_J2MTmCEBVmAbTfk,8426
+atomicshop/basics/classes.py,sha256=n5uhPOWIKBAv0xa3--n-oQYIS64s6hb6JGs_1HgW2cs,8558
 atomicshop/basics/dicts.py,sha256=sAoHvY-Rtt7QkwHzIKk1j2ZFmteIm9yFCxBGkTrpbdk,9030
 atomicshop/basics/dicts_nested.py,sha256=StYxYnYPa0SEJr1lmEwAv5zfERWWqoULeyG8e0zRAwE,4107
 atomicshop/basics/enumerations.py,sha256=41VVQYh_vnVapggxKg2IRU5e_EiMpZzX1n1mtxvoSzM,1364
@@ -208,8 +208,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.6.11.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.6.11.dist-info/METADATA,sha256=TTtKxMjD3QZcVKRBoIM1HzOxx368ij-6tsTmOZBtIY0,10311
-atomicshop-2.6.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-atomicshop-2.6.11.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.6.11.dist-info/RECORD,,
+atomicshop-2.6.12.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.6.12.dist-info/METADATA,sha256=41BiQAnqpRy_lqxzEXFjFc_jwlCzxswYwqQW3QIdPy0,10311
+atomicshop-2.6.12.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+atomicshop-2.6.12.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.6.12.dist-info/RECORD,,