atomicshop 2.12.14__py3-none-any.whl → 2.12.16__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.12.14'
+__version__ = '2.12.16'

atomicshop/file_io/csvs.py

@@ -30,8 +30,10 @@ def read_csv_to_list_of_dicts_by_header(
     :param file_mode: string, file reading mode. Examples: 'r', 'rb'. Default is 'r'.
     :param encoding: string, encoding of the file. Default is 'None'.
     :param header: list, list of strings that will be the header of the CSV file. Default is 'None'.
-        If you want to use the header from the CSV file, use 'None'. In this case, the first row of the CSV file will
-        be the header.
+        None: the header from the CSV file will be used. The first row of the CSV file will be the header.
+            Meaning, that the first line will be skipped and the second line will be the first row of the content.
+        List: the list will be used as header.
+            All the lines of the CSV file will be considered as content.
     :param file_object: file object of the 'open()' function in the decorator. Decorator executes the 'with open()'
         statement and passes to this function. That's why the default is 'None', since we get it from the decorator.
     :return: list.

atomicshop/monitor/change_monitor.py

@@ -1,4 +1,5 @@
 from typing import Literal, Union
+import queue
 
 from .checks import dns, network, hash, process_running
 from .. import filesystem, scheduling
@@ -177,8 +178,6 @@ class ChangeMonitor:
         self.fetch_engine = None
         self.thread_looper = scheduling.ThreadLooper()
 
-        self.statistics_queue = None
-
     def _set_input_file_path(self, check_object_index: int = 0):
         if self.first_cycle:
             # If 'input_file_directory' and 'input_file_name' are specified, we'll use a filename to store.

atomicshop/monitor/checks/dns.py

@@ -32,8 +32,8 @@ def _execute_cycle(change_monitor_instance, print_kwargs: dict = None):
 
         # Since the 'operation_type' is 'hit_statistics', we'll set the 'statistics_queue' to the 'statistics_queue' of
         # the 'diff_check_list[0]'.
-        if change_monitor_instance.diff_check_list[0].operation_type == 'hit_statistics':
-            change_monitor_instance.statistics_queue = change_monitor_instance.diff_check_list[0].statistics_queue
+        # if change_monitor_instance.diff_check_list[0].operation_type == 'hit_statistics':
+        #     change_monitor_instance.statistics_queue = change_monitor_instance.diff_check_list[0].statistics_queue
 
         if change_monitor_instance.generate_input_file_name:
             original_name = 'known_domains'

atomicshop/wrappers/loggingw/reading.py

@@ -7,6 +7,7 @@ from ...file_io import csvs
 
 
 READING_EXISTING_LINES: list = []
+EXISTING_LOGS_FILE_COUNT: int = 0
 
 
 def get_logs_paths(
@@ -80,7 +81,8 @@ def get_logs_paths(
                 current_file_name: str = Path(single_file['file_path']).name
                 # Get the datetime object from the file name by the date pattern.
                 try:
-                    datetime_object = datetimes.get_datetime_from_complex_string_by_pattern(current_file_name, date_pattern)
+                    datetime_object = datetimes.get_datetime_from_complex_string_by_pattern(
+                        current_file_name, date_pattern)
                     timestamp_float = datetime_object.timestamp()
                 # ValueError will be raised if the date pattern does not match the file name.
                 except ValueError:
@@ -210,7 +212,8 @@ def get_latest_lines(
         log_file_path: str,
         date_pattern: str = None,
         log_type: Literal['csv'] = 'csv',
-        get_previous_file: bool = False
+        get_previous_file: bool = False,
+        header: list = None
 ) -> tuple:
     """
     This function gets the latest lines from the log file.
@@ -225,6 +228,11 @@ def get_latest_lines(
         Meaning, once the day will change, the function will get the log file from the previous day in the third entry
         of the return tuple. This happens only once each 24 hours. Not from the time the function was called, but from
         the time the day changed.
+    :param header: List of strings that will be the header of the CSV file. Default is 'None'.
+        None: the header from the CSV file will be used. The first row of the CSV file will be the header.
+            Meaning, that the first line will be skipped and the second line will be the first row of the content.
+        List: the list will be used as header.
+            All the lines of the CSV file will be considered as content.
     return: List of new lines.
 
     Usage:
@@ -243,6 +251,31 @@ def get_latest_lines(
             time.sleep(1)
     """
 
+    def extract_new_lines_only(content_lines: list):
+        new_lines: list = []
+        for row in content_lines:
+            # If the row is not in the existing lines, then add it to the new lines.
+            if row not in READING_EXISTING_LINES:
+                new_lines.append(row)
+
+        if new_lines:
+            READING_EXISTING_LINES.extend(new_lines)
+
+        return new_lines
+
+    global EXISTING_LOGS_FILE_COUNT
+
+    # If the existing logs file count is 0, it means that this is the first check. We need to get the current count.
+    if EXISTING_LOGS_FILE_COUNT == 0:
+        EXISTING_LOGS_FILE_COUNT = len(get_logs_paths(
+            log_file_path=log_file_path,
+            log_type='csv'
+        ))
+
+        # If the count is still 0, then there are no logs to read.
+        if EXISTING_LOGS_FILE_COUNT == 0:
+            return [], [], header
+
     if log_type != 'csv':
         raise ValueError('Only "csv" log type is supported.')
 
@@ -256,9 +289,6 @@ def get_latest_lines(
         latest_only=True
     )
 
-    if not latest_statistics_file_path_object:
-        return [], [], [], []
-
     latest_statistics_file_path: str = latest_statistics_file_path_object[0]['file_path']
 
     # Get the previous day statistics file path.
@@ -273,32 +303,36 @@ def get_latest_lines(
     except KeyError:
         pass
 
-    current_lines, _ = csvs.read_csv_to_list_of_dicts_by_header(latest_statistics_file_path, stdout=False)
-    if len(current_lines) > len(READING_EXISTING_LINES):
-        # return current_lines
-        pass
-    elif len(current_lines) == len(READING_EXISTING_LINES):
-        # return None
-        pass
-    elif len(current_lines) < len(READING_EXISTING_LINES):
-        current_lines, _ = csvs.read_csv_to_list_of_dicts_by_header(
-            previous_day_statistics_file_path, stdout=False)
-        # Handle case where source CSV is empty (rotation period)
-        READING_EXISTING_LINES.clear()  # Clear existing lines to start fresh after rotation
+    # Count all the rotated files.
+    current_log_files_count: int = len(get_logs_paths(
+        log_file_path=log_file_path,
+        log_type='csv'
+    ))
+
+    # If the count of the log files is greater than the existing logs file count, it means that the rotation happened.
+    # We will read the previous day statistics file.
+    new_lines_from_previous_file: list = []
+    if current_log_files_count > EXISTING_LOGS_FILE_COUNT:
+        current_lines, header = csvs.read_csv_to_list_of_dicts_by_header(
+            previous_day_statistics_file_path, header=header, stdout=False)
 
         if get_previous_file:
             previous_file_lines = current_lines
 
-        # return current_lines
+        EXISTING_LOGS_FILE_COUNT = current_log_files_count
 
-    new_lines: list = []
-    if current_lines:
-        for row in current_lines:
-            # If the row is not in the existing lines, then add it to the new lines.
-            if row not in READING_EXISTING_LINES:
-                new_lines.append(row)
+        new_lines_from_previous_file = extract_new_lines_only(current_lines)
 
-        if new_lines:
-            READING_EXISTING_LINES.extend(new_lines)
+        # empty the previous file lines, since the file is rotated.
+        READING_EXISTING_LINES.clear()
+
+    current_lines, header = csvs.read_csv_to_list_of_dicts_by_header(
+        latest_statistics_file_path, header=header, stdout=False)
+
+    new_lines = extract_new_lines_only(current_lines)
+
+    # If we have new lines from the previous file, we will add the new lines from the latest file.
+    if new_lines_from_previous_file:
+        new_lines = new_lines_from_previous_file + new_lines
 
-    return new_lines, current_lines, READING_EXISTING_LINES, previous_file_lines
+    return new_lines, previous_file_lines, header

{atomicshop-2.12.14.dist-info → atomicshop-2.12.16.dist-info}/METADATA

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

{atomicshop-2.12.14.dist-info → atomicshop-2.12.16.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=tw0lYy9Sp2JgTrAihCaPpbykgJv4vMC4CT3cyGXNrfY,124
+atomicshop/__init__.py,sha256=Z-gJW-h7oTdZn_6KXbNYPQPfdC6kDWJvf5xxT1uoArA,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
@@ -104,7 +104,7 @@ atomicshop/etw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/etw/dns_trace.py,sha256=I4OZsiZUDyj7B4fKTOqsB1tcX1DUMw9uh4CwXlcmHfY,5571
 atomicshop/etw/etw.py,sha256=xVJNbfCq4KgRfsDnul6CrIdAMl9xRBixZ-hUyqiB2g4,2403
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/file_io/csvs.py,sha256=oc4ijOHYzayx89DfW2_cktrf81kcGVFKUvKQDAljVrA,5300
+atomicshop/file_io/csvs.py,sha256=WOtDyVFhhA1RD3yrU9P33kDY1EKFEz8UmVCUkqYKuog,5503
 atomicshop/file_io/docxs.py,sha256=6tcYFGp0vRsHR47VwcRqwhdt2DQOwrAUYhrwN996n9U,5117
 atomicshop/file_io/file_io.py,sha256=FR84ihjGlr7Eqejo-_js4nBICVst31axD0bwX19S2eM,6385
 atomicshop/file_io/jsons.py,sha256=q9ZU8slBKnHLrtn3TnbK1qxrRpj5ZvCm6AlsFzoANjo,5303
@@ -132,9 +132,9 @@ atomicshop/mitm/engines/__reference_general/parser___reference_general.py,sha256
 atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha256=KENDVf9OwXD9gwSh4B1XxACCe7iHYjrvnW1t6F64wdE,695
 atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=1AM49UaFTKA0AHw-k3SV3uH3QbG-o6ux0c-GoWkKNU0,6993
 atomicshop/monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/monitor/change_monitor.py,sha256=NgadgPynRohII4m5oawWfQXTTj5lUx8gj38Tuk1sWOg,12247
+atomicshop/monitor/change_monitor.py,sha256=FUAolHTWVFfC14K2cTMK1NE6ORp37A0fCrfwNbxmbIs,12221
 atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/monitor/checks/dns.py,sha256=QOjvIQZndETomgTuY1PcEbUJkZkRtr6GcRV3Tfbu89c,4866
+atomicshop/monitor/checks/dns.py,sha256=wX53eGX2F5_lBDLL5D6dFb3XThdt3iwoYKnP05WZKfc,4870
 atomicshop/monitor/checks/hash.py,sha256=A6bJ7F5Qv_brdEh3sGhOyfviab2dsnvbXUufyBk5C1U,1951
 atomicshop/monitor/checks/network.py,sha256=I9f3KyNnlx97E8igGZXpVJl4MlUp9iU6aSbILCKqbA0,3820
 atomicshop/monitor/checks/process_running.py,sha256=948Sify4P2KFTE1ZrLHKLwd1B1HOgWmC11x3b6MCvz0,1892
@@ -216,7 +216,7 @@ atomicshop/wrappers/loggingw/formatters.py,sha256=mUtcJJfmhLNrwUVYShXTmdu40dBaJu
 atomicshop/wrappers/loggingw/handlers.py,sha256=qm5Fbu8eDmlstMduUe5nKUlJU5IazFkSnQizz8Qt2os,5479
 atomicshop/wrappers/loggingw/loggers.py,sha256=DHOOTAtqkwn1xgvLHSkOiBm6yFGNuQy1kvbhG-TDog8,2374
 atomicshop/wrappers/loggingw/loggingw.py,sha256=v9WAseZXB50LluT9rIUcRvvevg2nLVKPgz3dbGejfV0,12151
-atomicshop/wrappers/loggingw/reading.py,sha256=iw7tIN8rBFIJ7zKKPHhAGWRK4I_OE79qMg9EYsN2HkE,13462
+atomicshop/wrappers/loggingw/reading.py,sha256=CtYOwOLFHj_hqYyZx-dKUo5ZDrn3cO-f7vU4EX515xI,14980
 atomicshop/wrappers/nodejsw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/nodejsw/install_nodejs.py,sha256=QZg-R2iTQt7kFb8wNtnTmwraSGwvUs34JIasdbNa7ZU,5154
 atomicshop/wrappers/playwrightw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -251,8 +251,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.12.14.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.12.14.dist-info/METADATA,sha256=xYvYxNyhyTZ2kOm4aS6UZGYdPWIZy3TAX1lKCXp39us,10479
-atomicshop-2.12.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.12.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.12.14.dist-info/RECORD,,
+atomicshop-2.12.16.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.12.16.dist-info/METADATA,sha256=Sxe0EOSeHGX8jfjldfji7N3m_tORqIzRpxLiy7npPCY,10479
+atomicshop-2.12.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.12.16.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.12.16.dist-info/RECORD,,