atomicshop 2.16.18__py3-none-any.whl → 2.16.20__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.16.18'
+__version__ = '2.16.20'

atomicshop/file_io/file_io.py

@@ -21,7 +21,8 @@ def write_file_decorator(function_name):
 
         print_api(message=f"Writing file: {kwargs['file_path']}", **kwargs)
 
-        if kwargs['enable_long_file_path']:
+        enable_long_file_path = kwargs.get('enable_long_file_path', False)
+        if enable_long_file_path:
             # A simpler string method would be to add '\\?\' to the beginning of the file path.
             # kwargs['file_path'] = rf"\\?\{kwargs['file_path']}"
 

atomicshop/filesystem.py

@@ -422,17 +422,33 @@ def temporary_change_working_directory(new_working_directory: str) -> None:
         os.chdir(original_working_directory)
 
 
-def move_file(source_file_path: str, target_file_path: str, overwrite: bool = True) -> None:
+def move_file(source_file_path: str, target_directory: str, overwrite: bool = True) -> None:
     """
     The function moves file from source to target.
 
     :param source_file_path: string, full path to source file.
-    :param target_file_path: string, full path to target file.
+    :param target_directory: string, full path to target directory.
     :param overwrite: boolean, if 'False', then the function will not overwrite the file if it exists.
 
+    Example:
+        Before move:
+        Source file = 'C:/Users/user1/Downloads/file-to-move.txt'
+        Move to directory = 'C:/Users/user1/Documents'
+
+        Move:
+        source_file_path = 'C:/Users/user1/Downloads/file-to-move.txt'
+        target_directory = 'C:/Users/user1/Documents'
+        move_file(source_file_path, target_file_path)
+
+        After move:
+        'C:/Users/user1/Downloads'
+        'C:/Users/user1/Documents/file-to-move.txt'
+
     :return: None
     """
 
+    target_file_path = target_directory + os.sep + Path(source_file_path).name
+
     # Check if 'no_overwrite' is set to 'True' and if the file exists.
     if not overwrite:
         if is_file_exists(target_file_path):
@@ -455,12 +471,17 @@ def move_folder(source_directory: str, target_directory: str, overwrite: bool =
     ------------------------------
 
     Example:
-    source_directory = 'C:/Users/user1/Downloads/folder-to-move'
-    target_directory = 'C:/Users/user1/Documents'
-    move_folder(source_directory, target_directory)
+        Before move:
+        Source folder = 'C:/Users/user1/Downloads/folder-to-move'
+        Move to directory = 'C:/Users/user1/Documents'
+
+        Move:
+        source_directory = 'C:/Users/user1/Downloads/folder-to-move'
+        target_directory = 'C:/Users/user1/Documents'
+        move_folder(source_directory, target_directory)
 
-    Result path of the 'folder-to-move' will be:
-    'C:/Users/user1/Documents/folder-to-move'
+        Result path of the 'folder-to-move' will be:
+        'C:/Users/user1/Documents/folder-to-move'
 
     """
 
@@ -473,14 +494,14 @@ def move_folder(source_directory: str, target_directory: str, overwrite: bool =
     shutil.move(source_directory, target_directory)
 
 
-def move_files_from_folder_to_folder(
+def move_top_level_files_from_folder_to_folder(
         source_directory: str,
         target_directory: str,
         overwrite: bool = True
 ):
     """
-    The function is currently non-recursive and not tested with directories inside the source directories.
-    The function will move all the files from source directory to target directory overwriting existing files.
+    The function is non-recursive to move only top level files from source directory to target directory
+    overwriting existing files.
 
     :param source_directory: string, full path to source directory.
     :param target_directory: string, full path to target directory.
@@ -488,26 +509,50 @@ def move_files_from_folder_to_folder(
     """
 
     # Iterate over each item in the source directory
-    for item in os.listdir(source_directory):
-        # Construct full file path
-        source_item = os.path.join(source_directory, item)
-        destination_item = os.path.join(target_directory, item)
+    top_level_files: list[str] = get_paths_from_directory(
+        directory_path=source_directory, get_file=True, recursive=False, simple_list=True)
 
+    for source_item in top_level_files:
         # Move each item to the destination directory
-        move_file(source_file_path=source_item, target_file_path=destination_item, overwrite=overwrite)
+        move_file(source_file_path=source_item, target_directory=target_directory, overwrite=overwrite)
 
-    # # Get all file names without full paths in source folder.
-    # file_list_in_source: list = get_paths_from_directory(source_directory, get_file=True)
-    #
-    # # Iterate through all the files.
-    # for file_path in file_list_in_source:
-    #     # Move the file from source to target.
-    #     if file_path.relative_dir:
-    #         create_directory(target_directory + os.sep + file_path.relative_dir)
-    #         relative_file_path: str = file_path.relative_dir + os.sep + Path(file_path.path).name
-    #     else:
-    #         relative_file_path: str = Path(file_path.path).name
-    #     move_file(file_path.path, target_directory + os.sep + relative_file_path)
+
+def move_folder_contents_to_folder(
+        source_directory: str,
+        target_directory: str,
+        overwrite: bool = True
+):
+    """
+    The function moves all the contents of the source directory to the target directory.
+    If target directory is inside the source directory, this folder will be skipped.
+
+    :param source_directory: string, full path to source directory.
+    :param target_directory: string, full path to target directory.
+    :param overwrite: boolean, if 'True', then the function will overwrite the files if they exist.
+    """
+
+    # Make sure the destination directory exists, if not create it
+    os.makedirs(target_directory, exist_ok=True)
+
+    # Move contents of the source directory to the destination directory
+    for item in os.listdir(source_directory):
+        s = os.path.join(source_directory, item)
+        d = os.path.join(target_directory, item)
+
+        # if the target directory is inside the source directory, skip it
+        if os.path.abspath(target_directory).startswith(os.path.abspath(s)):
+            continue
+
+        if os.path.isdir(s):
+            if os.path.exists(d) and not overwrite:
+                print(f"Directory {d} already exists. Skipping due to overwrite=False.")
+            else:
+                shutil.move(s, d)
+        else:
+            if os.path.exists(d) and not overwrite:
+                print(f"File {d} already exists. Skipping due to overwrite=False.")
+            else:
+                shutil.move(s, d)
 
 
 def copy_file(
@@ -681,7 +726,7 @@ def get_paths_from_directory(
         sort_by_last_modified_time: bool = False,
         add_file_binary: bool = False,
         add_file_hash: bool = False,
-) -> list[AtomicPath]:
+) -> Union[list[AtomicPath], list[str]]:
     """
     Recursive, by option.
     The function receives a filesystem directory as string, scans it recursively for files and returns list of
@@ -1524,7 +1569,7 @@ def backup_file(
         else:
             file_name: str = f"{file_name_no_extension}_{timestamp}{file_extension}"
         backup_file_path: str = str(Path(backup_directory) / file_name)
-        move_file(file_path, backup_file_path)
+        move_file(file_path, backup_directory)
 
         return backup_file_path
     else:

atomicshop/mitm/recs_files.py

@@ -51,7 +51,7 @@ def recs_archiver(recs_directory: str) -> list:
             target_directory_path: str = f"{directory_path.path}{os.sep}{recs_atomic_path.datetime_string}"
             filesystem.create_directory(target_directory_path)
             filesystem.move_file(
-                recs_atomic_path.path, f'{target_directory_path}{os.sep}{recs_atomic_path.name}')
+                recs_atomic_path.path, target_directory_path)
 
         # Archive directories.
         archive_directories: list = filesystem.get_paths_from_directory(

atomicshop/wrappers/loggingw/reading.py

@@ -207,8 +207,7 @@ def get_all_log_files_into_list(
         filesystem.create_directory(move_to_path_with_timestamp)
         # Move the statistics files.
         for single_file in logs_files:
-            move_to_path_with_file = f'{move_to_path_with_timestamp}{os.sep}{single_file.name}'
-            filesystem.move_file(single_file.path, move_to_path_with_file)
+            filesystem.move_file(single_file.path, move_to_path_with_timestamp)
 
     return logs_content
 

{atomicshop-2.16.18.dist-info → atomicshop-2.16.20.dist-info}/METADATA

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

{atomicshop-2.16.18.dist-info → atomicshop-2.16.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=oNmVsW_-ZdNWYFu1cVLreluzXWdxRiR3VEX5qDGDz5A,124
+atomicshop/__init__.py,sha256=glTwF3AaXumcMYRK9aEiKxF7orYtHdc0gWXmh8wXceg,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=J4yX6vCaRdL0McYWnlJ9arCDKW-yRui7Y5WyL5BoD6M,6391
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
 atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
-atomicshop/filesystem.py,sha256=5xkZFIKYoTTmRBkJo5p4R1G48Xbdjlyc7R514QqNXQs,58711
+atomicshop/filesystem.py,sha256=XPrOjqxQRP3fa01QztDvuDUpiFjCYtpPUC0KhaGHxqs,60222
 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
@@ -116,7 +116,7 @@ atomicshop/etws/traces/trace_sysmon_process_creation.py,sha256=OM-bkK38uYMwWLZKN
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/file_io/csvs.py,sha256=oZiaIEd1q50ypNdd9mlHWb-f7HAdGa_D6jLd3T_4sWU,8777
 atomicshop/file_io/docxs.py,sha256=ffJhnmM_WyD8mCoq2dGdpfahdIrGTPy96QVlH5EWjeI,5754
-atomicshop/file_io/file_io.py,sha256=fkOgoeS8Ow69rj6KfEDmnMeFT3FhJmOJ0X-C_7Udiik,7047
+atomicshop/file_io/file_io.py,sha256=IVqs0Kd7PV8O-NH9321hK_IvPqWx2z_45zdDtqgw4II,7113
 atomicshop/file_io/jsons.py,sha256=q9ZU8slBKnHLrtn3TnbK1qxrRpj5ZvCm6AlsFzoANjo,5303
 atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9768
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
@@ -129,7 +129,7 @@ atomicshop/mitm/import_config.py,sha256=_nu8mgA-M4s6dZ8_QWx3x0aVb75upvsCuX_PIUg4
 atomicshop/mitm/initialize_engines.py,sha256=kBG8TBnyFuwlJ1uKaWDzc5AiZNpwdvouq2pr-PYrdEA,8349
 atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,1814
 atomicshop/mitm/mitm_main.py,sha256=CdCv4nYt_jwd23AI14v6lC2H8SZeIZqsXjFhwq61UtM,21285
-atomicshop/mitm/recs_files.py,sha256=4k6vCemGRmZ605yZ0-yRpF1ny3eAns7f3j61UXTJ99M,2966
+atomicshop/mitm/recs_files.py,sha256=B8fSuvYXlh50LWfwLRw_bYswreTjmdZLuHJzbDC5Gss,2930
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
 atomicshop/mitm/statistic_analyzer.py,sha256=AzL9rQhg0tLJj33gZfxdwWghmbXGLh_HyMBDpzuBmsQ,24709
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -250,7 +250,7 @@ atomicshop/wrappers/loggingw/formatters.py,sha256=7XUJvlB0CK4DCkEp8NTL0S0dkyrZD0
 atomicshop/wrappers/loggingw/handlers.py,sha256=hAPFJQ-wFoNO8QzGrJRSvyuP09Q1F0Dl9_w7zzlgcW0,18155
 atomicshop/wrappers/loggingw/loggers.py,sha256=QH5QainlGLyrDpsDu4T1C8-WQQau3JW2OS5RgC-kXpM,2677
 atomicshop/wrappers/loggingw/loggingw.py,sha256=6HUn2z4ZW8PgakPscosKx23qYwHlBQcLiZGw-VZHi-k,12374
-atomicshop/wrappers/loggingw/reading.py,sha256=SZFE4d6IFoC1GveFf28oAuDQzHG8UnBHx3K3-dE5Mes,16528
+atomicshop/wrappers/loggingw/reading.py,sha256=ERBSiQbEksySKpXpu2E_6k9dZ6MPH95ZIsmdjWW9MUE,16436
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/install_mongodb.py,sha256=3ZPqrXxj3lC-PnAKGXclylLuOqsbyXYeUpb5iGjdeUU,6626
 atomicshop/wrappers/mongodbw/mongo_infra.py,sha256=IjEF0jPzQz866MpTm7rnksnyyWQeUT_B2h2DA9ryAio,2034
@@ -309,8 +309,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=V_m1D0KpizQox3IEWp2AUcncwWy5kG25hbFrc-mBSJE,3029
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.18.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.18.dist-info/METADATA,sha256=b68lhNlBqxZwdV4zttZaQcCUAF18IPOHwKq4PaFIAkA,10473
-atomicshop-2.16.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.18.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.18.dist-info/RECORD,,
+atomicshop-2.16.20.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.20.dist-info/METADATA,sha256=_6DtjLTOAPxjimk_EMT_AWrtPUCkdYItaZUWlrTRqDE,10473
+atomicshop-2.16.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.20.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.20.dist-info/RECORD,,