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

atomicshop/a_installs/pywintrace.py

@@ -0,0 +1,26 @@
+import argparse
+import subprocess
+import sys
+
+
+WHEEL = (
+    "https://github.com/fireeye/pywintrace/releases/download/"
+    "v0.3.0/pywintrace-0.3.0-py3-none-any.whl"
+)
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        prog="pywintrace",
+        description="Utility wrapper for installing FireEye’s pywintrace wheel"
+    )
+    sub = parser.add_subparsers(dest="command", required=True)
+    sub.add_parser("install", help="Download and install pywintrace v0.3.0")
+    args = parser.parse_args()
+
+    if args.command == "install":
+        subprocess.check_call([sys.executable, "-m", "pip", "install", WHEEL])
+        print("pywintrace 0.3.0 installed")
+
+if __name__ == "__main__":
+    main()

atomicshop/basics/strings.py

@@ -571,3 +571,72 @@ def replace_string_in_file_main_argparse():
         new_string=args.new_string,
         find_only=args.find_only
     )
+
+
+def _replace_string_in_variable():
+    """
+    Replace string in a string variable, but do it by a meta variable inside the string.
+    This is just an example, using the 'Template' class from the 'string' module is a better way to do it.
+    """
+
+    from string import Template
+    import os
+    import tempfile
+    import subprocess
+
+    get_docker_url: str = "https://get.docker.com"
+    docker_proxy_image_name: str = "rpardini/docker-registry-proxy:0.6.5"
+    preparation_output_dir: str = str(Path(__file__).parent / "offline-bundle")
+
+    class BashTemplate(Template):
+        # Anything that is not '$', which is a default delimiter in Template class, but also used in bash scripts.
+        # The below symbol can be printed from keyboard by holding 'Alt' and typing '0167' on the numeric keypad.
+        delimiter = '§'
+
+    bash_tmpl = BashTemplate(r"""#!/usr/bin/env bash
+#
+set -Eeuo pipefail
+
+die()       { echo "ERROR: $*" >&2; exit 1; }
+need_root() { [[ $EUID -eq 0 ]] || die "Run as root (use sudo)"; }
+need_cmd() {
+  local cmd=$1
+  local pkg=${2:-$1}               # default package == command
+  if ! command -v "$cmd" &>/dev/null; then
+    echo "[*] $cmd not found – installing $pkg ..."
+    apt-get update -qq
+    DEBIAN_FRONTEND=noninteractive \
+      apt-get install -y --no-install-recommends "$pkg" || \
+      die "Unable to install required package: $pkg"
+  fi
+}
+
+need_root
+need_cmd curl                 # binary and pkg are both “curl”
+need_cmd gpg                  # → apt-get install gpg
+
+DRY_LOG=$(curl -fsSL "§url" | bash -s -- --dry-run)
+IMAGE="§proxyimage"
+ARCHIVE="$OUTDIR/registry-proxy-image.tar.gz"
+zip -r "§output_zip" "$OUTDIR"
+        """)
+
+    # Substitute the variables in the bash script template.
+    bash_script = bash_tmpl.substitute(
+        url=get_docker_url, proxyimage=docker_proxy_image_name, output_zip=preparation_output_dir)
+
+    # Write it to a secure temporary file.
+    with tempfile.NamedTemporaryFile('w', delete=False, suffix='.sh') as f:
+        f.write(bash_script)
+        temp_path = f.name
+    os.chmod(temp_path, 0o755)  # make it executable
+
+    # Decide where the bundle should land (optional argument to the script).
+    cmd = ["sudo", temp_path, preparation_output_dir]  # use sudo because the script demands root
+
+    # Run it and stream output live.
+    try:
+        subprocess.run(cmd, check=True)
+    finally:
+        # 5. Clean up the temp file unless you want to inspect it.
+        os.remove(temp_path)

atomicshop/mitm/connection_thread_worker.py

@@ -629,13 +629,14 @@ def thread_worker_main(
         else:
             service_client = create_client_socket(client_message_connection)
             service_socket_instance, connection_error = service_client.service_connection()
-            # Now we'll update the server IP with the IP of the service.
-            server_ip = service_socket_instance.getpeername()[0]
-            client_message_connection.server_ip = server_ip
 
             if connection_error:
                 client_message_connection.errors.append(connection_error)
                 record_and_statistics_write(client_message_connection)
+            else:
+                # Now we'll update the server IP with the IP of the service.
+                server_ip = service_socket_instance.getpeername()[0]
+                client_message_connection.server_ip = server_ip
 
         if not connection_error:
             client_exception_queue: queue.Queue = queue.Queue()

atomicshop/mitm/engines/__parent/recorder___parent.py

@@ -100,14 +100,13 @@ def save_message_worker(
         logger
 ):
     """Worker function to process messages from the queue and write them to the file."""
-    file_created: bool = False
-
     original_file_path_object: Path = Path(record_file_path_no_date)
     original_file_stem: str = original_file_path_object.stem
     original_file_extension: str = original_file_path_object.suffix
     original_file_directory: str = str(original_file_path_object.parent)
 
     original_datetime_string: str = get_datetime_string()
+    previous_date_string: str = get_date_string()
 
     record_file_path: str = f'{original_file_directory}{os.sep}{original_datetime_string}_{original_file_stem}{original_file_extension}'
 
@@ -119,9 +118,12 @@ def save_message_worker(
         if record_message_dict is None:
             break
 
-        current_datetime_string: str = get_datetime_string()
+        current_date_string: str = get_date_string()
+
         # If current datetime string is different from the original datetime string, we will create a new file path.
-        if current_datetime_string != original_datetime_string:
+        if current_date_string != previous_date_string:
+            previous_date_string = current_date_string
+            current_datetime_string: str = get_datetime_string()
             record_file_path = f'{original_file_directory}{os.sep}{current_datetime_string}_{original_file_stem}_partof_{original_datetime_string}{original_file_extension}'
 
         try:
@@ -144,4 +146,11 @@ def get_datetime_string():
     now = datetime.now()
     # Formatting the date and time and converting it to string object
     day_time_format: str = now.strftime(recs_files.REC_FILE_DATE_TIME_FORMAT)
-    return day_time_format
+    return day_time_format
+
+def get_date_string():
+    # current date and time in object
+    now = datetime.now()
+    # Formatting the date and time and converting it to string object
+    date_format: str = now.strftime(recs_files.REC_FILE_DATE_FORMAT)
+    return date_format

{atomicshop-3.2.8.dist-info → atomicshop-3.2.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 3.2.8
+Version: 3.2.11
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License
@@ -158,9 +158,9 @@ To get a local copy up and running follow these simple steps.
    ```
 
    The latest version on PyPI is 0.2, so you will need to install from GitHub.
-   Alternatively, you can use a cmd file in the addon folder after 'atomicshop' installation:
+   Alternatively, you can use a command anywhere in CMD after 'atomicshop' installation:
    ```sh
-   "\Lib\site-packages\atomicshop\addons\a_setup_scripts\install_pywintrace_0.3.cmd"
+   pywintrace install
    ```
 
 4. If you get an exception while installing the 'psycopg2' package on ubuntu, install this binary:

{atomicshop-3.2.8.dist-info → atomicshop-3.2.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=AInyQwlGaAXpv8QMYrxkmihPKv4r22sPQoEzRB8sOeU,122
+atomicshop/__init__.py,sha256=uAe2_I-bgd4PsVkPLa-ANJSdckjZL2cytN_g3gJV6m8,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
@@ -49,6 +49,7 @@ atomicshop/versioning.py,sha256=e5W6m9AF3__M5nntqI9CqNAeHqkwY9JhlnpYeZ1CEus,970
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
 atomicshop/web.py,sha256=hkAS0MeMW_mGgxhFCX1xckT3yslCJ2cMP2nx9ADpe3o,13024
 atomicshop/websocket_parse.py,sha256=aLHWyKqaYqEn_MRBWm2L6rIl6QPmqbVrjEXE_rBzwCw,16711
+atomicshop/a_installs/pywintrace.py,sha256=oZ9BATsJ2YsdIkZZWLar_dAUV32-oDiT7MJxthC0NnU,738
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
 atomicshop/a_installs/ubuntu/elastic_search_and_kibana.py,sha256=yRB-l1zBxdiN6av-FwNkhcBlaeu4zrDPjQ0uPGgpK2I,244
@@ -71,7 +72,6 @@ atomicshop/a_mains/FACT/update_extract.py,sha256=atNIBKDeGAM1XNymDjnEHq7Ke3i_rXl
 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
-atomicshop/addons/a_setup_scripts/install_pywintrace_0.3.cmd,sha256=lEP_o6rWcBFUyup6_c-LTL3Q2LRMqryLuG3mJw080Zc,115
 atomicshop/addons/inits/init_to_import_all_modules.py,sha256=piyFjkqtNbM9PT2p8aGcatI615517XEQHgU9kDFwseY,559
 atomicshop/addons/package_setup/CreateWheel.cmd,sha256=hq9aWBSH6iffYlZyaCNrFlA0vxMh3j1k8DQE8IARQuA,189
 atomicshop/addons/package_setup/Setup in Edit mode.cmd,sha256=299RsExjR8Mup6YyC6rW0qF8lnwa3uIzwk_gYg_R_Ss,176
@@ -111,7 +111,7 @@ atomicshop/basics/multiprocesses.py,sha256=D-xe4KNWy-CffhQkWcDcROl00KYzdTk-9itrx
 atomicshop/basics/numbers.py,sha256=ESX0z_7o_ok3sOmCKAUBoZinATklgMy2v-4RndqXlVM,1837
 atomicshop/basics/package_module.py,sha256=fBd0uVgFce25ZCVtLq83iyowRlbwdWYFj_t4Ml7LU14,391
 atomicshop/basics/randoms.py,sha256=DmYLtnIhDK29tAQrGP1Nt-A-v8WC7WIEB8Edi-nk3N4,282
-atomicshop/basics/strings.py,sha256=mT31UXrn4dgfLtNC6PeBwrkuQHtjdPEiP38VaWgpv3w,21217
+atomicshop/basics/strings.py,sha256=546IWkeqU17wEgExVTKgRnmE9icnwbvPuh3ed2F2RJ4,23777
 atomicshop/basics/threads.py,sha256=LDJiprLqdWU4JnPpCOiIC_tEnyssmCqh-6J3gfrO4QA,3195
 atomicshop/basics/timeit_template.py,sha256=fYLrk-X_dhdVtnPU22tarrhhvlggeW6FdKCXM8zkX68,405
 atomicshop/basics/tracebacks.py,sha256=Q10VnbWqcA1tL0tJsq0q1PxQtRehPT_F69DQzRMNdks,842
@@ -136,7 +136,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=9lnSmGuNKUnN0-IskhObA0XJeLvm63vXD2QiNAUTIb8,8751
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=zo9YVliRtanmt3BDnxlePOuZLYk8HVgMRDak4wJVRvk,32653
+atomicshop/mitm/connection_thread_worker.py,sha256=7B2aM-Py0kHP1geBMjw9uNmoueHEruV3KVdklkpWCLk,32684
 atomicshop/mitm/import_config.py,sha256=_RJPxoVEEsJQwQY-K_8qPw2PbzsDcV23_sEJEWSKqXY,17831
 atomicshop/mitm/initialize_engines.py,sha256=EYGW6gEYVETmmh9uNdsFT89YAdzeducFTIkdF-as33s,10534
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
@@ -149,7 +149,7 @@ atomicshop/mitm/engines/create_module_template.py,sha256=2ceRWPzofpRf-R8VAMgXrx2
 atomicshop/mitm/engines/create_module_template_main_example.py,sha256=LeQ44Rp2Gi_KbIDY_4OMS0odkSK3zFZWra_oAka5eJY,243
 atomicshop/mitm/engines/__parent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/__parent/parser___parent.py,sha256=HHaCXhScl3OlPjz6eUxsDpJaZyk6BNuDMc9xCkeo2Ws,661
-atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=56lKDzb-aAUzu0zfWGi56y4R73meCbX19-RjfV-Wx5E,5822
+atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=D99cbpMneY9STSAPETa6eIxyfs_Q9etRYxm2dosA-DI,6203
 atomicshop/mitm/engines/__parent/requester___parent.py,sha256=j3QYOfQFEPSzIEWihkssNcfaLWC8cpdpi-ciPgjKNBc,5126
 atomicshop/mitm/engines/__parent/responder___parent.py,sha256=mtiS_6ej9nxT9UhAQR4ftMqnqL-j_kO3u8KEaoEaI9k,9495
 atomicshop/mitm/engines/__reference_general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -337,8 +337,9 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 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.2.8.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.2.8.dist-info/METADATA,sha256=wNgOAS7Fz_oo9J3E6T5C5n2yih5B8o8VHXzD0uELj_s,10670
-atomicshop-3.2.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.2.8.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.2.8.dist-info/RECORD,,
+atomicshop-3.2.11.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.2.11.dist-info/METADATA,sha256=5C3bLgLQeg8N_xL7RpKGTnOSU8CEi9MIgciC5B6sXNE,10603
+atomicshop-3.2.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.2.11.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
+atomicshop-3.2.11.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.2.11.dist-info/RECORD,,

atomicshop-3.2.11.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pywintrace = atomicshop.a_installs.pywintrace:main

atomicshop/addons/a_setup_scripts/install_pywintrace_0.3.cmd

@@ -1,2 +0,0 @@
-pip install https://github.com/fireeye/pywintrace/releases/download/v0.3.0/pywintrace-0.3.0-py3-none-any.whl
-pause