atomicshop 2.18.15__py3-none-any.whl → 2.18.17__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.18.15'
+__version__ = '2.18.17'

atomicshop/filesystem.py

@@ -383,22 +383,35 @@ def rename_file(file_path: str, new_file_name: str) -> None:
     os.rename(file_path, renamed_file_path)
 
 
-def rename_file_with_special_characters(file_path: str) -> str:
+def rename_file_with_special_characters(
+        file_path: str,
+        rename_dictionary: dict = None,
+) -> str:
     """
     The function will rename the file to replace special characters from the file name with '_'.
     If the file already exists, then the function will add a number to the end of the file name.
 
     :param file_path: string, full path to file.
+    :param rename_dictionary: dictionary, with special characters to replace.
+        If not specified, the default dictionary will be used: FILE_NAME_REPLACEMENT_DICT.
+        Example:
+            rename_dictionary = {
+                '$': '_',
+                ' ': '_'
+            }
     :return: string, full path to file with special characters renamed.
     """
 
+    if rename_dictionary is None:
+        rename_dictionary = FILE_NAME_REPLACEMENT_DICT
+
     # Get the file name without extension
     file_stem: str = str(Path(file_path).stem)
     file_extension: str = str(Path(file_path).suffix)
 
     # Remove special characters from the file name
     new_file_stem = strings.replace_strings_with_values_from_dict(
-        string_to_replace=file_stem, dictionary=FILE_NAME_REPLACEMENT_DICT)
+        string_to_replace=file_stem, dictionary=rename_dictionary)
 
     # Rename the file
     renamed_file_path = str(Path(file_path).parent) + os.sep + new_file_stem + file_extension
@@ -417,21 +430,35 @@ def rename_file_with_special_characters(file_path: str) -> str:
     return renamed_file_path
 
 
-def rename_files_and_directories_with_special_characters(base_path: str) -> None:
+def rename_files_and_directories_with_special_characters(
+        base_path: str,
+        rename_dictionary: dict = None
+) -> None:
     """
     Recursively renames all files and directories in the given directory to rename special characters.
 
     :param base_path: str, the base directory to start processing.
+    :param rename_dictionary: dictionary, with special characters to replace.
+        If not specified, the default dictionary will be used: FILE_NAME_REPLACEMENT_DICT.
+        Example:
+            rename_dictionary = {
+                '$': '_',
+                ' ': '_'
+            }
     """
 
     def sanitize_name(name: str) -> str:
+        nonlocal rename_dictionary
         """
         Helper function to replace special characters in a string using a dictionary.
         """
-        for key, value in FILE_NAME_REPLACEMENT_DICT.items():
+        for key, value in rename_dictionary.items():
             name = name.replace(key, value)
         return name
 
+    if rename_dictionary is None:
+        rename_dictionary = FILE_NAME_REPLACEMENT_DICT
+
     # Walk through the directory tree in reverse to ensure we rename files before directories
     for root, dirs, files in os.walk(base_path, topdown=False):
         # Rename files in the current directory

atomicshop/wrappers/socketw/receiver.py

@@ -1,6 +1,8 @@
 import logging
 import socket
 import ssl
+import time
+
 import select
 from pathlib import Path
 
@@ -120,9 +122,19 @@ class Receiver:
         # We'll skip the 'is_socket_ready_for_read' check on the first run, since we want to read the data anyway,
         # to leave the socket in the blocking mode.
         first_run: bool = True
+        no_data_first_cycle: bool = True
         while True:
             # Check if there is data to be read from the socket.
             is_there_data: bool = is_socket_ready_for_read(self.ssl_socket, timeout=0)
+
+            # If there is no data to be read from the socket, and it is the first cycle, wait for a bit and try again.
+            if no_data_first_cycle and not is_there_data:
+                no_data_first_cycle = False
+                sleep_time: float = 0.5
+                self.logger.info(f"First time socket not ready. Waiting {str(sleep_time)} seconds before trying last time.")
+                time.sleep(sleep_time)
+                continue
+
             # noinspection PyTypeChecker
             if is_there_data or first_run:
                 first_run = False

atomicshop/wrappers/winregw/winreg_installed_software.py

@@ -31,12 +31,24 @@ def get_installed_software() -> list[dict]:
                     except FileNotFoundError:
                         install_date = "N/A"
 
+                    try:
+                        install_location, _ = winreg.QueryValueEx(subkey, "InstallLocation")
+                    except FileNotFoundError:
+                        install_location = "N/A"
+
+                    try:
+                        install_source, _ = winreg.QueryValueEx(subkey, "InstallSource")
+                    except FileNotFoundError:
+                        install_source = "N/A"
+
                     if display_name != "N/A":
                         data.append({
                             "DisplayName": display_name,
                             "DisplayVersion": display_version,
                             "InstallDate": install_date,
-                            "SubkeyName": subkey_name
+                            "SubkeyName": subkey_name,
+                            "InstallLocation": install_location,
+                            "InstallSource": install_source
                         })
             except OSError:
                 break  # No more subkeys

{atomicshop-2.18.15.dist-info → atomicshop-2.18.17.dist-info}/METADATA

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

{atomicshop-2.18.15.dist-info → atomicshop-2.18.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=vstlzMgTlldbG9H3C83VSdSji8vg9G7YehtjazP1weg,124
+atomicshop/__init__.py,sha256=ivNsScemzv9LXI2vGUWebHrEcNi81OytLwrD-3BCUm4,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
@@ -14,7 +14,7 @@ atomicshop/dns.py,sha256=5Gimq_WY2arqg7BeGmR7P--fGfnH0Dsh8lrOt_H0jRY,6817
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
 atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
-atomicshop/filesystem.py,sha256=1m-_cDiio6f4KnyHNdn2NhS60RneB-jcmc4Tdc5RlU8,62368
+atomicshop/filesystem.py,sha256=StVeiGCjlpvMOmB-4SW-s7eR_qxYofW9jsfh1ewpaG4,63263
 atomicshop/functions.py,sha256=pK8hoCE9z61PtWCxQJsda7YAphrLH1wxU5x-1QJP-sY,499
 atomicshop/get_process_list.py,sha256=8cxb7gKe9sl4R6H2yMi8J6oe-RkonTvCdKjRFqi-Fs4,6075
 atomicshop/get_process_name_cmd_dll.py,sha256=CtaSp3mgxxJKCCVW8BLx6BJNx4giCklU_T7USiCEwfc,5162
@@ -309,7 +309,7 @@ atomicshop/wrappers/socketw/creator.py,sha256=aSwfN_IwXXf4Hob35vHXUxD_OPeshZcRDZ
 atomicshop/wrappers/socketw/dns_server.py,sha256=RklzINNuoMQn4PGGQEI5hiAldprbVwwvikY6u9X-jTY,49067
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
-atomicshop/wrappers/socketw/receiver.py,sha256=LRQO-RIY0ZRjSMGVHLVJAXFTVO1zvjgIKSefEngPFfc,8186
+atomicshop/wrappers/socketw/receiver.py,sha256=Fj5bP_A7frvXrRMNw4k-ArGenzxfWVysBJSEOZ8ohdY,8704
 atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6DnPqK_XDUE,4754
 atomicshop/wrappers/socketw/sni.py,sha256=T9PXROiTYYxrd_7X4Hoj9hoNPXXTQpa2HdvmBJJIoeA,17607
 atomicshop/wrappers/socketw/socket_client.py,sha256=oa3GwS4OPgokrJE5_Oc4-5_wlXHxSH9J5f2DKebms8k,22035
@@ -318,10 +318,10 @@ atomicshop/wrappers/socketw/socket_wrapper.py,sha256=WtylpezgIIBuz-A6PfM0hO1sm9E
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh30KAV-jOpoFKT-m8,3395
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=on99OTT1_0g4KITAW5mSugUYgCAdVikhWjJ78a7JVIQ,1785
+atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.18.15.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.18.15.dist-info/METADATA,sha256=4YuwMJ1ZIag4xchzKo-YpwzPYsL1TrrNrWD2SnBENG0,10577
-atomicshop-2.18.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.18.15.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.18.15.dist-info/RECORD,,
+atomicshop-2.18.17.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.18.17.dist-info/METADATA,sha256=7FKQflXFEbWNBjy0Z9OwLWbgKASXvOKsPWf5a5o8L-Q,10577
+atomicshop-2.18.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.18.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.18.17.dist-info/RECORD,,