atomicshop 2.16.8__py3-none-any.whl → 2.16.10__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.8'
+__version__ = '2.16.10'

atomicshop/file_io/file_io.py

@@ -95,7 +95,11 @@ def write_file(
     """
 
     if isinstance(content, list):
-        file_object.writelines(content)
+        for line in content:
+            if not line.endswith("\n"):
+                file_object.write(line + "\n")
+            else:
+                file_object.write(line)
     elif isinstance(content, str):
         file_object.write(content)
     # THis will happen if the content is bytes and the file mode is 'wb'.

atomicshop/mitm/recs_files.py

@@ -21,32 +21,45 @@ def recs_archiver(recs_directory: str) -> list:
 
     today_date_string = datetime.datetime.now().strftime(REC_FILE_DATE_FORMAT)
 
-    all_recs_files = reading.get_logs_paths(
-        log_files_directory_path=recs_directory,
-        file_name_pattern='*.json',
-        date_format=REC_FILE_DATE_FORMAT
-    )
-
-    archive_directories: list = list()
-    for recs_file_dict in all_recs_files:
-        # We don't need to archive today's files.
-        if today_date_string == recs_file_dict['date_string']:
-            continue
-
-        target_directory_path: str = f"{recs_directory}{os.sep}{recs_file_dict['date_string']}"
-        if target_directory_path not in archive_directories:
-            archive_directories.append(target_directory_path)
-
-        filesystem.create_directory(target_directory_path)
-        filesystem.move_file(
-            recs_file_dict['file_path'], f'{target_directory_path}{os.sep}{recs_file_dict["file_name"]}')
-
-    # Archive directories.
+    # There should not be recording json files in recs root.
+    files_in_recs_root: list = filesystem.get_file_paths_from_directory(
+        recs_directory, file_name_check_pattern='*.json', recursive=False)
+    if files_in_recs_root:
+        raise NotImplementedError("The files in recs root directory are not implemented yet.")
+
+    # Each engine should have its own directory inside recordings. We will find all the directories inside recs folder.
+    directory_paths_in_recs: list = filesystem.get_directory_paths_from_directory(recs_directory, recursive=False)
+
+    file_list_per_directory: list = list()
+    for directory_path in directory_paths_in_recs:
+        all_recs_files = reading.get_logs_paths(
+            log_files_directory_path=directory_path,
+            file_name_pattern='*.json',
+            date_format=REC_FILE_DATE_FORMAT
+        )
+        file_list_per_directory.append((directory_path, all_recs_files))
+
     archived_files: list = list()
-    for archive_directory in archive_directories:
-        archived_file: str = zips.archive_directory(
-            archive_directory, remove_original=True, include_root_directory=True)
-        archived_files.append(archived_file)
+    for directory_path, all_recs_files in file_list_per_directory:
+        archive_directories: list = list()
+        for recs_file_dict in all_recs_files:
+            # We don't need to archive today's files.
+            if today_date_string == recs_file_dict['date_string']:
+                continue
+
+            target_directory_path: str = f"{directory_path}{os.sep}{recs_file_dict['date_string']}"
+            if target_directory_path not in archive_directories:
+                archive_directories.append(target_directory_path)
+
+            filesystem.create_directory(target_directory_path)
+            filesystem.move_file(
+                recs_file_dict['file_path'], f'{target_directory_path}{os.sep}{recs_file_dict["file_name"]}')
+
+        # Archive directories.
+        for archive_directory in archive_directories:
+            archived_file: str = zips.archive_directory(
+                archive_directory, remove_original=True, include_root_directory=True)
+            archived_files.append(archived_file)
 
     return archived_files
 

{atomicshop-2.16.8.dist-info → atomicshop-2.16.10.dist-info}/METADATA

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

{atomicshop-2.16.8.dist-info → atomicshop-2.16.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=CwKEkGifmzVjdQvwtmwaq54rVlYzkyLjH9YE3bBaYl0,123
+atomicshop/__init__.py,sha256=UgRp7GQHNpZPeGG_7JeMEqk614zuaQR7CEQKP3aHIpM,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
@@ -115,7 +115,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=rZnv2VMOvct6KBSQn-bHhwbKOi8886jB5u387flq-0E,5755
-atomicshop/file_io/file_io.py,sha256=q7t5zwxtWl9arbKxzKx0mWTG0OY3MOz9lTKEAHffvMk,6257
+atomicshop/file_io/file_io.py,sha256=A4_0xwruhQ8jSPpCCTlIBmuLLVB0GHQgiSVznVi4cV0,6395
 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
@@ -128,7 +128,7 @@ atomicshop/mitm/import_config.py,sha256=fvUESPMkpRvkL7HtMaUqQRPwPF0eHV5V6pwueg4D
 atomicshop/mitm/initialize_engines.py,sha256=YoSNksMdu4vHjr5xy77t9t5W74zyDZIdjIXrzd3eRXc,8204
 atomicshop/mitm/initialize_mitm_server.py,sha256=hwqVk6PMc2iDpl0bLwbUlPrxEmu7Ql75-WWCJxiKh1g,19320
 atomicshop/mitm/message.py,sha256=fHvYEyEx-FAXbIMrKMJ_ybBinezF6IFbPlwCqpRrF44,1768
-atomicshop/mitm/recs_files.py,sha256=O2nhK9awFAsglUjMlNfgHi-0PbJVGIKQxmEoUE00XUg,2030
+atomicshop/mitm/recs_files.py,sha256=Vu5Pve5-b4sONPTOtes-DkU-JeHG5Lxs2JdVZW-FYVM,2929
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
 atomicshop/mitm/statistic_analyzer.py,sha256=E0ba1PjsUEcmQUPPw2YH911lyWkbQb9OSAdgB3pihsY,24658
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -305,8 +305,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=SdchUf9qrPk1Rrat0RzvM
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=g7f_8RkW80EZeQWNTqGYnfrQkgAI56T3SwWybq7ZsXg,28521
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=Jc0D12crkKRaqoCRQ-2Mz1zm6n4UUx9dXakf-N2TYWA,3065
-atomicshop-2.16.8.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.8.dist-info/METADATA,sha256=TgVDOThqAGihHU2xuw_DAvH9CxmTybC2tzNZRv8NEt0,10502
-atomicshop-2.16.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.8.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.8.dist-info/RECORD,,
+atomicshop-2.16.10.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.10.dist-info/METADATA,sha256=9CV_gguQyOeLDaXaDj8mdHaQRQytxupfMD07fdyYi1o,10503
+atomicshop-2.16.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.10.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.10.dist-info/RECORD,,