atomicshop 2.6.2__py3-none-any.whl → 2.6.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__ = '2.6.2'
+__version__ = '2.6.4'

atomicshop/filesystem.py

@@ -59,6 +59,28 @@ FILE_NAME_REPLACEMENT_DICT: dict = {
 }
 
 
+def get_linux_home() -> str:
+    """
+    The function will return the home directory of the user on Linux.
+
+    :return: string, home directory of the user on Linux.
+    """
+
+    return os.path.expanduser('~')
+
+
+def create_empty_file(file_path: str) -> None:
+    """
+    The function creates an empty file.
+
+    :param file_path: string, full path to file.
+    :return: None.
+    """
+
+    # Create empty file.
+    Path(file_path).touch()
+
+
 def get_working_directory() -> str:
     """
     The function returns working directory of called script file.

atomicshop/process.py

@@ -36,8 +36,8 @@ def process_execution_decorator(function_name):
 @process_execution_decorator
 def execute_with_live_output(
         cmd: Union[list, str],
-        print_empty_lines: bool = False,
-        verbose: bool = False,
+        print_empty_lines: bool = True,
+        verbose: bool = True,
         output_strings: list = None,
         wsl: bool = False,
         **kwargs
@@ -54,7 +54,7 @@ def execute_with_live_output(
     :param verbose: boolean.
         'True': Print all output lines of the process.
         'False': Don't print any lines of output.
-    :param output_strings: list, of strings. If output line contains any of the strings it will be outputted to console.
+    :param output_strings: list, of strings. Only lines that contain any of the strings in this list will be printed.
     :param wsl: boolean, that sets if the command is executed with WSL.
     :return: Boolean, If execution was successful, return True, if not - False.
     """

atomicshop/python_file_patcher.py

@@ -35,7 +35,7 @@ def find_and_replace_in_file(
 
     if file_sha256 is not None:
         file_hash: str = hashing.hash_file(file_path)
-        if file_hash != file_sha256:
+        if file_hash.lower() != file_sha256.lower():
             raise ResourceWarning(
                 f"File's SHA256 hash is not the same as specified. Nothing was changed.\n"
                 f"File path: {file_path}\n"

atomicshop/wrappers/factw/install/install_after_restart.py

@@ -1,8 +1,7 @@
 from typing import Union, Literal
 from pathlib import Path
-import subprocess
 
-from .... import permissions
+from .... import permissions, process, filesystem
 from .. import config_install
 
 
@@ -23,16 +22,14 @@ def install_after_restart(
         --db: Distributed setup, Install the FACT_core database.
     :return:
     """
-    if not permissions.is_admin():
-        print("This script requires root privileges. Please enter your password for sudo access.")
-        permissions.run_as_root(['-v'])
 
-    install_command: str = 'python3 ' + str(Path(installation_directory, config_install.INSTALL_FILE_PATH))
+    install_command: str = 'python3 "' + str(Path(installation_directory, config_install.INSTALL_FILE_PATH)) + '"'
 
     if install_type:
         install_command = install_command + ' --' + install_type
 
     # Install the FACT_core repo.
-    subprocess.run(install_command)
+    process.execute_with_live_output(cmd=install_command, verbose=True)
     # Remove the FACT_core installation log.
-    # filesystem.remove_file(config_static_install.FACT_CORE_INSTALL_LOG_FILE_PATH)
+    working_directory_path: str = filesystem.get_working_directory()
+    filesystem.remove_file(str(Path(working_directory_path, config_install.INSTALL_LOG_FILE_NAME)))

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -1,11 +1,13 @@
 import subprocess
 from pathlib import Path
+import sys
 
-from .... import permissions, filesystem
+from .... import permissions, filesystem, process
 from ... import githubw
 from .. import config_install
 
 
+
 def install_before_restart(installation_directory: str):
     """
     This function will install the FACT_core before the restart of the computer.
@@ -14,14 +16,16 @@ def install_before_restart(installation_directory: str):
     """
 
     if not permissions.is_admin():
-        print("This script requires root privileges. Please enter your password for sudo access.")
-        permissions.run_as_root(['-v'])
+        print("This script requires root privileges...")
+        sys.exit(0)
 
     docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
+    nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
     fact_core_pre_install_file_path = str(Path(installation_directory, config_install.PRE_INSTALL_FILE_PATH))
 
-    # Remove the docker keyring, so we will not be asked to overwrite it if it exists.
+    # Remove the existing keyrings, so we will not be asked to overwrite it if it exists.
     filesystem.remove_file(docker_keyring_file_path)
+    filesystem.remove_file(nodesource_keyring_file_path)
 
     with permissions.temporary_regular_permissions():
         # Create the FACT_core directory.
@@ -40,4 +44,3 @@ def install_before_restart(installation_directory: str):
 
     # Run the shell script
     subprocess.run(['bash', fact_core_pre_install_file_path])
-

{atomicshop-2.6.2.dist-info → atomicshop-2.6.4.dist-info}/METADATA

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

{atomicshop-2.6.2.dist-info → atomicshop-2.6.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=daVa-vD7XmQMWZ84ohrQ5EVjNn0OcxdQ2BepW6dMlLo,122
+atomicshop/__init__.py,sha256=rgcFnkoZb5QOXNED5nID13Ev6vETh2KbA2y_y2S1gmM,122
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
 atomicshop/appointment_management.py,sha256=N3wVGJgrqJfsj_lqiRfaL3FxMEe57by5Stzanh189mk,7263
@@ -13,7 +13,7 @@ atomicshop/diff_check.py,sha256=RON9cSTgy3jAnwUmAUkOyfF6bgrBKOq9Sbgyl3RYodw,1235
 atomicshop/dns.py,sha256=bNZOo5jVPzq7OT2qCPukXoK3zb1oOsyaelUwQEyK1SA,2500
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
-atomicshop/filesystem.py,sha256=a1anVYpBoUPqucAjA3E7W0jTqSJWizhI_keJkIT4lYY,32162
+atomicshop/filesystem.py,sha256=ZIVmZ3Zfq4U3gJ7Bta6wPnHSNJMwpyC1CoJcgTDxKUg,32624
 atomicshop/functions.py,sha256=pK8hoCE9z61PtWCxQJsda7YAphrLH1wxU5x-1QJP-sY,499
 atomicshop/hashing.py,sha256=Le8qGFyt3_wX-zGTeQShz7L2HL_b6nVv9PnawjglyHo,3474
 atomicshop/http_parse.py,sha256=nrf2rZcprLqtW8HVrV7TCZ1iTBcWRRy-mXIlAOzcaJs,9703
@@ -23,10 +23,10 @@ atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/permissions.py,sha256=uuMLDWOKmpZIVE_SacwDg7Si4R0Bg8fgbXv_6vSvtPg,2124
 atomicshop/print_api.py,sha256=3n1CoiXvDcDGg00n5gEmQYInHryIhWbcpNjVobO1Gao,11468
-atomicshop/process.py,sha256=i_25PrSqSBbTcstCi_8rWVXAEYco81l6b9x1l_egTOY,14193
+atomicshop/process.py,sha256=5lqepm1psRbz66J4MB43ou6HHyac9F34QJedGukwAnk,14188
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
 atomicshop/process_poller.py,sha256=t79SwTX_4scH2WIH_ziw27aodG1ibhEFWbsVsmTyOVA,10846
-atomicshop/python_file_patcher.py,sha256=f7BJkTEbsKKv_Hx_Ni_mzbkF59OdJy3NRdp6a0PITpg,5061
+atomicshop/python_file_patcher.py,sha256=au12o_fkWS9j4Z0gI_Z2V1mfw2S2buj72F2Eh88d18Q,5077
 atomicshop/python_functions.py,sha256=zJg4ogUwECxrDD7xdDN5JikIUctITM5lsyabr_ZNsRw,4435
 atomicshop/question_answer_engine.py,sha256=DuOn7QEgKKfqZu2cR8mVeFIfFgayfBHiW-jY2VPq_Fo,841
 atomicshop/queues.py,sha256=Al0fdC3ZJmdKfv-PyBeIck9lnfLr82BYchvzr189gsI,640
@@ -153,8 +153,8 @@ atomicshop/wrappers/factw/fact_extractor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=d2QLX0zTmJubzyvegf_SJK4yT7Ml2Aw_VlCSzZINFVs,2080
 atomicshop/wrappers/factw/fact_extractor/get_extractor.py,sha256=2mfOAftHIlCcGt1s7MWdq7DsDCuI6wX3MtvcEZ4SK-0,756
 atomicshop/wrappers/factw/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/factw/install/install_after_restart.py,sha256=Qf0_CUsoJ8oyirPfnGeN0uSfMVIo3rfKmEgFW3rgewg,1617
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=ajEnHGRxor5uxAu5vVfsvC3zL0hzd_Kh5sMikJJg8ng,1746
+atomicshop/wrappers/factw/install/install_after_restart.py,sha256=Wixuc-foMA0qGjzypbbQ5sdE-F72yIKmrI9c6xwLY-g,1571
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=GrwbK1aYXFvET3ePS3dV9audb4ksMGeOqz-l64a7QHQ,1842
 atomicshop/wrappers/factw/postgresql/__init__.py,sha256=xMBn2d3Exo23IPP2F_9-SXmOlhFbwWDgS9KwozSTjA0,162
 atomicshop/wrappers/factw/postgresql/analysis.py,sha256=2Rxzy2jyq3zEKIo53z8VkjuslKE_i5mq2ZpmJAvyd6U,716
 atomicshop/wrappers/factw/postgresql/file_object.py,sha256=VRiCXnsd6yDbnsE-TEKYPC-gkAgFVkE6rygRrJLQShI,713
@@ -203,8 +203,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.6.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.6.2.dist-info/METADATA,sha256=nFxAG_5gm2nDLon7cTxF_7oQfSi5thaLTTAJH1699LQ,10267
-atomicshop-2.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-atomicshop-2.6.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.6.2.dist-info/RECORD,,
+atomicshop-2.6.4.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.6.4.dist-info/METADATA,sha256=smQDv30aFWsIuv-IZWv8EPcTwtVDwT9zXf2Xl4chI0U,10267
+atomicshop-2.6.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+atomicshop-2.6.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.6.4.dist-info/RECORD,,