dkinst 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

dkinst/__init__.py

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

dkinst/cli.py

@@ -13,6 +13,7 @@ from . import __version__
 from .installers._base import BaseInstaller
 from .installers import _base
 from . import installers
+from .installers.helpers.infra import system
 
 console = Console()
 
@@ -179,14 +180,9 @@ def main() -> int:
             inst._platforms_known()
 
             # Now check if the current platform is supported by this installer.
-            current_platform = sys.platform
-            if current_platform in _base.PLATFORM_CONVERTION:
-                installers_kommon_platform = _base.PLATFORM_CONVERTION[current_platform]
-                if installers_kommon_platform not in inst.platforms:
-                    console.print(f"This installer [{inst.name}] does not support your platform [{current_platform}].", style='red', markup=False)
-                    return 1
-            else:
-                console.print(f"This platform is unknown: [{current_platform}]", style='red', markup=False)
+            current_platform = system.get_platform()
+            if current_platform not in inst.platforms:
+                console.print(f"This installer [{inst.name}] does not support your platform [{current_platform}].", style='red', markup=False)
                 return 1
 
             # Processing the 'manual' method.

dkinst/installers/_base.py

@@ -9,19 +9,6 @@ from typing import Literal
 INSTALLATION_PATH_PORTABLE_WINDOWS: str = "C:\\dkinst"      # Installation path for portable files on Windows that don't have a default location.
 
 KNOWN_SUPPORTED_PLATFORMS: list[str] = ["windows", "debian"]
-PLATFORM_CONVERTION: dict[str, str] = {    # Convert sys.platform to installer platform names.
-    "linux": "linux",
-    "linux2": "linux",
-    "darwin": "macos",
-    "win32": "windows",
-    "cygwin": "windows",
-    "msys": "windows",
-    "freebsd": "freebsd",
-    "openbsd": "freebsd",
-    "netbsd": "freebsd",
-    "aix": "aix",
-    "sunos5": "solaris",
-}
 
 KNOWN_METHODS: list[str] | None = None
 CUSTOM_METHODS: list[str] = ["manual"]

dkinst/installers/helpers/infra/msis.py

@@ -1,10 +1,12 @@
 import subprocess
+import platform
 
 from rich.console import Console
 
-from . import permissions
-from atomicshop import get_process_list
-from atomicshop.wrappers.psutilw import processes
+if platform.system().lower() == 'windows':
+    from . import permissions
+    from atomicshop import get_process_list
+    from atomicshop.wrappers.psutilw import processes
 
 
 console = Console()

dkinst/installers/helpers/modules/nodejs_installer.py

@@ -7,14 +7,14 @@ from rich.console import Console
 
 from atomicshop.wrappers import githubw
 
-from ..infra import system
+from ..infra import permissions, msis, system
 
 
 console = Console()
 
 
-VERSION: str = "1.0.1"
-"""Fixed Ubuntu installation"""
+VERSION: str = "1.0.0"
+"""Initial"""
 
 
 # === WINDOWS FUNCTIONS ================================================================================================
@@ -171,9 +171,6 @@ def install_nodejs_win(
     :return: int, 0 if successful, 1 if failed.
     """
 
-    from ..infra import permissions, msis
-
-
     if not permissions.is_admin():
         console.print("This script requires administrative privileges to install Node.js.", style="red")
         return 1

dkinst/installers/helpers/modules/pycharm_installer.py

@@ -15,7 +15,8 @@ from ..infra import system, permissions
 console = Console()
 
 
-VERSION: str = "1.0.1"
+VERSION: str = "1.0.2"
+"""String cleaning"""
 
 
 # === WINDOWS FUNCTIONS ================================================================================================
@@ -104,7 +105,7 @@ def _make_parser():
 
     :return: Parsed arguments.
     """
-    parser = argparse.ArgumentParser(description='Install PyCharm Community Edition.')
+    parser = argparse.ArgumentParser(description='Install PyCharm Unified Edition.')
     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.'
@@ -117,7 +118,7 @@ def main(
         enable_sudo_execution: bool = False
 ) -> int:
     """
-    The function will install Node.js on Ubuntu or Windows.
+    The function will install PyCharm on Ubuntu or Windows.
 
     :param enable_sudo_execution: bool: Enable sudo execution for snapd installed PyCharm.
 

dkinst/installers/pycharm.py

@@ -13,7 +13,7 @@ class PyCharm(_base.BaseInstaller):
         self.description: str = "PyCharm Installer"
         self.version: str = pycharm_installer.VERSION
         self.platforms: list = ["windows", "debian"]
-        self.helper: ModuleType | None = None
+        self.helper: ModuleType | None = pycharm_installer
 
     def install(
             self,

{dkinst-0.6.1.dist-info → dkinst-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkinst
-Version: 0.6.1
+Version: 0.6.3
 Summary: Den K Simple Installer
 Author: Denis Kras
 License-Expression: MIT

{dkinst-0.6.1.dist-info → dkinst-0.6.3.dist-info}/RECORD

@@ -1,26 +1,26 @@
-dkinst/__init__.py,sha256=4UW5adnZG_XFfZJlFqo30hAMKAvA5c73VlqXkLOUImI,78
-dkinst/cli.py,sha256=4jLmbW73FInE21i1FXhuhM6eymWhA4Pvicl34H62K_4,9278
+dkinst/__init__.py,sha256=fgBL4qiqw75SZS17bNt__iqEB5Pe9bkea31PkrqfcCg,78
+dkinst/cli.py,sha256=FUjPt8V4E7J10pZufU1pQ3akzHmFqcmVNVABX4WWDQ4,9004
 dkinst/config.toml,sha256=OaTuImf9xBIbTNCrC2MfAzpPLeuDdV2R5feIfT7xImA,48
 dkinst/installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dkinst/installers/_base.py,sha256=2Ke4pQevOq3SRpCI1YKB9JrIwKIacPvAAMfjKn7IG20,10280
+dkinst/installers/_base.py,sha256=LA2j4uO9rnbFPgtScC7mK1hLKi9yalCnAtWcKmoLbq0,9910
 dkinst/installers/fibratus.py,sha256=l95ijrd4xZRKnz-lX35pzkIpDvkOuQbzkjPrwISS-SQ,4137
 dkinst/installers/nodejs.py,sha256=34UObZLKjRIKcQt3Omslcqyuibm1m6u9nR6-W472gqY,1781
-dkinst/installers/pycharm.py,sha256=GvH8uVCItaIjPSGPg2pyYl-7-LOkvh7gtubWmD2qvTM,1196
+dkinst/installers/pycharm.py,sha256=TdXic99t1I7WR9J3eN25fKwfMCqfE_5pWfkSufXgg2g,1209
 dkinst/installers/pywintrace.py,sha256=UM4kAhU8lyfNPRYQrVDETa9kfEL_6Cyl1XcRNo_xebs,1384
 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/msis.py,sha256=Ek7Ps-JyET638B2BJzkoP2ujKnl2LChRxOZMsDM4PqA,6109
 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=bqOXgRe1-BHB-noJIkZmURl6xSK2scqcTPfpWV8Lsl8,15007
-dkinst/installers/helpers/modules/pycharm_installer.py,sha256=sRuRCvqFBoCxc9XDqb3E05x-M2LmFGV8c47FsXai8Xg,4914
+dkinst/installers/helpers/modules/nodejs_installer.py,sha256=iEWo-ftth6aVmEU9eclIv3swfNYqyd7OKGaW_ffOo6w,14961
+dkinst/installers/helpers/modules/pycharm_installer.py,sha256=VQWeHglRu5M63327lKOAF8NQIMESUxkuGM4_AxBcY2M,4935
 dkinst/installers/helpers/modules/tesseract_ocr_manager.py,sha256=lJYVJDp5OTto4GHY1xkvJUkXCR1sgcOwj3UEUvfbPps,17369
-dkinst-0.6.1.dist-info/licenses/LICENSE,sha256=ohlj1rmsTHdctr-wyqmP6kbFC6Sff8pJd29v3pruZ18,1088
-dkinst-0.6.1.dist-info/METADATA,sha256=e_vTLx3JRHOymorB2aVusxdOoQA8KonOaIjQonjIUFg,2227
-dkinst-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkinst-0.6.1.dist-info/entry_points.txt,sha256=YNgO3GufKMdA_oRqWEGAVh6k00oIuPItqqChoUtU278,43
-dkinst-0.6.1.dist-info/top_level.txt,sha256=_dGNrME6z6Ihv2sxGC4hfAlnVuhoDlKwx-97LZ2xtQ0,7
-dkinst-0.6.1.dist-info/RECORD,,
+dkinst-0.6.3.dist-info/licenses/LICENSE,sha256=ohlj1rmsTHdctr-wyqmP6kbFC6Sff8pJd29v3pruZ18,1088
+dkinst-0.6.3.dist-info/METADATA,sha256=V9mK1UMZxbbUUG2Afu9Fv78owz378AQo7vP6bXcKVUc,2227
+dkinst-0.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkinst-0.6.3.dist-info/entry_points.txt,sha256=YNgO3GufKMdA_oRqWEGAVh6k00oIuPItqqChoUtU278,43
+dkinst-0.6.3.dist-info/top_level.txt,sha256=_dGNrME6z6Ihv2sxGC4hfAlnVuhoDlKwx-97LZ2xtQ0,7
+dkinst-0.6.3.dist-info/RECORD,,