atomicshop 2.12.24__py3-none-any.whl → 2.12.26__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.24'
+__version__ = '2.12.26'

atomicshop/etw/providers.py

@@ -0,0 +1,5 @@
+from ..wrappers.ctyping.etw_winapi import etw_functions
+
+
+def get_providers():
+    return etw_functions.get_all_providers()

atomicshop/etw/sessions.py

@@ -12,3 +12,32 @@ def stop_and_delete(session_name) -> tuple[bool, int]:
     """
 
     return etw_functions.stop_and_delete_etw_session(session_name)
+
+
+def get_running_list() -> list[dict]:
+    """
+    List all running ETW sessions.
+
+    :return: A list of strings containing the names of all running ETW sessions.
+    """
+
+    return etw_functions.list_etw_sessions()
+
+
+def is_session_running(session_name: str) -> bool:
+    """
+    Check if an ETW session is running.
+
+    :param session_name: The name of the session to check.
+    :return: A boolean indicating if the session is running.
+    """
+
+    # Get all running sessions.
+    running_sessions = get_running_list()
+
+    # Check if the session is in the list of running sessions.
+    for session in running_sessions:
+        if session['session_name'] == session_name:
+            return True
+
+    return False

atomicshop/etw/trace.py

@@ -5,6 +5,7 @@ import sys
 import etw
 
 from ..print_api import print_api
+from . import sessions
 
 
 class EventTrace(etw.ETW):
@@ -13,7 +14,8 @@ class EventTrace(etw.ETW):
             providers: list,
             event_callback=None,
             event_id_filters: list = None,
-            session_name: str = None
+            session_name: str = None,
+            close_existing_session_name: bool = True
     ):
         """
         :param providers: List of tuples with provider name and provider GUID.
@@ -23,6 +25,7 @@ class EventTrace(etw.ETW):
         :param event_id_filters: List of event IDs that we want to filter. If not provided, all events will be returned.
             The default in the 'etw.ETW' method is 'None'.
         :param session_name: The name of the session to create. If not provided, a UUID will be generated.
+        :param close_existing_session_name: Boolean to close existing session names.
         ------------------------------------------
         You should stop the ETW tracing when you are done with it.
             'pywintrace' module starts a new session for ETW tracing, and it will not stop the session when the script
@@ -42,6 +45,7 @@ class EventTrace(etw.ETW):
             atexits.run_callable_on_exit_and_signals(EventTrace.stop)
         """
         self.event_queue = queue.Queue()
+        self.close_existing_session_name: bool = close_existing_session_name
 
         # If no callback function is provided, we will use the default one, which will put the event in the queue.
         if not event_callback:
@@ -61,6 +65,17 @@ class EventTrace(etw.ETW):
         )
 
     def start(self):
+        # Check if the session name already exists.
+        if sessions.is_session_running(self.session_name):
+            print_api(f'ETW Session already running: {self.session_name}', color='yellow')
+
+            # Close the existing session name.
+            if self.close_existing_session_name:
+                print_api(f'Closing existing session: {self.session_name}', color='blue')
+                sessions.stop_and_delete(self.session_name)
+            else:
+                print_api(f'Using existing session: {self.session_name}', color='yellow')
+
         try:
             super().start()
         except OSError as e:

atomicshop/etw/trace_dns.py

@@ -7,7 +7,13 @@ from ..print_api import print_api
 
 
 class DnsTrace:
-    def __init__(self, enable_process_poller: bool = False, attrs: list = None, session_name: str = None):
+    def __init__(
+            self,
+            enable_process_poller: bool = False,
+            attrs: list = None,
+            session_name: str = None,
+            close_existing_session_name: bool = True
+    ):
         """
         DnsTrace class use to trace DNS events from Windows Event Tracing for EventId 3008.
 
@@ -16,6 +22,14 @@ class DnsTrace:
             Then DNS events will be enriched with the process name and command line from the process poller.
         :param attrs: List of attributes to return. If None, all attributes will be returned.
         :param session_name: The name of the session to create. If not provided, a UUID will be generated.
+        :param close_existing_session_name: Boolean to close existing session names.
+            True: if ETW session with 'session_name' exists, you will be notified and the session will be closed.
+                Then the new session with this name will be created.
+            False: if ETW session with 'session_name' exists, you will be notified and the new session will not be
+                created. Instead, the existing session will be used. If there is a buffer from the previous session,
+                you will get the events from the buffer.
+
+        -------------------------------------------------
 
         Usage Example:
             from atomicshop.etw import dns_trace
@@ -36,7 +50,8 @@ class DnsTrace:
             providers=[(dns.ETW_DNS_INFO['provider_name'], dns.ETW_DNS_INFO['provider_guid'])],
             # lambda x: self.event_queue.put(x),
             event_id_filters=[dns.ETW_DNS_INFO['event_id']],
-            session_name=session_name
+            session_name=session_name,
+            close_existing_session_name=close_existing_session_name
         )
 
         if self.enable_process_poller:

atomicshop/monitor/checks/dns.py

@@ -30,7 +30,7 @@ class DnsCheck:
         self.fetch_engine: DnsTrace = (
             DnsTrace(
                 enable_process_poller=True, attrs=['name', 'cmdline', 'domain', 'query_type'],
-                session_name=self.etw_session_name)
+                session_name=self.etw_session_name, close_existing_session_name=True)
         )
 
         if self.settings['alert_always'] and self.settings['alert_about_missing_entries_after_learning']:

atomicshop/wrappers/ctyping/etw_winapi/const.py

@@ -1,14 +1,24 @@
 import ctypes
 from ctypes import wintypes
+from ctypes.wintypes import ULONG
 
 
-# Load the necessary library
-advapi32 = ctypes.WinDLL('advapi32')
-
 # Constants
 EVENT_TRACE_CONTROL_STOP = 1
 WNODE_FLAG_TRACED_GUID = 0x00020000
 
+MAXIMUM_LOGGERS = 64
+
+
+"""
+wintypes.DWORD = wintypes.ULONG = ctypes.c_ulong: 32-bit unsigned integer
+wintypes.WORD = wintypes.USHORT = ctypes.c_ushort: 16-bit unsigned integer
+wintypes.BYTE = ctypes.c_ubyte: 8-bit unsigned integer
+wintypes.LARGE_INTEGER is a structure (or union in C terms), can represent both signed and unsigned 
+    64-bit values depending on context.
+ctypes.c_ulonglong is a simple data type representing an unsigned 64-bit integer.
+"""
+
 
 # Define GUID structure
 class GUID(ctypes.Structure):
@@ -53,5 +63,113 @@ class EVENT_TRACE_PROPERTIES(ctypes.Structure):
         ("RealTimeBuffersLost", wintypes.ULONG),
         ("LoggerThreadId", wintypes.HANDLE),
         ("LogFileNameOffset", wintypes.ULONG),
-        ("LoggerNameOffset", wintypes.ULONG)
+        ("LoggerNameOffset", wintypes.ULONG),
+        # Allocate space for the names at the end of the structure
+        ("_LoggerName", wintypes.WCHAR * 1024),
+        ("_LogFileName", wintypes.WCHAR * 1024)
+    ]
+
+
+# Define the EVENT_TRACE_LOGFILE structure
+class EVENT_TRACE_LOGFILE(ctypes.Structure):
+    _fields_ = [
+        ("LogFileName", wintypes.LPWSTR),
+        ("LoggerName", wintypes.LPWSTR),
+        ("CurrentTime", wintypes.LARGE_INTEGER),
+        ("BuffersRead", wintypes.ULONG),
+        ("ProcessTraceMode", wintypes.ULONG),
+        ("EventRecordCallback", wintypes.LPVOID),
+        ("BufferSize", wintypes.ULONG),
+        ("Filled", wintypes.ULONG),
+        ("EventsLost", wintypes.ULONG),
+        ("BuffersLost", wintypes.ULONG),
+        ("RealTimeBuffersLost", wintypes.ULONG),
+        ("LogBuffersLost", wintypes.ULONG),
+        ("BuffersWritten", wintypes.ULONG),
+        ("LogFileMode", wintypes.ULONG),
+        ("IsKernelTrace", wintypes.ULONG),
+        ("Context", wintypes.ULONG)  # Placeholder for context pointer
     ]
+
+
+# Define the EVENT_TRACE_HEADER structure
+class EVENT_TRACE_HEADER(ctypes.Structure):
+    _fields_ = [
+        ("Size", wintypes.USHORT),
+        ("FieldTypeFlags", wintypes.USHORT),
+        ("Version", wintypes.USHORT),
+        ("Class", wintypes.USHORT),  # EVENT_TRACE_CLASS
+        ("Type", ctypes.c_ubyte),
+        ("Level", ctypes.c_ubyte),
+        ("Channel", ctypes.c_ubyte),
+        ("Flags", ctypes.c_ubyte),
+        ("InstanceId", wintypes.USHORT),
+        ("ParentInstanceId", wintypes.USHORT),
+        ("ParentGuid", GUID),
+        ("Timestamp", wintypes.LARGE_INTEGER),
+        ("Guid", GUID),
+        ("ProcessorTime", wintypes.ULONG),
+        ("ThreadId", wintypes.ULONG),
+        ("ProcessId", wintypes.ULONG),
+        ("KernelTime", wintypes.ULONG),
+        ("UserTime", wintypes.ULONG),
+    ]
+
+
+# Define the EVENT_RECORD structure
+class EVENT_RECORD(ctypes.Structure):
+    _fields_ = [
+        ("EventHeader", EVENT_TRACE_HEADER),
+        ("BufferContext", wintypes.ULONG),
+        ("ExtendedDataCount", wintypes.USHORT),
+        ("UserDataLength", wintypes.USHORT),
+        ("ExtendedData", wintypes.LPVOID),
+        ("UserData", wintypes.LPVOID),
+        ("UserContext", wintypes.LPVOID)
+    ]
+
+
+class PROVIDER_ENUMERATION_INFO(ctypes.Structure):
+    _fields_ = [
+        ("NumberOfProviders", ULONG),
+        ("Reserved", ULONG),
+    ]
+
+
+class PROVIDER_INFORMATION(ctypes.Structure):
+    _fields_ = [
+        ("ProviderId", ctypes.c_byte * 16),
+        ("SchemaSource", ULONG),
+        ("ProviderNameOffset", ULONG),
+    ]
+
+
+# Load the necessary library
+advapi32 = ctypes.WinDLL('advapi32')
+tdh = ctypes.windll.tdh
+
+# Define necessary TDH functions
+tdh.TdhEnumerateProviders.argtypes = [ctypes.POINTER(PROVIDER_ENUMERATION_INFO), ctypes.POINTER(ULONG)]
+tdh.TdhEnumerateProviders.restype = ULONG
+
+
+# Define the function prototype
+QueryAllTraces = advapi32.QueryAllTracesW
+QueryAllTraces.argtypes = [
+    ctypes.POINTER(ctypes.POINTER(EVENT_TRACE_PROPERTIES)),
+    wintypes.ULONG,
+    ctypes.POINTER(wintypes.ULONG)
+]
+QueryAllTraces.restype = wintypes.ULONG
+
+OpenTrace = advapi32.OpenTraceW
+OpenTrace.argtypes = [ctypes.POINTER(EVENT_TRACE_LOGFILE)]
+OpenTrace.restype = wintypes.ULONG
+
+ProcessTrace = advapi32.ProcessTrace
+ProcessTrace.argtypes = [ctypes.POINTER(wintypes.ULONG), wintypes.ULONG, wintypes.LARGE_INTEGER, wintypes.LARGE_INTEGER]
+ProcessTrace.restype = wintypes.ULONG
+
+CloseTrace = advapi32.CloseTrace
+CloseTrace.argtypes = [wintypes.ULONG]
+CloseTrace.restype = wintypes.ULONG

atomicshop/wrappers/ctyping/etw_winapi/etw_functions.py

@@ -1,4 +1,7 @@
 import ctypes
+from ctypes.wintypes import ULONG
+import uuid
+
 from . import const
 
 
@@ -35,3 +38,91 @@ def stop_and_delete_etw_session(session_name) -> tuple[bool, int]:
     else:
         # print("ETW session stopped and deleted successfully.")
         return True, status
+
+
+def get_all_providers() -> list[tuple[any, uuid.UUID]]:
+    """
+    Get all ETW providers available on the system.
+
+    :return: A list of tuples containing the provider name and GUID.
+    """
+
+    providers_info_size = ULONG(0)
+    status = const.tdh.TdhEnumerateProviders(None, ctypes.byref(providers_info_size))
+
+    # Initial allocation
+    buffer = (ctypes.c_byte * providers_info_size.value)()
+    providers_info = ctypes.cast(buffer, ctypes.POINTER(const.PROVIDER_ENUMERATION_INFO))
+
+    # Loop to handle resizing
+    while True:
+        status = const.tdh.TdhEnumerateProviders(providers_info, ctypes.byref(providers_info_size))
+
+        if status == 0:
+            break
+        elif status == 0x8007007A:  # ERROR_INSUFFICIENT_BUFFER
+            buffer = (ctypes.c_byte * providers_info_size.value)()
+            providers_info = ctypes.cast(buffer, ctypes.POINTER(const.PROVIDER_ENUMERATION_INFO))
+        else:
+            raise ctypes.WinError(status)
+
+    provider_count = providers_info.contents.NumberOfProviders
+    provider_array = ctypes.cast(
+        ctypes.addressof(providers_info.contents) + ctypes.sizeof(const.PROVIDER_ENUMERATION_INFO),
+        ctypes.POINTER(const.PROVIDER_INFORMATION * provider_count))
+
+    providers = []
+    for i in range(provider_count):
+        provider = provider_array.contents[i]
+        provider_name_offset = provider.ProviderNameOffset
+        provider_name_ptr = ctypes.cast(
+            ctypes.addressof(providers_info.contents) + provider_name_offset, ctypes.c_wchar_p)
+        provider_name = provider_name_ptr.value
+        provider_guid = uuid.UUID(bytes_le=bytes(provider.ProviderId))
+        providers.append((provider_name, provider_guid))
+
+    return providers
+
+
+def list_etw_sessions() -> list[dict]:
+    """
+    List all running ETW sessions.
+
+    :return: A list of dictionaries containing the names of all running ETW sessions and their log files.
+    """
+    # Create an array of EVENT_TRACE_PROPERTIES pointers
+    PropertiesArrayType = ctypes.POINTER(const.EVENT_TRACE_PROPERTIES) * const.MAXIMUM_LOGGERS
+    properties_array = PropertiesArrayType()
+    for i in range(const.MAXIMUM_LOGGERS):
+        properties = const.EVENT_TRACE_PROPERTIES()
+        properties.Wnode.BufferSize = ctypes.sizeof(const.EVENT_TRACE_PROPERTIES)
+        properties_array[i] = ctypes.pointer(properties)
+
+    # Define the number of loggers variable
+    logger_count = ULONG(const.MAXIMUM_LOGGERS)
+
+    # Call QueryAllTraces
+    status = const.QueryAllTraces(properties_array, const.MAXIMUM_LOGGERS, ctypes.byref(logger_count))
+    if status != 0:
+        raise Exception(f"QueryAllTraces failed, error code: {status}")
+
+    # Extract session names
+    session_list: list = []
+    for i in range(logger_count.value):
+        logger_name = None
+        logfile_path = None
+
+        properties = properties_array[i].contents
+        if properties.LoggerNameOffset != 0:
+            logger_name_address = ctypes.addressof(properties) + properties.LoggerNameOffset
+            logger_name = ctypes.wstring_at(logger_name_address)
+        if properties.LogFileNameOffset != 0:
+            logfile_name_address = ctypes.addressof(properties) + properties.LogFileNameOffset
+            logfile_path = ctypes.wstring_at(logfile_name_address)
+
+        session_list.append({
+            'session_name': logger_name,
+            'log_file': logfile_path
+        })
+
+    return session_list

atomicshop/wrappers/loggingw/reading.py

@@ -6,10 +6,6 @@ from ... import filesystem, datetimes
 from ...file_io import csvs
 
 
-READING_EXISTING_LINES: list = []
-EXISTING_LOGS_FILE_COUNT: int = 0
-
-
 def get_logs_paths(
         log_files_directory_path: str = None,
         log_file_path: str = None,
@@ -212,31 +208,10 @@ def get_logs(
     return logs_content
 
 
-def get_latest_lines(
-        log_file_path: str,
-        date_pattern: str = None,
-        log_type: Literal['csv'] = 'csv',
-        get_previous_file: bool = False,
-        header: list = None
-) -> tuple:
+class LogReader:
     """
-    This function gets the latest lines from the log file.
+    This class gets the latest lines from the log file.
 
-    :param log_file_path: Path to the log file.
-    :param date_pattern: Pattern to match the date in the log file name.
-        If specified, the function will get the log file by the date pattern.
-        If not specified, the function will get the file date by file last modified time.
-    :param log_type: Type of log to get.
-    :param get_previous_file: Boolean, if True, the function will get the previous log file.
-        For example, your log is set to rotate every Midnight.
-        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:
@@ -246,14 +221,15 @@ def get_latest_lines(
         # The header of the log file will be read from the first iteration of the log file.
         # When the file is rotated, this header will be used to not read the header again.
         header: Union[list, None] = None
+        log_reader = reading.LogReader(
+            log_file_path='/path/to/log.csv',
+            log_type='csv',
+            date_pattern='%Y_%m_%d',
+            get_previous_file=True,
+            header=header
+        )
         while True:
-            latest_lines, previous_day_24h_lines, header = reading.get_latest_lines(
-                log_file_path='/path/to/log.csv',
-                log_type='csv',
-                date_pattern='%Y_%m_%d',
-                get_previous_file=True,
-                header=header
-            )
+            latest_lines, previous_day_24h_lines, header = log_reader.get_latest_lines(header=header)
 
             if latest_lines:
                 # Do something with the new lines.
@@ -262,91 +238,132 @@ def get_latest_lines(
                 # Do something with the last 24 hours lines. Reminder, this will happen once a day on log rotation.
 
             time.sleep(1)
-    """
-
-    def extract_new_lines_only(content_lines: list):
+        """
+
+    def __init__(
+            self,
+            log_file_path: str,
+            date_pattern: str = None,
+            log_type: Literal['csv'] = 'csv',
+            get_previous_file: bool = False,
+            header: list = None
+    ):
+        """
+        :param log_file_path: Path to the log file.
+        :param date_pattern: Pattern to match the date in the log file name.
+            If specified, the function will get the log file by the date pattern.
+            If not specified, the function will get the file date by file last modified time.
+        :param log_type: Type of log to get.
+        :param get_previous_file: Boolean, if True, the function will get the previous log file.
+            For example, your log is set to rotate every Midnight.
+            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.
+        """
+
+        self.log_file_path: str = log_file_path
+        self.date_pattern: str = date_pattern
+        self.log_type: Literal['csv'] = log_type
+        self.get_previous_file: bool = get_previous_file
+        self.header: list = header
+
+        self._reading_existing_lines: list = []
+        self._existing_logs_file_count: int = 0
+
+    def _extract_new_lines_only(self, 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:
+            if row not in self._reading_existing_lines:
                 new_lines.append(row)
 
         if new_lines:
-            READING_EXISTING_LINES.extend(new_lines)
+            self._reading_existing_lines.extend(new_lines)
 
         return new_lines
 
-    global EXISTING_LOGS_FILE_COUNT
+    def get_latest_lines(self, header: list = None) -> tuple:
+        if header:
+            self.header = header
 
-    # 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 existing logs file count is 0, it means that this is the first check. We need to get the current count.
+        if self._existing_logs_file_count == 0:
+            self._existing_logs_file_count = len(get_logs_paths(
+                log_file_path=self.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 the count is still 0, then there are no logs to read.
+            if self._existing_logs_file_count == 0:
+                return [], [], self.header
 
-    if log_type != 'csv':
-        raise ValueError('Only "csv" log type is supported.')
+        if self.log_type != 'csv':
+            raise ValueError('Only "csv" log type is supported.')
 
-    previous_file_lines: list = []
+        previous_file_lines: list = []
 
-    # Get the latest statistics file path.
-    latest_statistics_file_path_object = get_logs_paths(
-        log_file_path=log_file_path,
-        date_pattern=date_pattern,
-        log_type='csv',
-        latest_only=True
-    )
-
-    latest_statistics_file_path: str = latest_statistics_file_path_object[0]['file_path']
-
-    # Get the previous day statistics file path.
-    previous_day_statistics_file_path: Union[str, None] = None
-    try:
-        previous_day_statistics_file_path = get_logs_paths(
-            log_file_path=log_file_path,
-            date_pattern=date_pattern,
+        # Get the latest statistics file path.
+        latest_statistics_file_path_object = get_logs_paths(
+            log_file_path=self.log_file_path,
+            date_pattern=self.date_pattern,
             log_type='csv',
-            previous_day_only=True
-        )[0]['file_path']
-    # If you get IndexError, it means that there are no previous day logs to read.
-    except IndexError:
-        pass
-
-    # Count all the rotated files.
-    current_log_files_count: int = len(get_logs_paths(
-        log_file_path=log_file_path,
-        log_type='csv'
-    ))
+            latest_only=True
+        )
+
+        # # If there are no logs to read, return empty lists.
+        # if not latest_statistics_file_path_object:
+        #     return [], [], self.header
+
+        latest_statistics_file_path: str = latest_statistics_file_path_object[0]['file_path']
+
+        # Get the previous day statistics file path.
+        previous_day_statistics_file_path: Union[str, None] = None
+        try:
+            previous_day_statistics_file_path = get_logs_paths(
+                log_file_path=self.log_file_path,
+                date_pattern=self.date_pattern,
+                log_type='csv',
+                previous_day_only=True
+            )[0]['file_path']
+        # If you get IndexError, it means that there are no previous day logs to read.
+        except IndexError:
+            pass
+
+        # Count all the rotated files.
+        current_log_files_count: int = len(get_logs_paths(
+            log_file_path=self.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 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 > self._existing_logs_file_count:
+            current_lines, self.header = csvs.read_csv_to_list_of_dicts_by_header(
+                previous_day_statistics_file_path, header=self.header, stdout=False)
 
-        if get_previous_file:
-            previous_file_lines = current_lines
+            if self.get_previous_file:
+                previous_file_lines = current_lines
 
-        EXISTING_LOGS_FILE_COUNT = current_log_files_count
+            self._existing_logs_file_count = current_log_files_count
 
-        new_lines_from_previous_file = extract_new_lines_only(current_lines)
+            new_lines_from_previous_file = self._extract_new_lines_only(current_lines)
 
-        # empty the previous file lines, since the file is rotated.
-        READING_EXISTING_LINES.clear()
+            # empty the previous file lines, since the file is rotated.
+            self._reading_existing_lines.clear()
 
-    current_lines, header = csvs.read_csv_to_list_of_dicts_by_header(
-        latest_statistics_file_path, header=header, stdout=False)
+        current_lines, self.header = csvs.read_csv_to_list_of_dicts_by_header(
+            latest_statistics_file_path, header=self.header, stdout=False)
 
-    new_lines = extract_new_lines_only(current_lines)
+        new_lines = self._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
+        # 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, previous_file_lines, header
+        return new_lines, previous_file_lines, self.header

{atomicshop-2.12.24.dist-info → atomicshop-2.12.26.dist-info}/METADATA

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

{atomicshop-2.12.24.dist-info → atomicshop-2.12.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=IWq2-3sezAvBANma6AYzXzywVzgI9rJOyd2ZKFBLQ1E,124
+atomicshop/__init__.py,sha256=Wq0bf4jFBHfU0lsKuJb7kZ5yruxZGg3_luyY2rWwPss,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
@@ -102,9 +102,10 @@ atomicshop/basics/threads.py,sha256=xvgdDJdmgN0wmmARoZ-H7Kvl1GOcEbvgaeGL4M3Hcx8,
 atomicshop/basics/timeit_template.py,sha256=fYLrk-X_dhdVtnPU22tarrhhvlggeW6FdKCXM8zkX68,405
 atomicshop/basics/tracebacks.py,sha256=cNfh_oAwF55kSIdqtv3boHZQIoQI8TajxkTnwJwpweI,535
 atomicshop/etw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/etw/sessions.py,sha256=7RzlqOEc2zlikKgaNayCnR0IB-51PUrdMyU7uyoBKn4,582
-atomicshop/etw/trace.py,sha256=7xZ-Kj4-hIdVsaqXhpVtP0i8F6dND9ZMe0ZJWq3qtMk,4529
-atomicshop/etw/trace_dns.py,sha256=08xiTGpAAJ3qxobx-9uG49z5pR7BBsys6a_vrMh6JgE,5920
+atomicshop/etw/providers.py,sha256=fVmWi-uGdtnsQTDpu_ty6dzx0GMhGokiST73LNBEJ38,129
+atomicshop/etw/sessions.py,sha256=k3miewU278xn829cqDbsuH_bmZHPQE9-Zn-hINbxUSE,1330
+atomicshop/etw/trace.py,sha256=tjBvV4RxCSn8Aoxj8NVxmqHekdECne_y4Zv2lbh11ak,5341
+atomicshop/etw/trace_dns.py,sha256=f4homrWp4qMrmjC9UrEWjr9p9MrUg7SwOVbE22_IYgw,6728
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/file_io/csvs.py,sha256=y8cJtnlN-NNxNupzJgSeGq9aQ4wNxYLFPX9vNNlUiIc,5830
 atomicshop/file_io/docxs.py,sha256=6tcYFGp0vRsHR47VwcRqwhdt2DQOwrAUYhrwN996n9U,5117
@@ -136,7 +137,7 @@ atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha
 atomicshop/monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/monitor/change_monitor.py,sha256=dGhk5bJPxLCHa2FOVkort99E7vjVojra9GlvhpcKSqE,7551
 atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/monitor/checks/dns.py,sha256=edO03gtGYb3tn8eV-wAKPELIkdCJvimjkO8PPF-ho-k,7150
+atomicshop/monitor/checks/dns.py,sha256=YLCFoolq35dnzdnBnfUA2ag-4HfvzcHfRdm3mzX8R8o,7184
 atomicshop/monitor/checks/file.py,sha256=2tIDSlX2KZNc_9i9ji1tcOqupbFTIOj7cKXLyBEDWMk,3263
 atomicshop/monitor/checks/network.py,sha256=CGZWl4WlQrxayZeVF9JspJXwYA-zWx8ECWTVGSlXc98,3825
 atomicshop/monitor/checks/process_running.py,sha256=x66wd6-l466r8sbRQaIli0yswyGt1dH2DVXkGDL6O0Q,1891
@@ -169,8 +170,8 @@ atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute
 atomicshop/wrappers/ctyping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/ctyping/process_winapi.py,sha256=QcXL-ETtlSSkoT8F7pYle97ubGWsjYp8cx8HxkVMgAc,2762
 atomicshop/wrappers/ctyping/etw_winapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/ctyping/etw_winapi/const.py,sha256=-wGLmM8FUPrVOGeyEWnizlumkdX60Ziv6v7ANQd9xgM,1712
-atomicshop/wrappers/ctyping/etw_winapi/etw_functions.py,sha256=T5gyTHk3BLTYKSnUKO4PS4h5xIVRrNrHKPL30r_N3HQ,1732
+atomicshop/wrappers/ctyping/etw_winapi/const.py,sha256=jq5nms2qu4FsuXuq3vaHjz9W4ILt9GY-C7CQ8VKcpyg,5764
+atomicshop/wrappers/ctyping/etw_winapi/etw_functions.py,sha256=3DLVXpTeOyTND35T_dKGzKnlLVQ0R3zt3AEcW2bNLNc,5304
 atomicshop/wrappers/ctyping/msi_windows_installer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/ctyping/msi_windows_installer/base.py,sha256=Uu9SlWLsQQ6mjE-ek-ptHcmgiI3Ruah9bdZus70EaVY,4884
 atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py,sha256=htzwb2ROYI8yyc82xApStckPS2yCcoyaw32yC15KROs,3285
@@ -222,7 +223,7 @@ atomicshop/wrappers/loggingw/formatters.py,sha256=mUtcJJfmhLNrwUVYShXTmdu40dBaJu
 atomicshop/wrappers/loggingw/handlers.py,sha256=2A_3Qy1B0RvVWZmQocAB6CmpqlXoKJ-yi6iBWG2jNLo,8274
 atomicshop/wrappers/loggingw/loggers.py,sha256=DHOOTAtqkwn1xgvLHSkOiBm6yFGNuQy1kvbhG-TDog8,2374
 atomicshop/wrappers/loggingw/loggingw.py,sha256=m6YySEedP3_4Ik1S_uGMxETSbmRkmMYmAZxhHBlXSlo,16616
-atomicshop/wrappers/loggingw/reading.py,sha256=iRXwPHhwkzuBFz4nlRdO9fpfxnNCYRE09r8JvtqTcao,15671
+atomicshop/wrappers/loggingw/reading.py,sha256=bsSUM9_epMO2L-lHBEULFxeqdxXOHfICt-1BtQZn7lA,16712
 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
@@ -259,8 +260,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.24.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.12.24.dist-info/METADATA,sha256=wjuGBnA-AbgpeRB_uDgPYzt5XbLF6mIT5yj721N4vi4,10479
-atomicshop-2.12.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.12.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.12.24.dist-info/RECORD,,
+atomicshop-2.12.26.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.12.26.dist-info/METADATA,sha256=HYm5lvYyf77XdD_MWANy8aWX2kpFD7kD-EmOZg19yOQ,10479
+atomicshop-2.12.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.12.26.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.12.26.dist-info/RECORD,,