atomicshop 2.11.41__py3-none-any.whl → 2.11.42__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.11.41'
+__version__ = '2.11.42'

atomicshop/archiver/search_in_archive.py

@@ -118,6 +118,7 @@ def _search_in_archive(
         if item.filename.endswith('/'):  # Skip directories
             continue
 
+        # At this stage we will get the bytes of the archived file, which is an 'item' in the archive.
         archived_file_bytes = None
         # If the main archive is zip we will use the 'open' method, if it's 7z we will use the 'read' method.
         if archive_type == 'zip':

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -1,3 +1,4 @@
+import sys
 import subprocess
 from pathlib import Path
 
@@ -82,6 +83,12 @@ def install_before_restart(
     if use_built_in_fact_installer:
         # Run the shell script
         subprocess.run(['bash', fact_core_pre_install_file_path])
+
+        # Install docker. FACT installs the docker, but there can be a problem with permissions, so we need to add
+        # the user permissions to the docker group before restart.
+        if not install_docker.add_current_user_to_docker_group():
+            print_api("Docker is installed, but the current user was not added to the docker group.", color='red')
+            sys.exit(1)
     else:
         message = ("You will need to install DOCKER and NODEJS separately.\n"
                    "This was done to enable Rootless docker install and install other version of NodeJS.")
@@ -95,14 +102,13 @@ def install_before_restart(
             prefer_binary=True,
             requirements_file_path=prerequisites_file_path)
 
-        install_docker.install_docker_ubuntu(
-            use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
+        # Install docker in rootless mode.
+        # install_docker.install_docker_ubuntu(
+        #     use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
 
-    # Install docker. FACT installs the docker, but there can be a problem with permissions, so we need to add
-    # the user permissions to the docker group before restart.
-    # if not install_docker.add_current_user_to_docker_group():
-    #     print_api("Docker is installed, but the current user was not added to the docker group.", color='red')
-    #     sys.exit(1)
+        # Install docker in regular mode.
+        install_docker.install_docker_ubuntu(
+            use_docker_installer=True, rootless=False, add_current_user_to_docker_group_bool=True)
 
     print_api("FACT_core installation before restart is finished.", color='green')
     print_api("Please restart the computer to continue the installation.", color='red')

{atomicshop-2.11.41.dist-info → atomicshop-2.11.42.dist-info}/METADATA

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

{atomicshop-2.11.41.dist-info → atomicshop-2.11.42.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=tUAnOkjuAjgtX6xm_4V4xBzywgnEL6Zmf8Af-HngudY,124
+atomicshop/__init__.py,sha256=3_p4GhjKEgjjAeWU6I7lQ0b_qrl0Ipdn_7Dx5QQL14Y,124
 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
@@ -70,7 +70,7 @@ atomicshop/addons/process_list/compiled/Win10x64/process_list.lib,sha256=n9c2MVP
 atomicshop/archiver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/archiver/_search_in_zip.py,sha256=dd8qFSvIhcKmtnPj_uYNJFPmMwZp4tZys0kKgTw_ACw,8385
 atomicshop/archiver/archiver.py,sha256=BomnK7zT-nQXA1z0i2R2aTv8eu88wPx7tf2HtOdbmEc,1280
-atomicshop/archiver/search_in_archive.py,sha256=lPQlBw6WXrV6Y57c6Pn6gaqVnXmY7mESdDCqFRv4BcU,10729
+atomicshop/archiver/search_in_archive.py,sha256=XAxa0QukkXZvPmKna8cpwBHLDEskRUtbgaW1eHvpn6w,10833
 atomicshop/archiver/sevenz_app_w.py,sha256=TEOhlZPzKqQPStmyIq5E_yP98brj1t_GuoBgeLXA4dA,3019
 atomicshop/archiver/sevenzs.py,sha256=5i_C50-deC1Cz_GQdMGofV2jeMPbbGWAvih-QnA72cg,1370
 atomicshop/archiver/zips.py,sha256=k742K1bEDtc_4N44j_Waebi-uOkxxavqltvV6q-BLW4,14402
@@ -189,7 +189,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=2FyYjnw8gxFNwISQ
 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=-VXC3KDX2BzF0oi0ELCmfch55vLk-3t16KxlmYyUGD8,1560
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=vI0ZPSvGQOTKDBgxqbOfW9HGIDexnyAR0cUUCdFgmuQ,5624
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=GbLczU3M2U9hHp7sdLf6sKpwCuu-adQUOp_kabaE6BM,5890
 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
@@ -244,8 +244,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.11.41.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.41.dist-info/METADATA,sha256=i03LBYdEFEwR0yzXsJi3iLc_RXkjD_htdIE4M-gWOJg,10448
-atomicshop-2.11.41.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.41.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.41.dist-info/RECORD,,
+atomicshop-2.11.42.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.42.dist-info/METADATA,sha256=0sZfM32mQ33vO8W3z0lMAtPdO0huLyG5uPJNxOg0mkw,10448
+atomicshop-2.11.42.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.42.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.42.dist-info/RECORD,,