dkinst 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

dkinst/__init__.py

@@ -1,4 +1,4 @@
 """Den K Simple Installer"""
 
 __author__ = "Den Kras"
-__version__ = '0.2.0'
+__version__ = '0.3.0'

dkinst/installers/_base.py

@@ -4,8 +4,6 @@ import tomllib
 from pathlib import Path
 from types import ModuleType
 from typing import Literal
-import os
-import ctypes
 
 
 INSTALLATION_PATH_PORTABLE_WINDOWS: str = "C:\\dkinst"      # Installation path for portable files on Windows that don't have a default location.

dkinst/installers/helpers/infra/msis.py

@@ -0,0 +1,151 @@
+import subprocess
+
+from rich.console import Console
+
+from . import permissions
+from atomicshop import get_process_list
+from atomicshop.wrappers.psutilw import processes
+
+
+console = Console()
+
+
+ERROR_CODES = {
+    '1603': 'The App is already installed or Insufficient permissions',
+    '1619': 'This installation package could not be opened. Verify that the package exists and that you can '
+            'install it manually, also check the installation command line switches'
+}
+
+
+class MsiInstallationError(Exception):
+    pass
+
+
+def get_current_msiexec_processes(msi_file_path: str = None) -> dict:
+    """
+    Get the current msiexec processes.
+    :param msi_file_path: string, OPTIONAL path to the MSI file to check in the command line.
+    :return: list of dicts, each key represents a pid and its values are process name and cmdline.
+    """
+
+    current_processes: dict = (
+        get_process_list.GetProcessList(get_method='pywin32', connect_on_init=True).get_processes())
+
+    current_msiexec_dict: dict = {}
+    for pid, process_info in current_processes.items():
+        if 'msiexec.exe' in process_info['name']:
+            if msi_file_path:
+                if msi_file_path in process_info['cmdline']:
+                    current_msiexec_dict[pid] = process_info
+            else:
+                current_msiexec_dict[pid] = process_info
+
+    return current_msiexec_dict
+
+
+def wait_for_msiexec_processes_to_finish(msi_file_path: str):
+    """
+    Wait for the msiexec processes to finish.
+    :param msi_file_path: string, path to the MSI file.
+    :return:
+    """
+
+    current_msiexec: dict = get_current_msiexec_processes(msi_file_path)
+    current_pid = list(current_msiexec.keys())[0]
+
+    result_code = processes.wait_for_process(current_pid)
+    if result_code != 0:
+        raise Exception(f"MSI Installation failed. Return code: {result_code}")
+
+
+def install_msi(
+        msi_path,
+        silent_no_gui: bool = False,
+        silent_progress_bar: bool = False,
+        no_restart: bool = False,
+        terminate_required_processes: bool = False,
+        additional_args: str = None,
+        create_log_near_msi: bool = False,
+        log_file_path: str = None,
+        scan_log_for_errors: bool = False,
+        # as_admin=True
+):
+    """
+    Install an MSI file silently.
+    :param msi_path: str, path to the MSI file.
+    :param silent_no_gui: bool, whether to run the installation silently, without showing GUI.
+    :param silent_progress_bar: bool, whether to show a progress bar during silent installation.
+    :param no_restart: bool, whether to restart the computer after installation.
+    :param terminate_required_processes: bool, whether to terminate processes that are required by the installation.
+    :param additional_args: str, additional arguments to pass to the msiexec command.
+    :param create_log_near_msi: bool, whether to create a log file near the MSI file.
+        If the msi file located in 'c:\\path\\to\\file.msi', the log file will be created in 'c:\\path\\to\\file.log'.
+        The log options that will be used: /l*v c:\\path\\to\\file.log
+    :param log_file_path: str, path to the log file. Even if 'create_log_near_msi' is False, you can specify a custom
+        path for the log file, and it will be created.
+        The log options that will be used: /l*v c:\\path\\to\\file.log
+    :param scan_log_for_errors: bool, whether to scan the log file for errors in case of failure.
+    # :param as_admin: bool, whether to run the installation as administrator.
+    :return:
+    """
+
+    if not permissions.is_admin():
+        raise PermissionError("This function requires administrator privileges.")
+
+    if silent_progress_bar and silent_no_gui:
+        raise ValueError("silent_progress_bar and silent_no_gui cannot be both True.")
+
+    if create_log_near_msi and log_file_path:
+        raise ValueError("create_log_near_msi and log_file_path cannot be both set.")
+
+    if create_log_near_msi:
+        log_file_path = msi_path.replace('.msi', '.log')
+
+    if scan_log_for_errors and not log_file_path:
+        raise ValueError("[scan_log_for_errors] is set, but [log_file_path] or [create_log_near_msi] is not set.")
+
+    # Define the msiexec command
+    command = f'msiexec /i "{msi_path}"'
+
+    if silent_no_gui:
+        command = f"{command} /qn"
+    if silent_progress_bar:
+        command = f"{command} /qb"
+    if no_restart:
+        command = f"{command} /norestart"
+
+    if log_file_path:
+        command = f"{command} /l*v {log_file_path}"
+
+    if terminate_required_processes:
+        command = f"{command} REBOOT=ReallySuppress"
+
+    if additional_args:
+        if additional_args.startswith(' '):
+            additional_args = additional_args[1:]
+        command = f"{command} {additional_args}"
+
+    # if as_admin:
+    #     command = win_permissions.get_command_to_run_as_admin_windows(command)
+
+    # Run the command
+    result = subprocess.run(command, capture_output=True, text=True)
+
+    # Check the result
+    if result.returncode == 0:
+        console.print("MSI Installation completed.", style="green")
+    else:
+        message = (f"Installation failed. Return code: {result.returncode}\n{ERROR_CODES.get(str(result.returncode), '')}\n"
+                   f"MSI path: {msi_path}\nCommand: {command}\nOutput: {result.stdout}\nError: {result.stderr}")
+
+        if scan_log_for_errors:
+            with open(log_file_path, 'r', encoding='utf-16 le') as f:
+                log_content = f.read()
+            if 'error' in log_content.lower():
+                # Get the error text of the lines that contain 'error'.
+                error_lines = [line for line in log_content.split('\n') if 'error' in line.lower()]
+                for line in error_lines:
+                    message += f"\n{line}"
+
+        console.print(message, style="red")
+        raise MsiInstallationError("MSI Installation Failed.")

dkinst/installers/helpers/infra/system.py

@@ -0,0 +1,25 @@
+import os
+import platform
+
+
+def get_platform() -> str:
+    """Return the current platform as a string."""
+    current_platform = platform.system().lower()
+    if current_platform == "windows":
+        return "windows"
+    elif current_platform == "linux":
+        if is_debian():
+            return "debian"
+        else:
+            return "linux unknown"
+    else:
+        return ""
+
+
+def is_debian() -> bool:
+    """Check if the current Linux distribution is Debian-based."""
+    if os.path.exists("/etc/os-release"):
+        with open("/etc/os-release") as f:
+            data = f.read().lower()
+            return "debian" in data
+    return False

dkinst/installers/helpers/modules/nodejs_installer.py

@@ -0,0 +1,419 @@
+import sys
+import subprocess
+import requests
+import argparse
+
+from rich.console import Console
+
+from atomicshop.wrappers import githubw
+
+from ..infra import system
+
+
+console = Console()
+
+
+VERSION: str = "1.0.0"
+
+
+# === WINDOWS FUNCTIONS ================================================================================================
+import os
+import time
+import tempfile
+
+from atomicshop import web
+
+from ..infra import permissions, msis
+
+
+WINDOWS_X64_SUFFIX: str = "x64.msi"
+
+
+class NodeJSWindowsInstallerNoVersionsFound(Exception):
+    pass
+
+
+class NodeJSWindowsInstallerMoreThanOneVersionFound(Exception):
+    pass
+
+
+class NodeJSWindowsInstallerFailedToExtractFileNameFromString(Exception):
+    pass
+
+
+class NodeJSWindowsInstallerFailedToExtractVersionInString(Exception):
+    pass
+
+
+def is_nodejs_installed_win() -> bool:
+    """
+    Check if Node.js is installed by trying to run 'node -v'.
+    """
+    print("Checking if Node.js is installed...")
+    try:
+        try:
+            node_version = subprocess.check_output(["node", "-v"], text=True)
+        except FileNotFoundError:
+            console.print(f"node.exe is not found.", style="red")
+            raise
+
+        node_version = node_version.replace("\n", "")
+        console.print(f"node.exe is found. Version: {node_version}", style="green")
+
+        try:
+            npm_version = subprocess.check_output(["npm.cmd", "-v"], text=True).strip()
+        except FileNotFoundError:
+            console.print(f"npm.cmd is not found.", style="red")
+            raise
+
+        npm_version = npm_version.replace("\n", "")
+        console.print(f"npm.cmd is found. Version: {npm_version}", style="green")
+        print("Node.js is installed.")
+        return True
+    except FileNotFoundError:
+        print("Node.js is not installed.")
+        return False
+
+
+def add_nodejs_to_session_path_win():
+    """
+    Add Node.js to the PATH for the current CMD session.
+    This is needed if the installation was done in the same session where
+    you want to use Node.js right after the installation without restarting the CMD session.
+    """
+
+    print("Adding Node.js to the PATH for the current session...")
+    # Get the installation directory from the default Node.js install path
+    program_files = os.environ.get("ProgramFiles", "C:\\Program Files")
+    nodejs_path = os.path.join(program_files, "nodejs")
+
+    if os.path.exists(nodejs_path):
+        print(f"Node.js installation found at: {nodejs_path}")
+        current_path = os.environ.get("PATH", "")
+        if nodejs_path not in current_path:
+            # Add Node.js to the PATH for the current process
+            os.environ["PATH"] = f"{nodejs_path};{current_path}"
+            print("Node.js has been added to the PATH for this session.")
+        else:
+            print("Node.js is already in the current session PATH.")
+    else:
+        print("Node.js installation directory not found.")
+
+
+def get_latest_nodejs_version_win() -> str | None:
+    """
+    Fetch the latest Node.js version from the official Node.js website.
+    """
+    print("Fetching the latest Node.js version...")
+    url = "https://nodejs.org/dist/latest/SHASUMS256.txt"
+
+    response = requests.get(url, timeout=10)
+    response.raise_for_status()
+    # Parse the file for the Node.js version
+    found_versions: list = []
+    for line in response.text.splitlines():
+        if line.endswith(WINDOWS_X64_SUFFIX):
+            found_versions.append(line)
+
+    if not found_versions:
+        raise NodeJSWindowsInstallerNoVersionsFound("No Node.js versions found in [https://nodejs.org/dist/latest/SHASUMS256.txt]")
+    elif len(found_versions) > 1:
+        raise NodeJSWindowsInstallerMoreThanOneVersionFound(f"More than one Node.js version found:\n"
+                                                            f"{'\n'.join(found_versions)}")
+
+    try:
+        file_name = found_versions[0].split("  ")[-1]
+    except IndexError:
+        raise NodeJSWindowsInstallerFailedToExtractFileNameFromString("Failed to extract the file name from the string.")
+
+    try:
+        version = file_name.replace("node-v", "").replace(f"-{WINDOWS_X64_SUFFIX}", "")
+    except Exception:
+        raise NodeJSWindowsInstallerFailedToExtractVersionInString("Failed to extract the version from the string.")
+
+    print(f"Latest Node.js version: {version}")
+    return version
+
+
+def download_nodejs_installer_win(version):
+    """
+    Download the Node.js MSI installer for Windows.
+    """
+
+    version = f"v{version}"
+    nodejs_base_url = f"https://nodejs.org/dist/{version}/"
+    file_name = f"node-{version}-x64.msi"
+    download_url = nodejs_base_url + file_name
+    print(f"Downloading Node.js installer from: {download_url}")
+
+    # Make temporary directory to store the installer
+    temp_dir = tempfile.gettempdir()
+    temp_file_path = web.download(download_url, temp_dir)
+    return temp_file_path
+
+
+def clean_up_win(installer_path) -> None:
+    """
+    Remove the installer file after installation.
+    """
+
+    if os.path.exists(installer_path):
+        os.remove(installer_path)
+        print(f"Removed installer: {installer_path}")
+
+
+def install_nodejs_win(
+        force: bool = False
+) -> int:
+    """
+    Install Node.js on Windows.
+
+    :param force: bool, if True, the function will install Node.js even if it is already installed.
+    :return: int, 0 if successful, 1 if failed.
+    """
+    if not permissions.is_admin():
+        console.print("This script requires administrative privileges to install Node.js.", style="red")
+        return 1
+
+    if is_nodejs_installed_win() and not force:
+            console.print("Node.js is already installed. Use the [force] to install without prompt. Do you want to install anyway? [y/n]", style="yellow", markup=False)
+            if input().strip().lower() != 'y':
+                print("Exiting without installation.")
+                return 0
+
+    console.print("Starting Node.js installation process...", style="blue")
+    try:
+        version = get_latest_nodejs_version_win()
+    except Exception as e:
+        console.print(str(e), style="red")
+        return 1
+    if not version:
+        console.print("Exiting: Could not fetch the latest Node.js version.", style="red")
+        return 1
+
+    installer_path = download_nodejs_installer_win(version)
+    if not installer_path:
+        console.print("Exiting: Failed to download the Node.js installer.", style="red")
+        return 1
+
+    msis.install_msi(installer_path, silent_progress_bar=True)
+    time.sleep(5)  # Wait a few seconds for the installation to complete
+
+    try:
+        clean_up_win(installer_path)
+    except Exception as e:
+        console.print(f"Failed to clean up the installer: {e}", style="red")
+        return 1
+    console.print("Installation process finished.", style="green")
+
+    # Add Node.js to the PATH for the current session, so we can verify the installation right away.
+    add_nodejs_to_session_path_win()
+    if not is_nodejs_installed_win():
+        console.print("Node.js installation verification failed.", style="red")
+        return 1
+
+    return 0
+# === EOF WINDOWS FUNCTIONS ============================================================================================
+
+
+# === UBUNTU FUNCTIONS =================================================================================================
+def install_npm_package_ubuntu(package_name: str, sudo: bool = True):
+    """
+    The function will install a npm package on Ubuntu.
+    :param package_name: str, the name of the package to install.
+    :param sudo: bool, if True, the function will use sudo.
+        NPM commands require sudo to install global packages.
+    :return:
+    """
+
+    # Check if Node.js is installed.
+    if not is_nodejs_installed_ubuntu():
+        return
+
+    command = f"npm install -g {package_name}"
+
+    if sudo:
+        command = f"sudo {command}"
+
+    _ = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
+
+
+def is_nodejs_installed_ubuntu():
+    """
+    The function will check if Node.js is installed.
+    :return: bool.
+    """
+
+    try:
+        # Run the command 'node -v'
+        result = subprocess.run(['node', '-v'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+
+        # Check if the command was successful
+        if result.returncode == 0:
+            message = f"Node.js installed. Version: {result.stdout.strip()}"
+            console.print(message, style='green')
+            return True
+        else:
+            print("Node.js is not installed.")
+            return False
+    except FileNotFoundError:
+        print("Node command not found. Node.js is not installed.")
+        return False
+
+
+def get_nodejs_latest_version_ubuntu(
+        by_github_api: bool = True,
+        _by_nodejs_website: bool = False,
+        get_major: bool = False
+) -> str:
+    """
+    The function will get the latest version number of Node.js.
+    :param by_github_api: bool, if True, the function will get the version number using the GitHub API.
+        Limitations: rate limits apply.
+    :param _by_nodejs_website: bool, if True, the function will get the version number using the Node.js website.
+        Limitations: the website structure can change and the json file is relatively large.
+        This is only for reference, it is not tested.
+    :param get_major: bool, if True, the function will return only the major version number string.
+    :return: str.
+    """
+
+    if by_github_api and _by_nodejs_website:
+        raise ValueError("Only one of the arguments can be True.")
+    elif not by_github_api and not _by_nodejs_website:
+        raise ValueError("At least one of the arguments must be True.")
+
+    latest_version = ''
+    if by_github_api:
+        github_wrapper = githubw.GitHubWrapper('nodejs', 'node')
+        latest_version = github_wrapper.get_latest_release_version()
+    elif _by_nodejs_website:
+        url = "https://nodejs.org/dist/index.json"
+        response = requests.get(url)
+        versions = response.json()
+        latest_version = versions[0]['version']  # Assuming the first one is the latest.
+
+    if get_major:
+        latest_version = latest_version.replace('v', '')
+        latest_version = latest_version.split('.')[0]
+
+    return latest_version
+
+
+def install_nodejs_ubuntu(
+        latest: bool = False,
+        lts: bool = True,
+        version: str = None,
+        force: bool = False
+):
+    """
+    The function will install Node.js on Ubuntu.
+
+    :param latest: bool, if True, the function will install the latest version of Node.js.
+    :param lts: bool, if True, the function will install the LTS version of Node.js.
+    :param version: str, the version number of Node.js to install.
+    :param force: bool, if True, the function will install Node.js even if it is already installed.
+
+    :return:
+    """
+
+    if latest + lts + (version is not None) > 1:
+        raise ValueError("Only one of the arguments can be set to True or provided: latest, lts, version.")
+    if not latest and not lts and version is None:
+        raise ValueError("At least one of the arguments must be set to True or provided: latest, lts, version.")
+
+    # Check if Node.js is already installed.
+    if is_nodejs_installed_ubuntu():
+        if not force:
+            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("Adding NodeSource repository...")
+
+    # Fetch and execute the NodeSource repository setup script.
+    if latest:
+        version: str = get_nodejs_latest_version_ubuntu(get_major=True)
+
+    command: str = ''
+    if latest or version:
+        command = f"curl -fsSL https://deb.nodesource.com/setup_{version}.x | sudo -E bash -"
+    elif lts:
+        command = "curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -"
+
+    _ = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
+
+    subprocess.check_call(['sudo', 'apt', 'update'])
+    subprocess.check_call(["sudo", "apt", "install", "-y", "nodejs"])
+
+    # Check if Node.js is installed.
+    is_nodejs_installed_ubuntu()
+
+
+def _make_parser():
+    parser = argparse.ArgumentParser(description="Install Node.js on Ubuntu.")
+    parser.add_argument(
+        '--latest',
+        action='store_true',
+        help="Install the latest version of Node.js."
+    )
+    parser.add_argument(
+        '--lts',
+        action='store_true',
+        help="Install the LTS version of Node.js. Available only for Ubuntu."
+    )
+    parser.add_argument(
+        '--version',
+        type=str,
+        help="Install a specific version of Node.js. Available only for Ubuntu."
+    )
+    parser.add_argument(
+        '--force',
+        action='store_true',
+        help="Force the installation of Node.js."
+    )
+
+    return parser
+# === EOF UBUNTU FUNCTIONS =============================================================================================
+
+
+def main(
+        latest: bool = False,
+        lts: bool = False,
+        version: str = None,
+        force: bool = False
+) -> int:
+    """
+    The function will install Node.js on Ubuntu or Windows.
+
+    :param latest: bool, if True, the function will install the latest version of Node.js.
+    :param lts: bool, if True, the function will install the LTS version of Node.js.
+    :param version: str, the version number of Node.js to install.
+    :param force: bool, if True, the function will install Node.js even if it is already installed.
+
+    :return:
+    """
+
+    if latest + lts + (version is not None) > 1:
+        raise ValueError("Only one of the arguments can be set to True or provided: latest, lts, version.")
+    if not latest and not lts and version is None:
+        raise ValueError("At least one of the arguments must be set to True or provided: latest, lts, version.")
+
+    current_platform: str = system.get_platform()
+    if current_platform == "debian":
+        install_nodejs_ubuntu(latest, lts, version, force)
+    elif current_platform == "windows":
+        if version or lts:
+            console.print("On Windows, only [latest] arguments is implemented; [version] and [lts] arguments aren't available.", style="red", markup=False)
+            return 1
+        install_nodejs_win(force)
+    else:
+        console.print(f"Node.js installation on {current_platform} is not implemented yet.", style="red")
+        return 1
+
+    return 0
+
+
+if __name__ == '__main__':
+    nodejs_parser = _make_parser()
+    args = nodejs_parser.parse_args()
+    sys.exit(main(**vars(args)))

dkinst/installers/helpers/{tesseract_ocr_manager.py → modules/tesseract_ocr_manager.py}

@@ -399,13 +399,4 @@ def main(
 if __name__ == '__main__':
     parser = _make_parser()
     args = parser.parse_args()
-    sys.exit(main(
-        installer_usage=args.installer_usage,
-        compile_portable=args.compile_portable,
-        installer_version_string_fetch=args.installer_version_string_fetch,
-        compile_version_string_fetch=args.compile_version_string_fetch,
-        get_path=args.get_path,
-        set_path=args.set_path,
-        force=args.force,
-        exe_path=args.exe_path
-    ))
+    sys.exit(main(**vars(args)))

dkinst/installers/nodejs.py

@@ -0,0 +1,53 @@
+from pathlib import Path
+from types import ModuleType
+from typing import Literal
+
+from rich.console import Console
+
+from . import _base
+from .helpers.modules import nodejs_installer
+
+
+console = Console()
+
+
+class NodeJS(_base.BaseInstaller):
+    def __init__(self):
+        super().__init__()
+        self.name: str = Path(__file__).stem
+        self.description: str = "NodeJS Installer"
+        self.version: str = nodejs_installer.VERSION
+        self.platforms: list = ["windows", "debian"]
+        self.helper: ModuleType | None = nodejs_installer
+
+    def install(
+            self,
+            force: bool = False
+    ):
+        nodejs_installer.main(
+            latest=True,
+            force=force
+        )
+
+    def _show_help(
+            self,
+            method: Literal["install", "uninstall", "update"]
+    ) -> None:
+        if method == "install":
+            method_help: str = (
+                "This method uses the [nodejs_installer.py] with the following arguments:\n"
+                "  --latest               - install the latest stable version.\n"
+                "\n"
+                "  --force                - force install on ubuntu.\n"
+                "  This one is used only if you provide it explicitly to the 'install' command. Example:\n"
+                "    dkinst install nodejs force\n"
+                "\n"
+                "You can also use the 'manual' method to provide custom arguments to the helper script.\n"
+                "Example:\n"
+                "  dkinst manual nodejs help\n"
+                "  dkinst manual nodejs --lts --force\n"
+                "\n"
+            )
+            print(method_help)
+        else:
+            raise ValueError(f"Unknown method '{method}'.")

dkinst/installers/robocorp.py

@@ -4,10 +4,8 @@ from typing import Literal
 import subprocess
 from rich.console import Console
 
-from atomicshop.wrappers.nodejsw import install_nodejs_windows
-
-from . import _base
-from .helpers import permissions
+from . import _base, tesseract_ocr, nodejs
+from .helpers.infra import permissions
 
 
 console = Console()
@@ -31,15 +29,12 @@ class Robocorp(_base.BaseInstaller):
             return 1
 
         console.print(f"Installing Tesseract OCR", style="blue")
-        subprocess.check_call(["dkinst", "install", "tesseract_ocr"])
+        tesseract_ocr_wrapper = tesseract_ocr.TesseractOCR()
+        tesseract_ocr_wrapper.install()
 
         console.print("Installing NodeJS.", style="blue")
-        if not install_nodejs_windows.is_nodejs_installed():
-            install_nodejs_windows.install_nodejs_windows()
-        install_nodejs_windows.add_nodejs_to_path()
-        if not install_nodejs_windows.is_nodejs_installed():
-            console.print("Node.js installation failed.", style="red")
-            return 1
+        nodejs_wrapper = nodejs.NodeJS()
+        nodejs_wrapper.install(force=True)
 
         console.print("PIP Installing Robocorp.", style="blue")
         subprocess.check_call(["pip", "install", "--upgrade", "rpaframework"])
@@ -50,12 +45,13 @@ class Robocorp(_base.BaseInstaller):
         console.print("PIP Installing Robocorp-Recognition.", style="blue")
         subprocess.check_call(["pip", "install", "--upgrade", "rpaframework-recognition"])
 
-        console.print("Installing Playwright browsers.", style="blue")
-        subprocess.check_call(["playwright", "install"])
-
         console.print("Initializing Robocorp Browser.", style="blue")
         subprocess.check_call(["rfbrowser", "init"])
 
+        # Robocorp browser init already installs the browsers.
+        # console.print("Installing Playwright browsers.", style="blue")
+        # subprocess.check_call(["playwright", "install"])
+
         console.print("Installing Additional modules.", style="blue")
         subprocess.check_call(["pip", "install", "--upgrade", "matplotlib", "imagehash", "pynput"])
 
@@ -75,6 +71,8 @@ class Robocorp(_base.BaseInstaller):
         with open(window_file_path, "w") as file:
             file.write(file_content)
 
+        console.print("Robocorp Framework installation/update finished.", style="green")
+
         return 0
 
     def update(

dkinst/installers/tesseract_ocr.py

@@ -3,7 +3,7 @@ from types import ModuleType
 from typing import Literal
 
 from . import _base
-from . helpers import tesseract_ocr_manager
+from . helpers.modules import tesseract_ocr_manager
 
 
 class TesseractOCR(_base.BaseInstaller):

{dkinst-0.2.0.dist-info → dkinst-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkinst
-Version: 0.2.0
+Version: 0.3.0
 Summary: Den K Simple Installer
 Author: Denis Kras
 License-Expression: MIT
@@ -13,6 +13,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: wheel
 Requires-Dist: rich==14.1.0
+Requires-Dist: atomicshop
 Dynamic: license-file
 
 <h1 align="center">Den K Simple Installer - dkinst</h1>

dkinst-0.3.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+dkinst/__init__.py,sha256=yrpmpeooGjTyca-HjKEveukduk-rtLzMPdtArZNuMLI,78
+dkinst/cli.py,sha256=4jLmbW73FInE21i1FXhuhM6eymWhA4Pvicl34H62K_4,9278
+dkinst/config.toml,sha256=OaTuImf9xBIbTNCrC2MfAzpPLeuDdV2R5feIfT7xImA,48
+dkinst/installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dkinst/installers/_base.py,sha256=2Ke4pQevOq3SRpCI1YKB9JrIwKIacPvAAMfjKn7IG20,10280
+dkinst/installers/nodejs.py,sha256=34UObZLKjRIKcQt3Omslcqyuibm1m6u9nR6-W472gqY,1781
+dkinst/installers/robocorp.py,sha256=yDBnA6sFjMSiOhwtyMRd59K-k6VC-42e5zVjeYZbmR4,4141
+dkinst/installers/tesseract_ocr.py,sha256=iEW6S9CxzGRrhzYW0A0FMwgb6SxKXOOfCdiI1EAG5W0,2532
+dkinst/installers/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dkinst/installers/helpers/infra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dkinst/installers/helpers/infra/msis.py,sha256=WQCTo3CsublO_xfyAgim5_HqlzMbjfhuYLM6zrqjAng,6036
+dkinst/installers/helpers/infra/permissions.py,sha256=CYTDVOI0jh9ks0ZLnnOuPzppgCszFEc9-92DTkVTYi4,522
+dkinst/installers/helpers/infra/system.py,sha256=CovoRRRz3TFEHKzHjuoSEJ2vrJGSbUETm3j5m-fjC2I,676
+dkinst/installers/helpers/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dkinst/installers/helpers/modules/nodejs_installer.py,sha256=5aeZzQ9ABSbWwizQQOeaPBWD-78qmzbmy1lKl6khM_o,14966
+dkinst/installers/helpers/modules/tesseract_ocr_manager.py,sha256=lJYVJDp5OTto4GHY1xkvJUkXCR1sgcOwj3UEUvfbPps,17369
+dkinst-0.3.0.dist-info/licenses/LICENSE,sha256=ohlj1rmsTHdctr-wyqmP6kbFC6Sff8pJd29v3pruZ18,1088
+dkinst-0.3.0.dist-info/METADATA,sha256=hG9Ad2h4YmGl7FrMjLN9TQmNQD2UoWypWorirfLm2gE,2045
+dkinst-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkinst-0.3.0.dist-info/entry_points.txt,sha256=YNgO3GufKMdA_oRqWEGAVh6k00oIuPItqqChoUtU278,43
+dkinst-0.3.0.dist-info/top_level.txt,sha256=_dGNrME6z6Ihv2sxGC4hfAlnVuhoDlKwx-97LZ2xtQ0,7
+dkinst-0.3.0.dist-info/RECORD,,

dkinst-0.2.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-dkinst/__init__.py,sha256=S9yw_pl4J-PdSgFEDS7IQqPh-mDYidu8SUSUrDHBeYg,78
-dkinst/cli.py,sha256=4jLmbW73FInE21i1FXhuhM6eymWhA4Pvicl34H62K_4,9278
-dkinst/config.toml,sha256=OaTuImf9xBIbTNCrC2MfAzpPLeuDdV2R5feIfT7xImA,48
-dkinst/installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkinst/installers/_base.py,sha256=03KA1u23EKhArJV_SNlST3ss-Pvs6U6YPUEZxHYC_94,10306
-dkinst/installers/robocorp.py,sha256=WAO8s9VZfQ29cPve1xMr1y5R74WaNZJf-BOOjPsC1VU,4232
-dkinst/installers/tesseract_ocr.py,sha256=LqcOJCTQJU3xPz3wm_nQI5Bt6bB5dgDPzf7WykpSM6A,2524
-dkinst/installers/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkinst/installers/helpers/permissions.py,sha256=CYTDVOI0jh9ks0ZLnnOuPzppgCszFEc9-92DTkVTYi4,522
-dkinst/installers/helpers/tesseract_ocr_manager.py,sha256=-Br9vHbqcQHRsNlDkakw5mLMxMBTydqXCblhpcBmp0A,17734
-dkinst-0.2.0.dist-info/licenses/LICENSE,sha256=ohlj1rmsTHdctr-wyqmP6kbFC6Sff8pJd29v3pruZ18,1088
-dkinst-0.2.0.dist-info/METADATA,sha256=t8sA7dOIwT_cOwOak7YTl4D-oarFbmfpbUnZ75n8SY4,2018
-dkinst-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkinst-0.2.0.dist-info/entry_points.txt,sha256=YNgO3GufKMdA_oRqWEGAVh6k00oIuPItqqChoUtU278,43
-dkinst-0.2.0.dist-info/top_level.txt,sha256=_dGNrME6z6Ihv2sxGC4hfAlnVuhoDlKwx-97LZ2xtQ0,7
-dkinst-0.2.0.dist-info/RECORD,,