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

atomicshop/archiver/search_in_archive.py

@@ -3,7 +3,7 @@ import zipfile
 from io import BytesIO
 from typing import Union
 
-from . import zip, sevenz
+from . import zips, sevenzs
 from .. import file_types
 
 import py7zr
@@ -37,12 +37,12 @@ def _get_unique_filename(directory, filename):
 
 def _is_zip_file(file, zip_obj):
     with zip_obj.open(file) as file_data:
-        return zip.is_zip_zipfile(file_data.read())
+        return zips.is_zip_zipfile(file_data.read())
 
 
 def _is_7z_file(file, sevenz_obj):
     with sevenz_obj.open(file) as file_data:
-        return sevenz.is_7z(file_data.read())
+        return sevenzs.is_7z(file_data.read())
 
 
 def _match_file_name(target, current, case_sensitive):
@@ -158,9 +158,9 @@ def _get_archive_type(file_object) -> Union[str, None]:
     if file_mime not in SUPPORTED_ARCHIVE_MIMES:
         return None
 
-    if zip.is_zip_zipfile(file_object):
+    if zips.is_zip_zipfile(file_object):
         return 'zip'
-    elif sevenz.is_7z(file_object):
+    elif sevenzs.is_7z(file_object):
         return '7z'
     else:
         raise UnknownArchiveType(f"{file_object[:10]} is not a known archive type.")

atomicshop/basics/dicts.py

@@ -244,6 +244,58 @@ def convert_object_with_attributes_to_dict(
     return obj_dict
 
 
+def convert_complex_object_to_dict(data):
+    """ Function that converts complex objects to dict recursively """
+
+    # 1. Extracts only the first level of objects. No byte decoding.
+    # new_dict = dict()
+    # for key, value in vars(obj).items():
+    #     new_dict.update({key: str(value)})
+    # return new_dict
+
+    # 2. Extracts only the first level of objects. Tries to decode bytes, if exception rises stores string as is.
+    # new_dict = dict()
+    # for key, value in vars(obj).items():
+    #     try:
+    #         new_dict.update({key: value.decode('utf-8')})
+    #     except Exception:
+    #         new_dict.update({key: str(value)})
+    # return new_dict
+
+    # 3. Decompress all the objects, save objects as is (no byte decoding).
+    if hasattr(data, "__dict__"):
+        # 'vars' return a dictionary of all the variables in a class / object.
+        # 'map' iterates through function 'dict_converter' all the values of the second argument and returns a list
+        # of all iterations of the function result.
+        function_return = dict(map(convert_complex_object_to_dict, vars(data).items()))
+        # If 'data' type is 'bytes'
+    elif isinstance(data, dict):
+        function_return = dict(map(convert_complex_object_to_dict, data.items()))
+    elif isinstance(data, tuple):
+        function_return = tuple(map(convert_complex_object_to_dict, data))
+    elif isinstance(data, list):
+        function_return = list(map(convert_complex_object_to_dict, data))
+    # One value objects.
+    elif isinstance(data, datetime.datetime):
+        function_return = data.strftime('%Y-%m-%d-%H:%M:%S')
+    elif isinstance(data, bytes) or isinstance(data, bytearray):
+        function_return = str(data)
+
+        # Don't want to use the next method, since there will be different formatted strings / messages. And we don't
+        # want that, since we can't manipulate it easily later.
+        # # Try to decode, if fails, return string.
+        # try:
+        #     function_return = data.decode(encoding='utf-8')
+        # except Exception:
+        #     function_return = str(data)
+        #     pass
+    # Any other type will return as is (something that 'dict()' function can handle), like strings and integers.
+    else:
+        function_return = data
+
+    return function_return
+
+
 def convert_tuples_to_lists(obj):
     """
     Convert all tuples in object to lists. The first  input 'obj' can be a dictionary, list or tuple.

atomicshop/mitm/shared_functions.py

@@ -1,11 +1,9 @@
-# v1.0.2 - 21.03.2023 13:50
 import json
-# Needed to convert datetime objects inside 'dict_converter' function.
-import datetime
 # Needed to get the function caller module.
 import inspect
 
 from ..wrappers.loggingw import loggingw
+from ..basics import dicts
 
 
 # If the string has several dot characters (".") - return the most right string after the last dot.
@@ -40,59 +38,7 @@ def create_custom_logger():
     return loggingw.get_logger_with_level(logger_name)
 
 
-def dict_converter(data):
-    """ Function that converts complex objects to dict recursively """
-
-    # 1. Extracts only the first level of objects. No byte decoding.
-    # new_dict = dict()
-    # for key, value in vars(obj).items():
-    #     new_dict.update({key: str(value)})
-    # return new_dict
-
-    # 2. Extracts only the first level of objects. Tries to decode bytes, if exception rises stores string as is.
-    # new_dict = dict()
-    # for key, value in vars(obj).items():
-    #     try:
-    #         new_dict.update({key: value.decode('utf-8')})
-    #     except Exception:
-    #         new_dict.update({key: str(value)})
-    # return new_dict
-
-    # 3. Decompress all the objects, save objects as is (no byte decoding).
-    if hasattr(data, "__dict__"):
-        # 'vars' return a dictionary of all the variables in a class / object.
-        # 'map' iterates through function 'dict_converter' all the values of the second argument and returns a list
-        # of all iterations of the function result.
-        function_return = dict(map(dict_converter, vars(data).items()))
-        # If 'data' type is 'bytes'
-    elif isinstance(data, dict):
-        function_return = dict(map(dict_converter, data.items()))
-    elif isinstance(data, tuple):
-        function_return = tuple(map(dict_converter, data))
-    elif isinstance(data, list):
-        function_return = list(map(dict_converter, data))
-    # One value objects.
-    elif isinstance(data, datetime.datetime):
-        function_return = data.strftime('%Y-%m-%d-%H:%M:%S')
-    elif isinstance(data, bytes) or isinstance(data, bytearray):
-        function_return = str(data)
-
-        # Don't want to use the next method, since there will be different formatted strings / messages. And we don't
-        # want that, since we can't manipulate it easily later.
-        # # Try to decode, if fails, return string.
-        # try:
-        #     function_return = data.decode(encoding='utf-8')
-        # except Exception:
-        #     function_return = str(data)
-        #     pass
-    # Any other type will return as is (something that 'dict()' function can handle), like strings and integers.
-    else:
-        function_return = data
-
-    return function_return
-
-
 def get_json(obj):
     """ Convert any nested object to json / dict and values to string as is """
 
-    return json.dumps(obj, default=dict_converter)
+    return json.dumps(obj, default=dicts.convert_complex_object_to_dict)

atomicshop/web.py

@@ -2,7 +2,7 @@ import os
 import urllib.request
 
 from .print_api import print_api
-from .archiver import zip
+from .archiver import zips
 from .urls import url_parser
 from .file_io import file_io
 from .wrappers.playwrightw import scenarios
@@ -239,7 +239,7 @@ def download_and_extract_file(
         file_url=file_url, target_directory=target_directory, file_name=file_name, **kwargs)
 
     # Extract the archive and remove the first directory.
-    zip.extract_archive_with_zipfile(
+    zips.extract_archive_with_zipfile(
         archive_path=f'{file_path}', extract_directory=target_directory,
         remove_first_directory=archive_remove_first_directory, **kwargs)
 

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -3,13 +3,19 @@ from pathlib import Path
 import sys
 
 from .... import permissions, filesystem
+from ....archiver import zips
 from ....print_api import print_api
-from ... import githubw, ubuntu_terminal
+from ... import githubw
 from ...dockerw import install_docker
 from .. import config_install
 
 
-def install_before_restart(installation_directory: str, remove_existing_installation_directory: bool = True):
+def install_before_restart(
+        installation_directory: str,
+        remove_existing_installation_directory: bool = True,
+        fact_source_archive_path: str = None,
+        print_kwargs: dict = None
+):
     """
     This function will install the FACT_core before the restart of the computer.
     :param installation_directory: string, the directory to install the FACT_core to.
@@ -17,6 +23,13 @@ def install_before_restart(installation_directory: str, remove_existing_installa
         if True, the existing installation directory will be removed.
         if False, the existing installation directory will not be removed and FACT installation scripts will do their
             best to install the FACT_core to the existing installation directory.
+    :param fact_source_archive_path: string, the path to the FACT_core source archive.
+        This is used when the FACT_core source archive is already downloaded, and you want to use the specific archive
+        instead of downloading it again. Or you want to use a specific version of the FACT_core.
+        This is optional, if not provided, the latest version of the FACT_core will be downloaded.
+        The archive should be an exact copy of the FACT_core repository of the master branch as you download it from
+        GitHub.
+    :param print_kwargs: dict, the print kwargs for the print_api function.
     :return:
     """
 
@@ -36,20 +49,27 @@ def install_before_restart(installation_directory: str, remove_existing_installa
     if remove_existing_installation_directory:
         filesystem.remove_directory(installation_directory)
 
+    # Since you run the script with sudo, we need to change the permissions to the current user.
     with permissions.temporary_regular_permissions():
         # Create the FACT_core directory.
         filesystem.create_directory(installation_directory)
 
-        # Download the FACT_core repo.
-        if not filesystem.get_file_paths_from_directory(installation_directory):
-            git_wrapper = githubw.GitHubWrapper(repo_url=config_install.FACT_CORE_GITHUB_URL)
-            git_wrapper.build_links_from_repo_url()
-            git_wrapper.download_and_extract_branch(
-                target_directory=installation_directory,
-                archive_remove_first_directory=True)
+        if not fact_source_archive_path:
+            # Download the FACT_core repo.
+            if not filesystem.get_file_paths_from_directory(installation_directory):
+                git_wrapper = githubw.GitHubWrapper(repo_url=config_install.FACT_CORE_GITHUB_URL)
+                git_wrapper.build_links_from_repo_url()
+                git_wrapper.download_and_extract_branch(
+                    target_directory=installation_directory,
+                    archive_remove_first_directory=True)
+        else:
+            # Extract the archive and remove the first directory.
+            zips.extract_archive_with_zipfile(
+                archive_path=fact_source_archive_path, extract_directory=installation_directory,
+                remove_first_directory=True, **(print_kwargs or {}))
 
-    # Set the executable permission on the pre-install file.
-    permissions.set_executable_permission(fact_core_pre_install_file_path)
+        # Set the executable permission on the pre-install file.
+        permissions.set_executable_permission(fact_core_pre_install_file_path)
 
     # Run the shell script
     subprocess.run(['bash', fact_core_pre_install_file_path])

atomicshop/wrappers/nodejsw/install_nodejs.py

@@ -95,6 +95,8 @@ def install_nodejs_ubuntu(
         if not force_install:
             return
 
+    # NodeSource is listed as source under official Node.js GitHub repository:
+    # https://github.com/nodejs/node?tab=readme-ov-file#current-and-lts-releases
     print_api("Adding NodeSource repository...")
 
     # Fetch and execute the NodeSource repository setup script.

{atomicshop-2.10.0.dist-info → atomicshop-2.10.1.dist-info}/METADATA

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

{atomicshop-2.10.0.dist-info → atomicshop-2.10.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=Vb-OirUUuTpKZXUvWHYjzscN4SeetO7oxaKph1XstLw,123
+atomicshop/__init__.py,sha256=ukl6aqshNmALeGqIPGLVnag3oMdx9rXTGHupAsgJhXk,123
 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
@@ -44,7 +44,7 @@ atomicshop/timer.py,sha256=KxBBgVM8po6pUJDW8TgY1UXj0iiDmRmL5XDCq0VHAfU,1670
 atomicshop/urls.py,sha256=CQl1j1kjEVDlAuYJqYD9XxPF1SUSgrmG8PjlcXNEKsQ,597
 atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
-atomicshop/web.py,sha256=K3UndqJqHO9bTogZUWDz-IEZN776KNhpk28m3Ct_pbc,11069
+atomicshop/web.py,sha256=7WPV6Q4xZX7bByEeCl2VAfPlyMY42BpR_byVX0Gu7Js,11071
 atomicshop/addons/PlayWrightCodegen.cmd,sha256=Z5cnllsyXD4F1W2h-WLEnyFkg5nZy0-hTGHRWXVOuW4,173
 atomicshop/addons/ScriptExecution.cmd,sha256=8iC-uHs9MX9qUD_C2M7n9Xw4MZvwOfxT8H5v3hluVps,93
 atomicshop/addons/a_setup_scripts/install_psycopg2_ubuntu.sh,sha256=lM7LkXQ2AxfFzDGyzSOfIS_zpg9bAD1k3JJ-qu5CdH8,81
@@ -67,16 +67,16 @@ atomicshop/addons/process_list/compiled/Win10x64/process_list.lib,sha256=n9c2MVP
 atomicshop/archiver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=mEngDfULXBd3Oio8a2SUtynfJASVLsH74XIYJOWVkH0,10467
-atomicshop/archiver/sevenz.py,sha256=5i_C50-deC1Cz_GQdMGofV2jeMPbbGWAvih-QnA72cg,1370
-atomicshop/archiver/zip.py,sha256=k742K1bEDtc_4N44j_Waebi-uOkxxavqltvV6q-BLW4,14402
+atomicshop/archiver/search_in_archive.py,sha256=kui33oobL2F3VLgAE8L037rHR8Ud3HpXz_E0tbuiDD4,10473
+atomicshop/archiver/sevenzs.py,sha256=5i_C50-deC1Cz_GQdMGofV2jeMPbbGWAvih-QnA72cg,1370
+atomicshop/archiver/zips.py,sha256=k742K1bEDtc_4N44j_Waebi-uOkxxavqltvV6q-BLW4,14402
 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=horwgSf3MX1ZgRnYxtmmQuz9OU_vKrKggF65gmjlmfg,5836
 atomicshop/basics/booleans.py,sha256=va3LYIaSOhjdifW4ZEesnIQxBICNHyQjUAkYelzchhE,2047
 atomicshop/basics/bytes_arrays.py,sha256=WvSRDhIGt1ywF95t-yNgpxLm1nlZUbM1Dz6QckcyE8Y,5915
 atomicshop/basics/classes.py,sha256=EijW_g4EhdNBnKPMG3nT3HjFspTchtM7to6zm9Ad_Mk,9771
-atomicshop/basics/dicts.py,sha256=N696f-vamrCcLpLOvtRpHrEmLfyOqkCyW8JDZnwYLpg,11295
+atomicshop/basics/dicts.py,sha256=JevEkLsQdH4Tqn8rspSey40jW6h8pJ2SP5fcuFBR4dU,13651
 atomicshop/basics/dicts_nested.py,sha256=StYxYnYPa0SEJr1lmEwAv5zfERWWqoULeyG8e0zRAwE,4107
 atomicshop/basics/enumerations.py,sha256=41VVQYh_vnVapggxKg2IRU5e_EiMpZzX1n1mtxvoSzM,1364
 atomicshop/basics/enums.py,sha256=CeV8MfqWHihK7vvV6Mbzq7rD9JykeQfrJeFdLVzfHI4,3547
@@ -111,7 +111,7 @@ atomicshop/mitm/import_config.py,sha256=_V-IVJ7a1L6E-VOR4CDfZj-S1odbsIlBe13ij0Nl
 atomicshop/mitm/initialize_engines.py,sha256=UGdT5DKYNri3MNOxESP7oeSxYiUDrVilJ4jic_nwdew,8055
 atomicshop/mitm/initialize_mitm_server.py,sha256=aXNZlRu1_RGjC7lagvs2Q8rjQiygxYucy-U4C_SBnsk,13871
 atomicshop/mitm/message.py,sha256=u2U2f2SOHdBNU-6r1Ik2W14ai2EOwxUV4wVfGZA098k,1732
-atomicshop/mitm/shared_functions.py,sha256=NeHABBlY-tmQRooWGVl2jZQx1wSTKJtEqG7mMvF2Jqo,4268
+atomicshop/mitm/shared_functions.py,sha256=PaK_sbnEA5zo9k2ktEOKLmvo-6wRUunxzSNRr41uXIQ,1924
 atomicshop/mitm/statistic_analyzer.py,sha256=1g5l6X-NbnHvh_TREJRumTDWgE4ixUNJ8pKGneKcf4Y,23524
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvita0qsusdFGm8NZLsZ-XMs,4853
@@ -177,7 +177,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=jJAoJNQ4aoATjn3x
 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=roM1W2hkDynpEKda55xd7AsZxodsFj8i4wmFGt_HHzA,1558
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=xPMYgXoyA7y1MHyG5paoqKTWuklhsSGym2ObPcex75M,3036
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=fAH53sJgWoXOOhjeAmME2SHYm-5YQAgEi1neaok82Lk,4246
 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
@@ -199,7 +199,7 @@ atomicshop/wrappers/loggingw/loggers.py,sha256=DHOOTAtqkwn1xgvLHSkOiBm6yFGNuQy1k
 atomicshop/wrappers/loggingw/loggingw.py,sha256=v9WAseZXB50LluT9rIUcRvvevg2nLVKPgz3dbGejfV0,12151
 atomicshop/wrappers/loggingw/reading.py,sha256=xs7L6Jo-vedrhCVP7m-cJo0VhWmoSoK86avR4Tm0kG4,3675
 atomicshop/wrappers/nodejsw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/nodejsw/install_nodejs.py,sha256=tHJQHpnK-QVrdbbUN3gz_6gklX5c6w1ERRgZ8efn4Bo,4794
+atomicshop/wrappers/nodejsw/install_nodejs.py,sha256=VZvefvdeSzoyetCx1y8zg_liX3_GtFtpOpjw7P5iMLk,4956
 atomicshop/wrappers/playwrightw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/playwrightw/_tryouts.py,sha256=l1BLkFsiIMNlgv7nfZd1XGEvXQkIQkIcg48__9OaC00,4920
 atomicshop/wrappers/playwrightw/base.py,sha256=WeRpx8otdXuKSr-BjY-uCJTze21kbPpfitoOjKQz5-g,9818
@@ -232,8 +232,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.10.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.10.0.dist-info/METADATA,sha256=FI-w5jz9h06C_vDlRS0qjGL9g7eA8xhcjhugwE74Da4,10423
-atomicshop-2.10.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.10.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.10.0.dist-info/RECORD,,
+atomicshop-2.10.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.10.1.dist-info/METADATA,sha256=Bhbu_I_0laKqCOs51DFk4MH4r7BgeHumK5kATL_9cwM,10423
+atomicshop-2.10.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.10.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.10.1.dist-info/RECORD,,