atomicshop 2.19.15__py3-none-any.whl → 2.19.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.19.15'
+__version__ = '2.19.17'

atomicshop/etws/trace.py

@@ -1,7 +1,7 @@
 import queue
 import sys
-import time
 import multiprocessing.managers
+from datetime import datetime
 
 # Import FireEye Event Tracing library.
 import etw
@@ -9,7 +9,6 @@ import etw
 from ..print_api import print_api
 from . import sessions
 from ..process_poller import simple_process_pool
-from ..wrappers.psutilw import psutilw
 
 
 class EventTrace(etw.ETW):
@@ -147,9 +146,13 @@ class EventTrace(etw.ETW):
 
         event: tuple = self.event_queue.get()
 
+        current_datetime = datetime.now()
+        readable_time = current_datetime.strftime('%Y-%m-%d %H:%M:%S.%f')
+
         event_dict: dict = {
             'EventId': event[0],
-            'EventHeader': event[1]
+            'EventHeader': event[1],
+            'timestamp': readable_time
         }
 
         if 'ProcessId' not in event[1]:

atomicshop/etws/traces/trace_dns.py

@@ -136,6 +136,7 @@ class DnsRequestResponseTrace:
             status = 'Error'
 
         event_dict: dict = {
+            'timestamp': event['timestamp'],
             'event_id': event['EventId'],
             'query': event['EventHeader']['QueryName'],
             'query_type_id': str(event['EventHeader']['QueryType']),

atomicshop/etws/traces/trace_tcp.py

@@ -112,6 +112,7 @@ class TcpIpNewConnectionsTrace:
         remote_address = remote_address.replace('[', '').replace(']', '')
 
         event_dict: dict = {
+            'timestamp': event['timestamp'],
             'event_id': event['EventId'],
             'local_ip': local_address,
             'local_port': local_port,

atomicshop/file_io/tomls.py

@@ -5,6 +5,7 @@ try:
     import tomllib
 except ModuleNotFoundError:
     # This is library from pypi.
+    # noinspection PyPackageRequirements
     import tomli as tomllib
 
 from . import file_io
@@ -14,6 +15,7 @@ class TomlValueNotImplementedError(Exception):
     pass
 
 
+# noinspection PyUnusedLocal
 @file_io.read_file_decorator
 def read_toml_file(file_path: str,
                    file_mode: str = 'rb',
@@ -35,6 +37,7 @@ def read_toml_file(file_path: str,
     return tomllib.load(file_object)
 
 
+# noinspection PyUnusedLocal
 @file_io.write_file_decorator
 def write_toml_file(
         toml_content: dict,
@@ -112,7 +115,11 @@ def update_toml_file_with_new_config(
         If not, the changes will be written to the 'main_config_file_path'.
     """
 
-    # Sync the config files.
+    if not changes_config_file_path and not changes_dict:
+        raise ValueError("You must provide either 'changes_config_file_path' or 'changes_dict'.")
+    if changes_config_file_path and changes_dict:
+        raise ValueError("You can't provide both 'changes_config_file_path' and 'changes_dict'.")
+
     with open(main_config_file_path, 'r') as file:
         main_config_file_text_lines: list = file.readlines()
 
@@ -121,30 +128,29 @@ def update_toml_file_with_new_config(
     # Read the new config file.
     main_config_file_dict: dict = read_toml_file(main_config_file_path)
 
-    if changes_dict:
-        changes_config_file_dict = changes_dict
-    else:
-        changes_config_file_dict: dict = read_toml_file(changes_config_file_path)
+    if not changes_dict:
+        changes_dict: dict = read_toml_file(changes_config_file_path)
 
     # Update the config text lines.
     for category, settings in main_config_file_dict.items():
-        if category not in changes_config_file_dict:
+        if category not in changes_dict:
             continue
 
         for key, value in settings.items():
             # If the key is in the old config file, use the old value.
-            if key not in changes_config_file_dict[category]:
+            if key not in changes_dict[category]:
                 continue
 
-            if main_config_file_dict[category][key] != changes_config_file_dict[category][key]:
+            if main_config_file_dict[category][key] != changes_dict[category][key]:
                 # Get the line of the current category line.
                 current_category_line_index_in_text = None
                 for current_category_line_index_in_text, line in enumerate(main_config_file_text_lines):
                     if f"[{category}]" in line:
                         break
 
-                # current_category_line_index_in_text = main_config_file_text_lines.index(f"[{category}]\n")
-                current_category_index_in_main_config_dict = list(main_config_file_dict.keys()).index(category)
+                # Get the index inside the main config file dictionary of the current category.
+                main_config_list_of_keys: list = list(main_config_file_dict.keys())
+                current_category_index_in_main_config_dict = main_config_list_of_keys.index(category)
 
                 try:
                     next_category_name = list(
@@ -191,20 +197,20 @@ def update_toml_file_with_new_config(
                     # noinspection PyUnboundLocalVariable
                     comment = main_config_file_text_lines[line_index].replace(string_to_check, '')
 
-                    object_type = type(changes_config_file_dict[category][key])
+                    object_type = type(changes_dict[category][key])
                     if object_type == bool:
-                        value_string_to_set = str(changes_config_file_dict[category][key]).lower()
+                        value_string_to_set = str(changes_dict[category][key]).lower()
                     elif object_type == str:
-                        value_string_to_set = f"'{changes_config_file_dict[category][key]}'"
+                        value_string_to_set = f"'{changes_dict[category][key]}'"
                     elif object_type == int:
-                        value_string_to_set = str(changes_config_file_dict[category][key])
+                        value_string_to_set = str(changes_dict[category][key])
 
                     # noinspection PyUnboundLocalVariable
                     line_to_set = f"{key} = {value_string_to_set}{comment}"
                     # Replace the line with the old value.
                     main_config_file_text_lines[line_index] = line_to_set
 
-                    main_config_file_dict[category][key] = changes_config_file_dict[category][key]
+                    main_config_file_dict[category][key] = changes_dict[category][key]
 
     if new_config_file_path:
         file_path_to_write = new_config_file_path

{atomicshop-2.19.15.dist-info → atomicshop-2.19.17.dist-info}/METADATA

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

{atomicshop-2.19.15.dist-info → atomicshop-2.19.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=WKaxSIjt5IaCfnoGVa6leC9_f4rctgz8oEdhJaSdjGs,124
+atomicshop/__init__.py,sha256=sirfPpzTYXnvvIq87Zu3Mv0_mmzJTsmrk6btWEBTaN4,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
@@ -119,17 +119,17 @@ atomicshop/etws/_pywintrace_fix.py,sha256=nHrtnAb796eOZ6FlCqcsuRh_TSqSPp6JXLN6TB
 atomicshop/etws/const.py,sha256=v3x_IdCYeSKbCGywiZFOZln80ldpwKW5nuMDuUe51Jg,1257
 atomicshop/etws/providers.py,sha256=CXNx8pYdjtpLIpA66IwrnE64XhY4U5ExnFBMLEb8Uzk,547
 atomicshop/etws/sessions.py,sha256=b_KeiOvgOBJezJokN81TRlrvJiQNJlIWN4Z6UVjuxP0,1335
-atomicshop/etws/trace.py,sha256=p-5wegZ-5SuJ3UsprCCnlor8g2LPkF9ZOynLCYaEvXQ,7647
+atomicshop/etws/trace.py,sha256=u38pgUa9_eG1WBSDUOJ2PmCRQWifZJCEmovCy8OFk18,7786
 atomicshop/etws/traces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/etws/traces/trace_dns.py,sha256=SWeex1mK7rrMzCmmL3qiGaD_jzbRiiwJ_mhMZz5TwJc,6879
+atomicshop/etws/traces/trace_dns.py,sha256=mCZgkSrfYrq9rBfqWGmY7rRSqFQeMoQWCOC8ggjKUak,6925
 atomicshop/etws/traces/trace_sysmon_process_creation.py,sha256=OM-bkK38uYMwWLZKNOTDa0Xdk3sO6sqsxoMUIiPvm5g,4656
-atomicshop/etws/traces/trace_tcp.py,sha256=pQF4A_qM-HjEhzMQUyTmUqOWdvSaqqAg5PwnkVn2fy4,5236
+atomicshop/etws/traces/trace_tcp.py,sha256=bHxngCxuKFOlSJw7z7fWAG613nzqLYZMktgxAlGC5rQ,5282
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/file_io/csvs.py,sha256=zv0kKjRT-ZWRi0WpMIUQ_FKyP9Dt0f5Bc98Qsj6ClPU,9495
 atomicshop/file_io/docxs.py,sha256=Nyt3hSpzwqUKZEP5p5efqNpjFs9XqkK40Kp7BbbPo7E,6245
 atomicshop/file_io/file_io.py,sha256=8pKH08ILN91gfeNC0hrtLCx7l9ZgmcPAYIcLydDtZ-k,7198
 atomicshop/file_io/jsons.py,sha256=GJyVlGTcdhjZ-andfz7_dYVk1O74f-23Mc9PDmdjtPI,7424
-atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9768
+atomicshop/file_io/tomls.py,sha256=vZ_Wng5alLf8z6HSEZj7PS0XKDA-Iies9ihVWOkTcKo,10048
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
 atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,2104
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -330,8 +330,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.19.15.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.19.15.dist-info/METADATA,sha256=rY7lZlB7UShEsmFFxnRswkAQm8YFkShGJURQks7NGiw,10631
-atomicshop-2.19.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.19.15.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.19.15.dist-info/RECORD,,
+atomicshop-2.19.17.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.19.17.dist-info/METADATA,sha256=Mh7XFo4nIxw7Rzs_QAjEABvfXj4gQvkAg6dlj0qxO8w,10631
+atomicshop-2.19.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.19.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.19.17.dist-info/RECORD,,