atomicshop 3.4.1__py3-none-any.whl → 3.5.0__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__ = '3.4.1'
+__version__ = '3.5.0'

atomicshop/mitm/recs_files.py

@@ -2,8 +2,9 @@ import datetime
 import os
 import multiprocessing
 import logging
+import zipfile
+import shutil
 
-from ..archiver import zips
 from .. import filesystem, print_api
 from .. wrappers.loggingw import consts, loggingw
 
@@ -13,6 +14,43 @@ REC_FILE_DATE_TIME_FORMAT: str = f'{consts.DEFAULT_ROTATING_SUFFIXES_FROM_WHEN["
 REC_FILE_DATE_FORMAT: str = REC_FILE_DATE_TIME_FORMAT.split('_')[0]
 
 
+def archive(
+        directory_path: str,
+        include_root_directory: bool = True,
+) -> str:
+    """
+    Function archives the directory.
+    :param directory_path: string, full path to the directory.
+    :param include_root_directory: boolean, default is 'True'.
+        'True': The root directory will be included in the archive.
+        'False': The root directory will not be included in the archive.
+        True is usually the case in most archiving utilities.
+    :return: string, full path to the archived file.
+    """
+
+    # This is commonly used and supported by most ZIP utilities.
+    compression_method = zipfile.ZIP_DEFLATED
+
+    archive_path: str = directory_path + '.zip'
+    with zipfile.ZipFile(archive_path, 'w', compression_method) as zip_object:
+        for root, _, files in os.walk(directory_path):
+            for file in files:
+                file_path = os.path.join(root, file)
+
+                # If including the root directory, use the relative path from the parent directory of the root
+                if include_root_directory:
+                    arcname = os.path.relpath(file_path, os.path.dirname(directory_path))
+                else:
+                    arcname = os.path.relpath(file_path, directory_path)
+
+                zip_object.write(file_path, arcname)
+
+    # Remove the original directory after archiving.
+    shutil.rmtree(directory_path, ignore_errors=True)
+
+    return archive_path
+
+
 def recs_archiver(
         recs_directory: str,
         logging_queue: multiprocessing.Queue,
@@ -83,8 +121,7 @@ def recs_archiver(
             archive_directories: list = filesystem.get_paths_from_directory(
                 directory_path.path, get_directory=True, recursive=False)
             for archive_directory in archive_directories:
-                archived_file: str = zips.archive_directory(
-                    archive_directory.path, remove_original=True, include_root_directory=True)
+                archived_file: str = archive(archive_directory.path, include_root_directory=True)
                 archived_files.append(archived_file)
 
         finalize_output_queue.put(None)

atomicshop/print_api.py

@@ -1,13 +1,14 @@
 import sys
 import logging
+from typing import Any
 
 from .basics import ansi_escape_codes
 from .basics import tracebacks
 
 
 def print_api(
-        message: any,
-        color: any = None,
+        message: Any,
+        color: Any = None,
         print_end: str = '\n',
         rtl: bool = False,
         error_type: bool = False,
@@ -73,7 +74,6 @@ def print_api(
 
     # Inner functions already get all the local variables of the main function.
     def print_or_logger():
-        from .wrappers.loggingw import loggingw
         nonlocal message
         nonlocal color
         nonlocal traceback_string
@@ -83,8 +83,6 @@ def print_api(
 
         # If 'rtl' is set to 'True', we'll add Right-To-Left text conversion to 'message'.
         if rtl:
-            # Lazy importing of 'bidi' library. It's not a problem since python caches the library after first import.
-            # Off-course, it will be imported from the cache each time this section is triggered.
             # pip install python-bidi
             from bidi.algorithm import get_display
             message = get_display(message)

atomicshop/web.py

@@ -7,8 +7,8 @@ import http.client
 
 # noinspection PyPackageRequirements
 import certifi
+from dkarchiver.arch_wrappers import zips
 
-from .archiver import zips
 from .urls import url_parser
 from .file_io import file_io
 from .wrappers.playwrightw import scenarios
@@ -301,7 +301,7 @@ def download_and_extract_file(
         Default is empty. If it is empty, then the filename will be extracted from 'file_url'.
     :param target_directory: string, target directory where to save the file.
     :param archive_remove_first_directory: boolean, sets if archive extract function will extract the archive without
-        first directory in the archive. Check reference in the 'extract_archive_with_zipfile' function.
+        first directory in the archive. Check reference in the 'dkarchiver.arch_wrappers.zips.extract_archive_with_zipfile' function.
     :param headers: dictionary, HTTP headers to use when downloading the file.
     :return:
     """
@@ -313,7 +313,7 @@ def download_and_extract_file(
     # Extract the archive and remove the first directory.
     zips.extract_archive_with_zipfile(
         archive_path=f'{file_path}', extract_directory=target_directory,
-        remove_first_directory=archive_remove_first_directory, **kwargs)
+        remove_first_directory=archive_remove_first_directory)
 
     # Remove the archive file.
     filesystem.remove_file(file_path=f'{file_path}', **kwargs)

atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py

@@ -1,8 +1,9 @@
 import os
 from pathlib import Path
 
+from dkarchiver.arch_wrappers import sevenz_app_w
+
 from . import tables
-from ....archiver import sevenz_app_w
 
 
 def resolve_directory_path(directory_info, directory_key):

atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py

@@ -1,11 +1,12 @@
 import os
 import argparse
 
+from dkarchiver.arch_wrappers import sevenz_app_w
+
 from .base import msi
 from . import base, tables, cabs
 from ... import olefilew
 from ....print_api import print_api
-from ....archiver import sevenz_app_w
 
 
 # Directory names.

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -1,10 +1,10 @@
-import sys
 import subprocess
 from pathlib import Path
 
+from dkarchiver.arch_wrappers import zips
+
 from .... import filesystem
 from ....permissions import ubuntu_permissions
-from ....archiver import zips
 from ....print_api import print_api
 from ... import githubw, pipw, ubuntu_terminal
 from ...dockerw import install_docker

atomicshop/wrappers/githubw.py

@@ -276,7 +276,7 @@ class GitHubWrapper:
         :param archive_remove_first_directory: boolean, available only if 'path' was not specified during the initialization
             Sets if archive extract function will extract the archive
             without first directory in the archive. Check reference in the
-            'archiver.zip.extract_archive_with_zipfile' function.
+            'dkarchiver.arch_wrappers.zips.extract_archive_with_zipfile' function.
         :param download_each_file: bool, available only if 'path' was specified during the initialization of the class.
             Sets if each file will be downloaded separately.
 
@@ -521,7 +521,7 @@ class GitHubWrapper:
         :param exclude_string: str, the string to exclude from the search. No wildcards can be used.
         :param archive_remove_first_directory: bool, sets if archive extract function will extract the archive
             without first directory in the archive. Check reference in the
-            'archiver.zip.extract_archive_with_zipfile' function.
+            'dkarchiver.arch_wrappers.zips.extract_archive_with_zipfile' function.
         :param kwargs: dict, the print arguments for the 'print_api' function.
         :return:
         """

atomicshop/wrappers/socketw/creator.py

@@ -62,7 +62,8 @@ def create_ssl_context_for_server(
 
         if not os.path.exists(sslkeylog_file_path):
             open(sslkeylog_file_path, "a").close()
-            ssl_context.keylog_filename = sslkeylog_file_path
+
+        ssl_context.keylog_filename = sslkeylog_file_path
 
     # If you must support old clients that only offer TLS_RSA_* suites under OpenSSL 3:
     if allow_legacy:

atomicshop/wrappers/socketw/sni.py

@@ -86,7 +86,9 @@ class SNISetup:
     ):
 
         # Create SSL Socket to wrap the raw socket with.
-        ssl_context: ssl.SSLContext = creator.create_ssl_context_for_server(allow_legacy=True)
+        ssl_context: ssl.SSLContext = creator.create_ssl_context_for_server(
+            allow_legacy=True, enable_sslkeylogfile_env_to_client_ssl_context=self.enable_sslkeylogfile_env_to_client_ssl_context,
+            sslkeylog_file_path=self.sslkeylog_file_path)
 
         self.certificator_instance = certificator.Certificator(
             ca_certificate_name=self.ca_certificate_name,

{atomicshop-3.4.1.dist-info → atomicshop-3.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.4.1
+Version: 3.5.0
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT
@@ -12,8 +12,9 @@ Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: wheel
-Requires-Dist: beautifulsoup4
+Requires-Dist: setuptools
 Requires-Dist: cryptography
+Requires-Dist: dkarchiver
 Requires-Dist: dkinst
 Requires-Dist: dnslib
 Requires-Dist: dnspython
@@ -31,16 +32,10 @@ Requires-Dist: pefile
 Requires-Dist: playwright
 Requires-Dist: protobuf
 Requires-Dist: psutil
-Requires-Dist: py7zr==0.22.0
-Requires-Dist: pyautogui
 Requires-Dist: pymongo
 Requires-Dist: pyopenssl
-Requires-Dist: python-bidi
 Requires-Dist: python-docx
-Requires-Dist: python-magic
 Requires-Dist: pywin32; platform_system == "Windows"
-Requires-Dist: reportlab
-Requires-Dist: setuptools
 Requires-Dist: SoundCard
 Requires-Dist: soundfile
 Requires-Dist: SpeechRecognition

{atomicshop-3.4.1.dist-info → atomicshop-3.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=2_vm_IGYQueXrDSwBdgjXn7kHxyeKqTdQmDo1JOD4_0,122
+atomicshop/__init__.py,sha256=Ym5LqQ0nxVmRpNT7f4YPuHzfVf7bivikNbri8tJsWYU,122
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -14,7 +14,6 @@ atomicshop/diff_check.py,sha256=vxTDccVbGZHEge6Ja9_ArLWwslOUgIoJAdYPylh4cZg,2717
 atomicshop/dns.py,sha256=XB0tijVi1bxWLWKV9hPzpt75jK4SrGbZCV5VJbiiQ74,7185
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
-atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
 atomicshop/filesystem.py,sha256=tCPRA6SQiJJkFL3BnPCoVhPCkvrkI2C4RyuSKzuxo1w,68060
 atomicshop/functions.py,sha256=pK8hoCE9z61PtWCxQJsda7YAphrLH1wxU5x-1QJP-sY,499
 atomicshop/get_process_list.py,sha256=8cxb7gKe9sl4R6H2yMi8J6oe-RkonTvCdKjRFqi-Fs4,6075
@@ -27,7 +26,7 @@ atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,
 atomicshop/networks.py,sha256=IfhEgI0rJHPgkbIDEC6lsPVZm-fyylpacKSo5HrIEic,26403
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
-atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
+atomicshop/print_api.py,sha256=RDEokUczRhfiZ13PROdD90jppB-y37alkmU9-gWaOEI,10713
 atomicshop/process.py,sha256=e8u7jvq5HDKqna7xmeqNTKFY4BQNKX6NtAUGPwur6zE,17288
 atomicshop/python_file_patcher.py,sha256=-uhbUX-um5k-If_XXuOfCr8wMzZ3QE6h9N8xGWw6W_o,5486
 atomicshop/python_functions.py,sha256=BPZ3sv5DgQs6Xrl3nIMdPABRpgrau3XSrsnDIz-LEwY,6175
@@ -48,7 +47,7 @@ atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/venvs.py,sha256=D9lwOoObkYoRx-weuoAmbvN-RdSHhVm4DE9TVl-utAs,903
 atomicshop/versioning.py,sha256=e5W6m9AF3__M5nntqI9CqNAeHqkwY9JhlnpYeZ1CEus,970
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
-atomicshop/web.py,sha256=mHWrHb-zl0NRg7oHBZr-0k66aTBmKLvanBzoCZ63Xks,14340
+atomicshop/web.py,sha256=xwERN-IBGAtux_KGhfRBrETpJqEcw5hcZyamLA1KupQ,14375
 atomicshop/websocket_parse.py,sha256=aLHWyKqaYqEn_MRBWm2L6rIl6QPmqbVrjEXE_rBzwCw,16711
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
@@ -72,13 +71,6 @@ atomicshop/addons/process_list/process_list.cpp,sha256=kcrltiJhzRc2HmKy2Yxdbj7mF
 atomicshop/addons/process_list/compiled/Win10x64/process_list.dll,sha256=rl74P7oh4UZyo3cILmtDFznurcHNRMrZ56tOTv5pJqk,276992
 atomicshop/addons/process_list/compiled/Win10x64/process_list.exp,sha256=cbvukITcmtGm5uwOIuq8bKCE_LXIHvkMfLJQpBrJk64,842
 atomicshop/addons/process_list/compiled/Win10x64/process_list.lib,sha256=T2Ncs0MwKlAaCq8UKFMvfQAfcJdDx-nWiHVBfglrLIU,2112
-atomicshop/archiver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/archiver/_search_in_zip.py,sha256=dd8qFSvIhcKmtnPj_uYNJFPmMwZp4tZys0kKgTw_ACw,8385
-atomicshop/archiver/search_in_archive.py,sha256=iDIWS9G2pdz6QxGawGQJ1RSl33gdIRjpYrnP0brIDgU,12450
-atomicshop/archiver/sevenz_app_w.py,sha256=BWcJb4f7jZEiETDBKyNLE0f5YLFPQx6B91_ObEIXWf8,3007
-atomicshop/archiver/sevenzs.py,sha256=b9rI-nF36ZNawwKsPWOgsnm0p-jYDfD1NYV3eA8LoQ0,2491
-atomicshop/archiver/shutils.py,sha256=BomnK7zT-nQXA1z0i2R2aTv8eu88wPx7tf2HtOdbmEc,1280
-atomicshop/archiver/zips.py,sha256=0Z_1MWs7YRiCBVpyaG8llnzRguHSO4R51KDMN3FJZt8,16984
 atomicshop/basics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/basics/ansi_escape_codes.py,sha256=uGVRW01v2O052701sOfAdCaM_GLF_cu_jrssuYiPbzA,3216
 atomicshop/basics/argparse_template.py,sha256=NRz63v2jr4tHcAGvqW1okYsGRt6n0u8FXuMQQT3dHPw,6071
@@ -131,7 +123,7 @@ atomicshop/mitm/import_config.py,sha256=7aLfKqflc3ZnzKc2_Y4T0eenzQpKG94M0r-PaVwF
 atomicshop/mitm/initialize_engines.py,sha256=qzz5jzh_lKC03bI1w5ebngVXo1K-RV3poAyW-nObyqo,11042
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
 atomicshop/mitm/mitm_main.py,sha256=i0YcLDKAYH1aUS_Rf7IbwXiSQzndsdOY_JuYTvTiTN8,40453
-atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
+atomicshop/mitm/recs_files.py,sha256=TyaMWV0fRmKV7MTGoP_DYDcr-MpS18FFfshq-KTQVBc,6438
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=EC9g21ocOsFzNfntV-nZHSGtrS1-Kxb0QDSGWS5FuNA,28942
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -187,7 +179,7 @@ atomicshop/wrappers/astw.py,sha256=VkYfkfyc_PJLIOxByT6L7B8uUmKY6-I8XGZl4t_z828,4
 atomicshop/wrappers/configparserw.py,sha256=JwDTPjZoSrv44YKwIRcjyUnpN-FjgXVfMqMK_tJuSgU,22800
 atomicshop/wrappers/cryptographyw.py,sha256=QEUpDn8vUvMg3ADz6-4oC2kbDNC_woDlw7C0zU7qFVM,14233
 atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcVE,6031
-atomicshop/wrappers/githubw.py,sha256=95RAbxomp4GA9-7B1pk6q3aYOmrCO0vkHyhSPgr3n3Q,31924
+atomicshop/wrappers/githubw.py,sha256=d4-IdNEu-HfGMZq75c6EBuhhLYn7ulyuOCjM_4HnC20,31958
 atomicshop/wrappers/netshw.py,sha256=8WE_576XiiHykwFuE-VkCx5CydMpFlztX4frlEteCtI,6350
 atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc,1025
 atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLeYE,2051
@@ -208,8 +200,8 @@ atomicshop/wrappers/ctyping/etw_winapi/const.py,sha256=W-NMYlJ8RrMxLRjKcatEHe6wJ
 atomicshop/wrappers/ctyping/etw_winapi/etw_functions.py,sha256=EMdCjGd3x6aRcHkY2NRNTlrOuC7TY4rhfqfRtTWkbYU,17225
 atomicshop/wrappers/ctyping/msi_windows_installer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/ctyping/msi_windows_installer/base.py,sha256=Uu9SlWLsQQ6mjE-ek-ptHcmgiI3Ruah9bdZus70EaVY,4884
-atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py,sha256=htzwb2ROYI8yyc82xApStckPS2yCcoyaw32yC15KROs,3285
-atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEkjnqEhfCbCUcYaulv3uba5hZjTB03xm-puAINsZGM,5488
+atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py,sha256=LbAkEKNQtN4jWmLb_0VTsUya2CWe5thPagNDhYSHjYc,3299
+atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=sO6ZKHMOAMMArIyhmMFen3FJnRHJeXoep22964O9Is8,5502
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=tHsu0YfBgzuIk9L-PyqLgU_IzyVbCfy8L1EqelNnvWk,17674
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/dockerw/dockerw.py,sha256=GgPSvXxJj15kZ-LPiaHLl8aekof53sSP_U-vUMUe7_8,10639
@@ -235,7 +227,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=2FyYjnw8gxFNwISQ
 atomicshop/wrappers/factw/fact_extractor/get_extractor.py,sha256=2mfOAftHIlCcGt1s7MWdq7DsDCuI6wX3MtvcEZ4SK-0,756
 atomicshop/wrappers/factw/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/install/install_after_restart.py,sha256=4dHn2XMbYaPJlhRCmZqqwsgHQBlG2mT7aW50pQCPtp4,4345
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=Xnb1-NGAR-jjzfgkSbJ8JTkGNWb9R4-N36zsLO245n0,6193
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=D4W5hfRbC2fe9eFUIF5zLhTlb2f9oVEm6FqPPopnXoo,6195
 atomicshop/wrappers/factw/postgresql/__init__.py,sha256=xMBn2d3Exo23IPP2F_9-SXmOlhFbwWDgS9KwozSTjA0,162
 atomicshop/wrappers/factw/postgresql/analysis.py,sha256=2Rxzy2jyq3zEKIo53z8VkjuslKE_i5mq2ZpmJAvyd6U,716
 atomicshop/wrappers/factw/postgresql/file_object.py,sha256=VRiCXnsd6yDbnsE-TEKYPC-gkAgFVkE6rygRrJLQShI,713
@@ -299,13 +291,13 @@ atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
 atomicshop/wrappers/socketw/certificator.py,sha256=mA78HXg6j_WKQ7D26Ue66QKA9y1Iu-EWsnc6cI6RC8w,12976
-atomicshop/wrappers/socketw/creator.py,sha256=-Xnc59CLHfBEmncwjIhyHBG-p07uNeSxTzr2S1LW7a4,17200
+atomicshop/wrappers/socketw/creator.py,sha256=DpYzw45DDrHzdSPWt4k-k5ymxr2-91E14yofC4sQ9NM,17198
 atomicshop/wrappers/socketw/dns_server.py,sha256=UHq1a3NVdOrclEOOQIe-wNtIgbF8DFeNXsobvtoM1U8,55961
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=_p98OdOaKYSMqJ23pHLXBUA7NkbVmpgqcSJAdWr6wwc,7560
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
 atomicshop/wrappers/socketw/sender.py,sha256=5ecHUlz4Sxt4oWevBFfy33jQLRXmmVLOF34njfvSbxY,4801
-atomicshop/wrappers/socketw/sni.py,sha256=XlTmNIdJYjW_hkF9eCXu7GdhSJYJvKDmTiPrLV1-TdQ,19374
+atomicshop/wrappers/socketw/sni.py,sha256=-EnZwJJU35NZgYo6SyIr7tfM_ISCgb1ZDYXShYAO9bQ,19547
 atomicshop/wrappers/socketw/socket_client.py,sha256=WWIiCxUX9irN9aWzJ6-1xrXNB_iv_diq3ha1yrWsNGU,22671
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=KdwZvATt7iEC2R0to9jcE0kBtG1cjcZwmF_cMn5fFms,43616
@@ -314,8 +306,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqif
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.4.1.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.4.1.dist-info/METADATA,sha256=H6vq6tDZmmoszao5uweXIMSDyVq0QhP4_-cJ4Ow_PDk,9317
-atomicshop-3.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.4.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.4.1.dist-info/RECORD,,
+atomicshop-3.5.0.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.5.0.dist-info/METADATA,sha256=rok0mkiAeQkcqbznZGMuOhaf9SdVcrpH25WfzE6GjNM,9174
+atomicshop-3.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.5.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.5.0.dist-info/RECORD,,

atomicshop/archiver/_search_in_zip.py

@@ -1,189 +0,0 @@
-# This was written before 'search_in_archive', currently search_in_archive is in test mode.
-# So probably this will go away eventually.
-import os
-import zipfile
-from io import BytesIO
-
-
-def _get_unique_filename(directory, filename):
-    """
-    Generates a unique filename by appending a number if the file already exists.
-    """
-    name, ext = os.path.splitext(filename)
-    counter = 1
-    unique_filename = filename
-    while os.path.exists(os.path.join(directory, unique_filename)):
-        unique_filename = f"{name}_{counter}{ext}"
-        counter += 1
-    return unique_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
-
-
-def _match_file_name(target, current, case_sensitive):
-    if case_sensitive:
-        return current.endswith(target)
-    else:
-        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_zip(
-                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))
-        with open(os.path.join(extract_file_to_path, unique_filename), 'wb') as f:
-            f.write(archived_file_bytes)
-
-
-def _handle_callback_matching(item, archived_file_bytes, callback_functions, results, found_set, return_first_only):
-    for callback in callback_functions:
-        callback_result = callback(archived_file_bytes)
-        if callback_result:
-            # Initialize key for callback function name if not present
-            if callback.__name__ not in results:
-                results[callback.__name__] = []
-            file_info = {
-                'bytes': archived_file_bytes,
-                'name': item.filename,
-                'size': item.file_size,
-                'modified_time': item.date_time
-            }
-            results[callback.__name__].append(file_info)
-            if return_first_only:
-                found_set.add(item.filename)
-            return True
-    return False
-
-
-def _handle_name_matching(item, archived_file_bytes, file_names, case_sensitive, results, found_set, return_first_only):
-    if any(_match_file_name(file_name, item.filename, case_sensitive) for file_name in file_names):
-        if item.filename not in results:
-            results[item.filename] = []
-        file_info = {
-            'bytes': archived_file_bytes,
-            'name': item.filename,
-            'size': item.file_size,
-            'modified_time': item.date_time
-        }
-        results[item.filename].append(file_info)
-        if return_first_only:
-            found_set.add(item.filename)
-
-
-def _search_in_zip(
-        zip_obj, file_names, results, found_set, case_sensitive, return_first_only, recursive, callback_functions,
-        extract_file_to_path):
-
-    for item in zip_obj.infolist():
-        if item.filename.endswith('/'):  # Skip directories
-            continue
-
-        with zip_obj.open(item) as file_data:
-            archived_file_bytes = file_data.read()
-
-            callback_matched = False
-            if callback_functions:
-                callback_matched = _handle_callback_matching(
-                    item, archived_file_bytes, callback_functions, results, found_set, return_first_only)
-
-            if callback_matched:
-                _handle_file_extraction(item, extract_file_to_path, archived_file_bytes)
-            else:
-                _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 file_names and not callback_matched:
-                    _handle_name_matching(
-                        item, archived_file_bytes, file_names, case_sensitive, results, found_set, return_first_only)
-
-            if file_names is not None and len(found_set) == len(file_names):
-                break  # All files found, stop searching
-
-
-def _initialize_results(callback_functions):
-    if callback_functions:
-        return {callback.__name__: [] for callback in callback_functions}
-    else:
-        return {}
-
-
-def _search_zip_content(
-        file_path, file_bytes, file_names_to_search, results, found_set, case_sensitive, return_first_only, recursive,
-        callback_functions, extract_file_to_path):
-    if file_bytes is not None:
-        with zipfile.ZipFile(BytesIO(file_bytes), 'r') as zip_ref:
-            _search_in_zip(zip_ref, file_names_to_search, results, found_set, case_sensitive, return_first_only,
-                           recursive, callback_functions, extract_file_to_path)
-    elif file_path is not None:
-        with zipfile.ZipFile(file_path, 'r') as zip_ref:
-            _search_in_zip(zip_ref, file_names_to_search, results, found_set, case_sensitive, return_first_only,
-                           recursive, callback_functions, extract_file_to_path)
-    else:
-        raise ValueError("Either file_path or file_bytes must be provided.")
-
-
-def search_file_in_zip(
-        file_path: str = None,
-        file_bytes: bytes = None,
-        file_names_to_search: list[str] = None,
-        case_sensitive: bool = True,
-        return_first_only: bool = False,
-        return_empty_list_per_file_name: bool = False,
-        recursive: bool = False,
-        callback_functions: list = None,
-        extract_file_to_path: str = None
-) -> dict[str, list[bytes]]:
-    """
-    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_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.
-    :param return_empty_list_per_file_name: boolean, default is 'False'.
-        True: Return empty list for each file name that wasn't found.
-        False: Don't return empty list for each file name that wasn't found.
-    :param recursive: boolean, default is 'False'. If True, search for file names recursively in nested zip files.
-    :param callback_functions: list of callables, default is None. Each function takes a file name and should return a
-        boolean that will tell the main function if this file is 'found' or not.
-    :param extract_file_to_path: string, full path to the directory where the found files should be extracted.
-    :return: dictionary of lists of bytes.
-    """
-
-    if file_names_to_search is None and callback_functions is None:
-        raise ValueError("Either file_names_to_search or callback_functions must be provided.")
-
-    # Initialize results dictionary.
-    results = _initialize_results(callback_functions)
-    found_set = set()
-
-    _search_zip_content(
-        file_path, file_bytes, 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:
-        # Filter out keys with empty lists.
-        results = {key: value for key, value in results.items() if value}
-
-    return results