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

atomicshop/mitm/mitm_main.py

@@ -402,7 +402,7 @@ def mitm_server(config_file_path: str, script_version: str):
         # We set the virtual IPs in the network adapter here, so the server multiprocessing processes can listen on them.
         setting_result: int = _add_virtual_ips_set_default_dns_gateway(system_logger)
         if setting_result != 0:
-            print_api.print_api("Failed to set the default DNS gateway.", error_type=True, color="red",
+            print_api.print_api("Failed to set the default DNS gateway OR Virtual IPs.", error_type=True, color="red",
                                 logger=system_logger)
             # Wait for the message to be printed and saved to file.
             time.sleep(1)
@@ -618,8 +618,21 @@ def _create_tcp_server_process(
         # network_logger_queue_listener.stop()
         sys.exit(1)
 
-    socket_wrapper_instance.start_listening_socket(
-        callable_function=thread_worker_main, callable_args=(config_static,))
+    try:
+        socket_wrapper_instance.start_listening_socket(
+            callable_function=thread_worker_main, callable_args=(config_static,))
+    except OSError as e:
+        if e.winerror == 10022:  # Invalid argument error on Windows.
+            message = (
+                str(f"{e}\n"
+                    f"Check that the IP address and port are correct: {socket_wrapper_kwargs['ip_address']}:{socket_wrapper_kwargs['port']}\n"))
+            print_api.print_api(message, error_type=True, color="red", logger=system_logger, logger_method='critical')
+            # Wait for the message to be printed and saved to file.
+            time.sleep(1)
+            # network_logger_queue_listener.stop()
+            sys.exit(1)
+        else:
+            raise e
 
     # Notify that the TCP server is ready.
     is_tcp_process_ready.set()
@@ -710,7 +723,7 @@ def _add_virtual_ips_set_default_dns_gateway(system_logger: logging.Logger) -> i
             networks.add_virtual_ips_to_default_adapter_by_current_setting(
                 virtual_ipv4s_to_add=IPS_TO_ASSIGN, virtual_ipv4_masks_to_add=MASKS_TO_ASSIGN,
                 dns_gateways=dns_gateway_server_list)
-        except PermissionError as e:
+        except (PermissionError, TimeoutError) as e:
             print_api.print_api(e, error_type=True, color="red", logger=system_logger)
             # Wait for the message to be printed and saved to file.
             time.sleep(1)

atomicshop/networks.py

@@ -2,6 +2,7 @@ import socket
 import time
 from typing import Union
 import os
+import psutil
 
 from icmplib import ping
 from icmplib.models import Host
@@ -10,6 +11,7 @@ from win32com.client import CDispatch
 from .wrappers.pywin32w.wmis import win32networkadapter, win32_networkadapterconfiguration, wmi_helpers, msft_netipaddress
 from .wrappers.ctyping import setup_device
 from .wrappers.winregw import winreg_network
+from .wrappers.psutilw import psutil_networks
 
 
 MICROSOFT_LOOPBACK_DEVICE_NAME: str = 'Microsoft KM-TEST Loopback Adapter'
@@ -42,7 +44,7 @@ def get_default_internet_ipv4_by_connect(target: str = "8.8.8.8") -> str:
         return s.getsockname()[0]  # local address of that route
 
 
-def get_default_internet_interface_name() -> str:
+def get_hostname() -> str:
     """
     Get the default network interface name that is being used for internet.
     :return: string, default network interface name.
@@ -51,6 +53,61 @@ def get_default_internet_interface_name() -> str:
     return socket.gethostname()
 
 
+def get_default_internet_interface_name() -> str | None:
+    """
+    Get the default network interface name that is being used for internet.
+    :return: string, default network interface name.
+    """
+
+    interface_dict: dict = psutil_networks.get_default_connection_name()
+    if not interface_dict:
+        result = None
+    else:
+        # Get the first interface name from the dictionary.
+        result = next(iter(interface_dict.keys()), None)
+
+    return result
+
+
+def get_interface_ips(
+        interface_name: str = None,
+        ipv4: bool = True,
+        ipv6: bool = True,
+        localhost: bool = True,
+        default_interface: bool = False
+):
+    if not ipv4 and not ipv6:
+        raise ValueError("At least one of ipv4 or ipv6 must be True.")
+    if default_interface and interface_name:
+        raise ValueError("You can't specify both default_interface and interface_name.")
+
+    if default_interface:
+        # Get the default interface name.
+        interface_name = get_default_internet_interface_name()
+
+    physical_ip_types: list[str] = []
+    if ipv4:
+        physical_ip_types.append("AF_INET")  # IPv4
+    if ipv6:
+        physical_ip_types.append("AF_INET6")  # IPv6
+
+    interfaces: dict = psutil.net_if_addrs()
+
+    ips = []
+    for name, addresses in interfaces.items():
+        if interface_name and interface_name != name:
+                continue
+
+        for address in addresses:
+            if address.family.name in physical_ip_types:
+                if not localhost and (address.address.startswith("127.") or address.address.startswith("::1")):
+                    # Skip localhost addresses if localhost is True.
+                    continue
+
+                ips.append(address.address)
+    return ips
+
+
 def get_microsoft_loopback_device_network_configuration(
         wmi_instance: CDispatch = None,
         timeout: int = 1,
@@ -351,6 +408,8 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
         availability_wait_seconds: int = 15,
         simulate_only: bool = False,
         locator: CDispatch = None,
+        wait_until_applied: bool = True,
+        wait_until_applied_seconds: int = 15
 ) -> tuple[list[str], list[str], list[str], list[str]]:
     """
     Add virtual IP addresses to the default network adapter.
@@ -381,6 +440,14 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
     :param simulate_only: bool, if True, the function will only prepare the ip addresses and return them without changing anything.
     :param locator: CDispatch, WMI locator object. If not specified, it will be created.
 
+    :param wait_until_applied: bool, if True, the function will wait until the IP addresses are applied.
+        By default, while WMI command is executed, there is no indication if the addresses were finished applying or not.
+        If you have 15+ addresses, it can take a while to apply them.
+    :param wait_until_applied_seconds: int, seconds to wait for the IP addresses to be applied.
+        This is different from availability_wait_seconds, which is the time to wait for the adapter to be available
+        after setting the IP addresses. This is the time to wait for the IP addresses to be
+        applied after setting them. If the IP addresses are not applied in this time, a TimeoutError will be raised.
+
     :return: tuple of lists, (current_ipv4s, current_ipv4_masks, ips_to_assign, masks_to_assign)
     """
 
@@ -462,4 +529,14 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
             # print("[!] No new IPs to assign.")
             pass
 
+        if wait_until_applied:
+            # Wait until the IP addresses are applied.
+            for _ in range(wait_until_applied_seconds):
+                current_ips = get_interface_ips(ipv4=True, ipv6=False, localhost=False, default_interface=True)
+                if set(current_ips) == set(ips):
+                    break
+                time.sleep(1)
+            else:
+                raise TimeoutError("Timeout while waiting for the IP addresses to be applied.")
+
     return current_ipv4s, current_ipv4_masks, ips_to_assign, masks_to_assign

atomicshop/wrappers/dockerw/install_docker.py

@@ -1,6 +1,10 @@
 import sys
+import os
 import subprocess
 import getpass
+import tempfile
+import textwrap
+from pathlib import Path
 
 from ... import process, filesystem
 from ...permissions import permissions, ubuntu_permissions
@@ -8,6 +12,11 @@ from ...print_api import print_api
 from .. import ubuntu_terminal
 
 
+PREPARATION_OUTPUT_DIR: str = str(Path(__file__).parent / "offline-bundle")
+PREPARATION_OUTPUT_ZIP: str = f"{PREPARATION_OUTPUT_DIR}.zip"
+GET_DOCKER_URL: str = "https://get.docker.com"
+
+
 def is_docker_installed():
     """
     The function will check if docker is installed.
@@ -109,6 +118,7 @@ def install_docker_ubuntu(
         # The script will also install docker-compose and docker-buildx.
         # process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh', shell=True)
         process.execute_script('curl -fsSL https://get.docker.com | sh', shell=True)
+        # subprocess.run("curl -fsSL https://get.docker.com | sh", shell=True, check=True)
         # process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh', shell=True)
         # process.execute_script('sh get-docker.sh', shell=True)
         # filesystem.remove_file('get-docker.sh')
@@ -210,3 +220,230 @@ def install_docker_ubuntu(
         print_api('Docker installation failed.', color='red')
         print_api('Please check the logs above for more information.', color='red')
         return 1
+
+
+def prepare_offline_installation_bundle():
+    # The Bash script in a single triple-quoted string - this is to easier copy-paste it if needed to run directly.
+    bash_script = textwrap.dedent(r"""#!/usr/bin/env bash
+#
+# Build an offline-install bundle for Docker Engine on Ubuntu 24.04 LTS.
+# The package list is auto-discovered from `get.docker.com --dry-run`.
+#
+#   sudo ./prepare_docker_offline.sh  [/path/to/output_dir]
+#
+set -Eeuo pipefail
+
+################################################################################
+# CLI PARAMETERS
+#   $1  → OUTDIR           (already supported: where to build the bundle)
+#   $2  → GET_DOCKER_URL   (defaults to https://get.docker.com)
+#   $3  → OUTPUT_ZIP       (defaults to "$OUTDIR.zip")
+################################################################################
+OUTDIR="${1:-"$PWD/offline-bundle"}"
+GET_DOCKER_URL="${2:-https://get.docker.com}"
+OUTPUT_ZIP="${3:-$OUTDIR.zip}"
+
+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
+
+echo "[*] Discovering package list via get.docker.com --dry-run ..."
+DRY_LOG=$(curl -fsSL "$GET_DOCKER_URL" | bash -s -- --dry-run)
+
+echo "[*] Determining package list via --dry-run ..."
+PKGS=$(printf '%s\n' "$DRY_LOG" | sed -n 's/.* install \(.*\) >\/dev\/null.*/\1/p')
+
+if ! grep -q '\S' <<< "$PKGS"; then
+  echo "No packages detected in dry-run output – aborting." >&2
+  exit 1
+fi
+
+echo "[*] Install Docker before preparing the offline bundle."
+curl -fsSL "$GET_DOCKER_URL" | sh
+
+mkdir -p "$OUTDIR"/packages
+echo "[*] Output directory: $OUTDIR"
+
+echo "Packages to install:"
+echo "$PKGS"
+
+echo "[*] Downloading packages and all dependencies …"
+apt-get update -qq
+apt-get clean
+mkdir -p /var/cache/apt/archives/partial
+apt-get -y --download-only --reinstall install $PKGS
+cp -v /var/cache/apt/archives/*.deb "$OUTDIR/packages/"
+echo "[*] $(ls "$OUTDIR/packages" | wc -l) .deb files written to packages/"
+
+echo "[*] Building local Packages.gz index …"
+pushd "$OUTDIR/packages" >/dev/null
+for deb in *.deb; do
+  dpkg-deb -f "$deb" Package
+done | awk '{printf "%s\tmisc\toptional\n",$1}' > override
+apt-ftparchive packages . override | tee Packages | gzip -9c > Packages.gz
+popd >/dev/null
+
+
+echo ">> Checking for Docker ..."
+command -v docker >/dev/null 2>&1 || { echo "Docker not found."; exit 1; }
+
+# Pack final bundle
+echo "[*] Creating a zip archive ..."
+parent_dir=$(dirname  "$OUTDIR")
+base_name=$(basename "$OUTDIR")
+
+# Create new shell, cd into the directory, and zip the contents. So that the zip file will not contain the full path.
+(
+  cd "$parent_dir"
+  zip -rq "$OUTPUT_ZIP" "$base_name"
+)
+
+rm -rf "$OUTDIR"
+echo "Docker offline bundle created at $OUTPUT_ZIP"
+echo
+echo "Copy the zip file and the offline installation python script to the target machine and execute."
+    """)
+
+    # 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
+
+    cmd = [
+        "sudo", "bash", temp_path,
+        PREPARATION_OUTPUT_DIR,
+        GET_DOCKER_URL,
+        PREPARATION_OUTPUT_ZIP,
+    ]
+
+    # 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)
+
+
+def install_offline_installation_bundle():
+    bash_script = textwrap.dedent(r"""#!/usr/bin/env bash
+# Offline installer for the Docker bundle produced by prepare_docker_offline.sh
+set -euo pipefail
+
+die()       { echo "ERROR: $*" >&2; exit 1; }
+need_root() { [[ $EUID -eq 0 ]] || die "Run as root (use sudo)"; }
+
+need_root
+
+# ------------------------------------------------------------------------------
+# Paths
+# ------------------------------------------------------------------------------
+BUNDLE_ZIP="${1:-"$PWD/offline-bundle.zip"}"
+
+BUNDLE_DIR="${BUNDLE_ZIP%.zip}"  # remove .zip suffix
+REPO_DIR="$BUNDLE_DIR/packages"                        # contains *.deb + Packages
+OFFLINE_LIST="/etc/apt/sources.list.d/docker-offline.list"
+
+# Extract zip archive if it exists
+if [[ -f "$BUNDLE_ZIP" ]]; then
+  echo "[*] Extracting offline bundle from $BUNDLE_ZIP ..."
+  mkdir -p "$BUNDLE_DIR"
+  unzip -q "$BUNDLE_ZIP" -d "."
+else
+  die "Bundle zip file '$BUNDLE_ZIP' not found. Provide a valid path."
+fi
+
+TEMP_PARTS="$(mktemp -d)"                              # empty dir ⇒ no extra lists
+
+# ------------------------------------------------------------------------------
+# Helper to clean up even if the script aborts
+# ------------------------------------------------------------------------------
+cleanup() {
+  sudo rm -f "$OFFLINE_LIST"
+  sudo rm -rf "$TEMP_PARTS"
+}
+trap cleanup EXIT
+
+# ------------------------------------------------------------------------------
+# 1. Add the local repository (trusted) as the *only* source we will use
+# ------------------------------------------------------------------------------
+echo "[*] Adding temporary APT source for the offline bundle …"
+echo "deb [trusted=yes] file:$REPO_DIR ./" | sudo tee "$OFFLINE_LIST" >/dev/null
+
+# Ensure plain index exists (APT always understands the un-compressed form)
+if [[ ! -f "$REPO_DIR/Packages" && -f "$REPO_DIR/Packages.gz" ]]; then
+    gunzip -c "$REPO_DIR/Packages.gz" > "$REPO_DIR/Packages"
+fi
+
+# ------------------------------------------------------------------------------
+# 2. Update metadata – but ONLY from our offline list
+# ------------------------------------------------------------------------------
+echo "[*] Updating APT metadata – offline only …"
+sudo apt-get -o Dir::Etc::sourcelist="$OFFLINE_LIST" \
+             -o Dir::Etc::sourceparts="$TEMP_PARTS" \
+             -o APT::Get::List-Cleanup="0" \
+             update -qq
+
+# ------------------------------------------------------------------------------
+# 3. Figure out which packages are inside the bundle
+# ------------------------------------------------------------------------------
+PKGS=$(awk '/^Package: /{print $2}' "$REPO_DIR/Packages")
+
+echo "[*] Installing:"
+printf '    • %s\n' $PKGS
+
+# ------------------------------------------------------------------------------
+# 4. Install them, again restricting APT to the offline repo only
+# ------------------------------------------------------------------------------
+sudo apt-get -y \
+     -o Dir::Etc::sourcelist="$OFFLINE_LIST" \
+     -o Dir::Etc::sourceparts="$TEMP_PARTS" \
+     install $PKGS
+
+echo "[✓] Docker installed completely offline!"
+
+usage() {
+  echo "Usage: $0 <image-archive.tar.gz>"
+  exit 1
+}
+
+echo ">> Checking for Docker ..."
+command -v docker >/dev/null 2>&1 || {
+  echo "Docker is not installed; install Docker and try again."
+  exit 1
+}
+
+echo "Removing extracted files..."
+rm -rf "$BUNDLE_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
+
+    cmd = [
+        "sudo", "bash", temp_path,
+        PREPARATION_OUTPUT_ZIP,  # $1  BUNDLE_ZIP
+    ]
+
+    # 4. 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/wrappers/githubw.py

@@ -78,7 +78,7 @@ class GitHubWrapper:
         Usage to download the latest release where the file name is 'test_file.zip':
             git_wrapper = GitHubWrapper(user_name='user_name', repo_name='repo_name')
             git_wrapper.download_and_extract_latest_release(
-                target_directory='target_directory', string_pattern='test_*.zip')
+                target_directory='target_directory', asset_pattern='test_*.zip')
         ================================================================================================================
         Usage to get the latest release json:
             git_wrapper = GitHubWrapper(user_name='user_name', repo_name='repo_name')
@@ -116,6 +116,10 @@ class GitHubWrapper:
         self.commits_url: str = str()
         self.contents_url: str = str()
 
+        self.releases_url: str = str()
+        self.releases_per_page: int = 100
+        self.releases_starting_page: int = 1
+
         if self.user_name and self.repo_name and not self.repo_url:
             self.build_links_from_user_and_repo()
 
@@ -143,6 +147,7 @@ class GitHubWrapper:
         self.api_url = f'https://api.{self.domain}/repos/{self.user_name}/{self.repo_name}'
 
         self.latest_release_json_url: str = f'{self.api_url}/releases/latest'
+        self.releases_url: str = f'{self.api_url}/releases'
         self.commits_url: str = f'{self.api_url}/commits'
         self.contents_url: str = f'{self.api_url}/contents'
         self.branch_download_link = f'{self.api_url}/{self.branch_type_directory}/{self.branch}'
@@ -272,21 +277,133 @@ class GitHubWrapper:
 
             download_directory(self.path, current_target_directory, headers)
 
+    def get_releases_json(
+            self,
+            asset_pattern: str = None,
+            latest: bool = False,
+            per_page: int = None,
+            starting_page: int = None,
+            all_assets: bool = False,
+    ):
+        """
+        This function will get the releases json.
+        :param asset_pattern: str, the string pattern to search in the asset names of releases. Wildcards can be used.
+            If there is a match, the release will be added to the result list.
+        :param latest: bool, if True, will get only the latest release.
+            If 'asset_pattern' is provided, 'latest' will find the latest release matching the pattern.
+            Of course if you want to get it from all releases, you must set 'all_assets' to True.
+        :param per_page: int, the number of releases per page. Default is 100.
+        :param starting_page: int, the starting page number. Default is 1.
+        :param all_assets: bool, if True, will get all releases matching the pattern across all pages
+            OR all assets if no pattern is provided.
+        :return:
+        """
+
+        # If 'latest' is True and no 'asset_pattern' is provided, we only need to get 1 release from page 1.
+        # No need to get more assets than the first one.
+        if latest and not asset_pattern:
+            per_page = 1
+            starting_page = 1
+            all_assets = False
+        # In all other cases, get the releases according to the provided parameters or defaults.
+        else:
+            if not per_page:
+                per_page = self.releases_per_page
+
+            if not starting_page:
+                starting_page = self.releases_starting_page
+
+        headers: dict = self._get_headers()
+
+        params: dict = {
+            'per_page': per_page,
+            'page': starting_page
+        }
+
+        all_releases = []
+        while True:
+            response = requests.get(self.releases_url, headers=headers, params=params)
+            releases = response.json()
+            # If no releases found on current page, there will be none on the next as well, break the loop.
+            if not releases:
+                break
+
+            # If 'asset_pattern' is provided, filter releases to only those that have matching assets.
+            if asset_pattern:
+                for release in releases:
+                    assets = release.get('assets', [])
+                    matching_assets = [asset for asset in assets if fnmatch.fnmatch(asset.get('name', ''), asset_pattern)]
+                    if matching_assets:
+                        all_releases.append(release)
+
+                        if latest:
+                            return all_releases
+            else:
+                all_releases.extend(releases)
+
+            if not all_assets:
+                break
+
+            params['page'] += 1
+
+        return all_releases
+
+    def get_latest_release_json(
+            self,
+            asset_pattern: str = None
+    ) -> dict:
+        """
+        This function will get the latest releases json.
+        :param asset_pattern: str, the string pattern to search in the asset names of releases. Wildcards can be used.
+            If there is a match, the release will be added to the result list.
+        :return: dict, the latest release json.
+        """
+
+        if asset_pattern:
+            releases = self.get_releases_json(
+                asset_pattern=asset_pattern,
+                latest=True,
+                all_assets=True
+            )
+        else:
+            releases = self.get_releases_json(latest=True)
+
+        if not releases:
+            return {}
+        else:
+            return releases[0]
+
+    def get_latest_release_version(
+            self,
+            asset_pattern: str = None
+    ) -> str:
+        """
+        This function will get the latest release version number.
+
+        :param asset_pattern: str, the string pattern to search in the asset names of releases. Wildcards can be used.
+            If there is a match, the release will be added to the result list.
+        :return: str, the latest release version number.
+        """
+
+        latest_release_json: dict = self.get_latest_release_json(asset_pattern=asset_pattern)
+        latest_release_version: str = latest_release_json['tag_name']
+        return latest_release_version
+
     def get_latest_release_url(
             self,
-            string_pattern: str,
-            exclude_string: str = None,
+            asset_pattern: str,
+            exclude_pattern: str = None,
             **kwargs):
         """
         This function will return the latest release url.
-        :param string_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
-        :param exclude_string: str, the string to exclude from the search. No wildcards can be used.
+        :param asset_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
+        :param exclude_pattern: str, the string to exclude from the search. No wildcards can be used.
         :param kwargs: dict, the print arguments for the 'print_api' function.
         :return: str, the latest release url.
         """
 
         # Get the 'assets' key of the latest release json.
-        github_latest_releases_list = self.get_the_latest_release_json()['assets']
+        github_latest_releases_list = self.get_latest_release_json()['assets']
 
         # Get only download urls of the latest releases.
         download_urls: list = list()
@@ -294,13 +411,13 @@ class GitHubWrapper:
             download_urls.append(single_dict['browser_download_url'])
 
         # Exclude urls against 'exclude_string'.
-        if exclude_string:
+        if exclude_pattern:
             for download_url in download_urls:
-                if exclude_string in download_url:
+                if exclude_pattern in download_url:
                     download_urls.remove(download_url)
 
-        # Find urls against 'string_pattern'.
-        found_urls: list = fnmatch.filter(download_urls, string_pattern)
+        # Find urls against 'asset_pattern'.
+        found_urls: list = fnmatch.filter(download_urls, asset_pattern)
 
         # If more than 1 url answer the criteria, we can't download it. The user must be more specific in his input
         # strings.
@@ -317,15 +434,15 @@ class GitHubWrapper:
     def download_latest_release(
             self,
             target_directory: str,
-            string_pattern: str,
+            asset_pattern: str,
             exclude_string: str = None,
             **kwargs):
         """
         This function will download the latest release from the GitHub repository.
         :param target_directory: str, the target directory to download the file.
-        :param string_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
+        :param asset_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
         :param exclude_string: str, the string to exclude from the search. No wildcards can be used.
-            The 'excluded_string' will be filtered before the 'string_pattern' entries.
+            The 'excluded_string' will be filtered before the 'asset_pattern' entries.
         :param kwargs: dict, the print arguments for the 'print_api' function.
         :return:
         """
@@ -333,7 +450,7 @@ class GitHubWrapper:
         headers: dict = self._get_headers()
 
         # Get the latest release url.
-        found_url = self.get_latest_release_url(string_pattern=string_pattern, exclude_string=exclude_string, **kwargs)
+        found_url = self.get_latest_release_url(asset_pattern=asset_pattern, exclude_string=exclude_string, **kwargs)
 
         downloaded_file_path = web.download(
             file_url=found_url, target_directory=target_directory, headers=headers, **kwargs)
@@ -342,7 +459,7 @@ class GitHubWrapper:
     def download_and_extract_latest_release(
             self,
             target_directory: str,
-            string_pattern: str,
+            asset_pattern: str,
             exclude_string: str = None,
             archive_remove_first_directory: bool = False,
             **kwargs):
@@ -350,7 +467,7 @@ class GitHubWrapper:
         This function will download the latest release from the GitHub repository, extract the file and remove the file,
         leaving only the extracted folder.
         :param target_directory: str, the target directory to download and extract the file.
-        :param string_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
+        :param asset_pattern: str, the string pattern to search in the latest release. Wildcards can be used.
         :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
@@ -362,7 +479,7 @@ class GitHubWrapper:
         headers: dict = self._get_headers()
 
         # Get the latest release url.
-        found_url = self.get_latest_release_url(string_pattern=string_pattern, exclude_string=exclude_string, **kwargs)
+        found_url = self.get_latest_release_url(asset_pattern=asset_pattern, exclude_string=exclude_string, **kwargs)
 
         web.download_and_extract_file(
             file_url=found_url,
@@ -371,24 +488,6 @@ class GitHubWrapper:
             headers=headers,
             **kwargs)
 
-    def get_the_latest_release_json(self):
-        """
-        This function will get the latest releases json.
-        :return:
-        """
-
-        headers: dict = self._get_headers()
-
-        response = requests.get(self.latest_release_json_url, headers=headers)
-        return response.json()
-
-    def get_the_latest_release_version_number(self):
-        """
-        This function will get the latest release version number.
-        :return:
-        """
-        return self.get_the_latest_release_json()['tag_name']
-
     def get_latest_commit(self) -> dict:
         """
         This function retrieves the latest commit on the specified branch.

atomicshop/wrappers/pycharmw/ubuntu.py

@@ -11,11 +11,9 @@ def parse_args():
     :return: Parsed arguments.
     """
     parser = argparse.ArgumentParser(description='Install PyCharm Community Edition.')
-    parser.add_argument('-ic', '--install_community', action='store_true', required=True,
-                        help='Install PyCharm Community Edition with snapd.')
-    parser.add_argument('--enable_sudo_execution', action='store_true',
-                        help='There is a problem when trying to run snapd installed Pycharm as sudo, need to enable '
-                             'this.')
+    parser.add_argument(
+        '--enable_sudo_execution', action='store_true',
+        help='There is a problem when trying to run snapd installed Pycharm as sudo, need to enable this.')
 
     return parser.parse_args()
 
@@ -30,10 +28,9 @@ def install_main():
 
     args = parse_args()
 
-    if args.install_community:
-        process.execute_script('sudo snap install pycharm-community --classic', shell=True)
+    process.execute_script('sudo snap install pycharm-professional --classic', shell=True)
 
     if args.enable_sudo_execution:
         process.execute_script('xhost +SI:localuser:root', shell=True)
-        print_api('Run the following command to start PyCharm as root: [sudo snap run pycharm-community]', color='blue')
+        print_api('Run the following command to start PyCharm as root: [sudo snap run pycharm-professional]', color='blue')
     return 0

atomicshop/wrappers/socketw/sni.py

@@ -260,21 +260,22 @@ class SNIHandler:
                 # If DNS server is enabled we'll get the domain from dns server.
                 if self.domain_from_dns_server:
                     self.sni_received_parameters.destination_name = self.domain_from_dns_server
-                    message = (
-                        f"SNI Passed: False\n"
-                        f"SNI Handler: No SNI was passed, using domain from DNS Server: {self.domain_from_dns_server}")
+                    print_api("SNI Passed: False", color="yellow", **(print_kwargs or {}))
+
+                    message = f"SNI Handler: No SNI was passed, using domain from DNS Server: {self.domain_from_dns_server}"
                     print_api(message, color="yellow", **(print_kwargs or {}))
                 # If DNS server is disabled, the domain from dns server will be empty.
                 else:
+                    print_api("SNI Passed: False", color="yellow", **(print_kwargs or {}))
+
                     message = (
-                        f"SNI Passed: False\n"
                         f"SNI Handler: No SNI was passed, No domain passed from DNS Server. Service name will be 'None'.")
                     print_api(message, color="yellow", **(print_kwargs or {}))
 
             # Setting "server_hostname" as a domain.
             self.sni_received_parameters.ssl_socket.server_hostname = self.sni_received_parameters.destination_name
+            print_api("SNI Passed: True", **(print_kwargs or {}))
             message = (
-                f"SNI Passed: True\n"
                 f"SNI Handler: port {self.sni_received_parameters.ssl_socket.getsockname()[1]}: "
                 f"Incoming connection for [{self.sni_received_parameters.ssl_socket.server_hostname}]")
             print_api(message, **(print_kwargs or {}))

{atomicshop-3.3.2.dist-info → atomicshop-3.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.3.2
+Version: 3.3.4
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT

{atomicshop-3.3.2.dist-info → atomicshop-3.3.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=8Ad5ESRJJbXiqt8GJU6Ro7MSdYdMqA0sQPjFqY8RsUU,122
+atomicshop/__init__.py,sha256=-H5JgHG0iCCH8pC2RNRvzeaxBh2DD3LjRloFS8OdaVQ,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
@@ -23,7 +23,7 @@ atomicshop/http_parse.py,sha256=1Tna9YbOM0rE3t6i_M-klBlwd1KNSA9skA_BqKGXDFc,1186
 atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw,11429
 atomicshop/ip_addresses.py,sha256=penRFeJ1-LDVTko4Q0EwK4JiN5cU-KzCBR2VXg9qbUY,1238
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
-atomicshop/networks.py,sha256=xOU_lDf6Rct178W7EB80-AFMgu9Nnh6l7GgjA9z9Jtg,19010
+atomicshop/networks.py,sha256=dTh6T9vAnjYOEPdfpL6W6wN091HwRbVLeNscXWZX_DI,22151
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
@@ -140,7 +140,7 @@ atomicshop/mitm/connection_thread_worker.py,sha256=50RP7De2t0WlUk4Ywmv6B63Gwvtvo
 atomicshop/mitm/import_config.py,sha256=J3ZLF28AsKu1h76iRV_sCM52g0oh4dwDGddZl_XcJsU,18351
 atomicshop/mitm/initialize_engines.py,sha256=qzz5jzh_lKC03bI1w5ebngVXo1K-RV3poAyW-nObyqo,11042
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=lHk66kai66W44y4Zu7z4eWRA2sZOwvuGHRzNjPHy31k,38291
+atomicshop/mitm/mitm_main.py,sha256=ucmdCr2p1F4c18DE8qJG3uG3FkkVLWdMEIWevN5BNKE,38967
 atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=5_sAYGX2Xunzo_pS2W5WijNCwr_BlGJbbOO462y_wN4,27533
@@ -197,7 +197,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=DrFF_oN-rulPQV1iKgVzZadCjuYuCC5eKAjZp_3YD0g,23476
+atomicshop/wrappers/githubw.py,sha256=bds_8fgyFyHXKwty6-SBS3H3Ueta2IMM5UQFpiFmgHQ,27554
 atomicshop/wrappers/msiw.py,sha256=GQLqud72nfex3kvO1bJSruNriCYTYX1_G1gSf1MPkIA,6118
 atomicshop/wrappers/netshw.py,sha256=8WE_576XiiHykwFuE-VkCx5CydMpFlztX4frlEteCtI,6350
 atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc,1025
@@ -225,7 +225,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEk
 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
-atomicshop/wrappers/dockerw/install_docker.py,sha256=CeDlxWuOn_bRUhHEnvpgVGGYZgP7B-Q9qNMkDfFiV2E,10073
+atomicshop/wrappers/dockerw/install_docker.py,sha256=9fjbx3GtpnNA4d4YU2ziPynqANXxo-x-Sq90SUSQEPg,18448
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elastic_infra.py,sha256=at0sD-SFtmEvfGyIU_YBEKoU-MNeVtDQSNscPm0JWLc,10368
@@ -300,7 +300,7 @@ atomicshop/wrappers/psutilw/psutil_networks.py,sha256=79FplDAj45ofBCudlft77O3lfi
 atomicshop/wrappers/psutilw/psutilw.py,sha256=q3EwgprqyrR4zLCjl4l5DHFOQoukEvQMIPjNB504oQ0,21262
 atomicshop/wrappers/psycopgw/psycopgw.py,sha256=XJvVf0oAUjCHkrYfKeFuGCpfn0Oxj3u4SbKMKA1508E,7118
 atomicshop/wrappers/pycharmw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/pycharmw/ubuntu.py,sha256=m9MpgqvIYygulhPxo9g2zlGGXrihBpiY3GNLNyT-B7U,1290
+atomicshop/wrappers/pycharmw/ubuntu.py,sha256=vOvGWvTbzvTja9tRrJW2yJb0_r1EV11RrENGHckzvVE,1051
 atomicshop/wrappers/pycharmw/win.py,sha256=hNP-d95z1zhcCpYqhHE5HZVYxaAlt8JJCNXh65jZsHc,2757
 atomicshop/wrappers/pywin32w/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/pywin32w/cert_store.py,sha256=dV1XyoKTFKZ-HCIVqU2Nd6CTZ8HANqjAXv26rsNzO6s,4365
@@ -328,7 +328,7 @@ atomicshop/wrappers/socketw/exception_wrapper.py,sha256=qW_1CKyPgGlsIt7_jusKkMV4
 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=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6DnPqK_XDUE,4754
-atomicshop/wrappers/socketw/sni.py,sha256=PT50BFOHN5X0ZIyQRHA_Rl4z_lUbkv0em7Chl0viUlw,17819
+atomicshop/wrappers/socketw/sni.py,sha256=YlKavbExcPFfHFLYAJ3i3W6QorY7o4mbQp39g-DnDKA,17911
 atomicshop/wrappers/socketw/socket_client.py,sha256=McBd3DeCy787oDGCEMUEP2awWy3vdkPqr9w-aFh2fBM,22502
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=u_v0pjMMrgsdtI0iPPddiLe2wXnBoqTgNM9Y3zjGD4U,41013
@@ -337,9 +337,9 @@ 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.3.2.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.2.dist-info/METADATA,sha256=0dnZPwzfNiqMA9qqJbgCwPT4OgNUkV1HWL9ZZhZ5YXY,9288
-atomicshop-3.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.3.2.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
-atomicshop-3.3.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.2.dist-info/RECORD,,
+atomicshop-3.3.4.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.4.dist-info/METADATA,sha256=AA-i4jzN5U9DaSNf-Hv_TuHfoMUeOR9-53KcyzR2xik,9288
+atomicshop-3.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.4.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
+atomicshop-3.3.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.4.dist-info/RECORD,,