atomicshop 2.12.15__py3-none-any.whl → 2.12.17__py3-none-any.whl

atomicshop/timer.py

@@ -7,7 +7,10 @@ class TimerError(Exception):
 
 class Timer:
     """ Custom timer class to measure elapsed time. Returns time in seconds (float) or nanoseconds with setting. """
-    def __init__(self, nanoseconds: bool = False):
+    def __init__(
+            self,
+            nanoseconds: bool = False
+    ):
         """
         Set up timer in seconds or nanoseconds
         Seconds are returned as float, nanoseconds as int.
@@ -17,6 +20,9 @@ class Timer:
         self._start_time = None
         self._nanoseconds: bool = nanoseconds
 
+        self.running: bool = False
+        self.last_measure = None
+
     def start(self):
         """Start a new timer"""
 
@@ -28,6 +34,8 @@ class Timer:
         else:
             self._start_time = time.perf_counter()
 
+        self.running = True
+
     def restart(self):
         """Reset the timer"""
 
@@ -37,20 +45,31 @@ class Timer:
     def measure(self):
         """Measure the elapsed time"""
 
-        if self._start_time is None:
-            raise TimerError(f"Timer is not running. Use .start() to start it")
+        # if self._start_time is None and self.last_measure is None:
+        #     raise TimerError(f"Timer is not running. Use .start() to start it")
 
-        if self._nanoseconds:
-            elapsed_time = time.perf_counter_ns() - self._start_time
-        else:
-            elapsed_time = time.perf_counter() - self._start_time
+        # If the timer is running, measure the elapsed time. If not, return the last measured time.
+        if self.running:
+            if self._nanoseconds:
+                self.last_measure = time.perf_counter_ns() - self._start_time
+            else:
+                self.last_measure = time.perf_counter() - self._start_time
 
-        return elapsed_time
+        return self.last_measure
+
+    def stop(self, measure: bool = True):
+        """
+        Stop the timer, and report the elapsed time
+
+        :param measure: True to measure the elapsed time, False to stop the timer without measuring.
+            Measuring, means that the timer will return the elapsed time and 'self.last_measure' will be updated.
+        """
 
-    def stop(self):
-        """Stop the timer, and report the elapsed time"""
+        elapsed_time = None
+        if measure:
+            elapsed_time = self.measure()
 
-        elapsed_time = self.measure()
         self._start_time = None
+        self.running = False
 
         return elapsed_time

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:
@@ -249,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.')
 
@@ -262,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.
@@ -279,33 +303,36 @@ def get_latest_lines(
     except KeyError:
         pass
 
-    current_lines, header = csvs.read_csv_to_list_of_dicts_by_header(
-        latest_statistics_file_path, header=header, 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):
+    # 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)
-        # Handle case where source CSV is empty (rotation period)
-        READING_EXISTING_LINES.clear()  # Clear existing lines to start fresh after rotation
 
         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, header
+    return new_lines, previous_file_lines, header

{atomicshop-2.12.15.dist-info → atomicshop-2.12.17.dist-info}/METADATA

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

{atomicshop-2.12.15.dist-info → atomicshop-2.12.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=irfB8lK9cOngD6YC1kQbNIWYjaADA5biLnI9LD1TntY,124
+atomicshop/__init__.py,sha256=Y0i9YbX4w6RHv1MhMq0Dp3xhWzkgeDIA2V8gJkAoNbw,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
@@ -9,7 +9,7 @@ atomicshop/config_init.py,sha256=z2RXD_mw9nQlAOpuGry1h9QT-2LhNscXgGAktN3dCVQ,249
 atomicshop/console_output.py,sha256=AOSJjrRryE97PAGtgDL03IBtWSi02aNol8noDnW3k6M,4667
 atomicshop/console_user_response.py,sha256=31HIy9QGXa7f-GVR8MzJauQ79E_ZqAeagF3Ks4GGdDU,3234
 atomicshop/datetimes.py,sha256=olsL01S5tkXk4WPzucxujqgLOh198BLgJntDnGYukRU,15533
-atomicshop/diff_check.py,sha256=nT67QKIz6Kjx4lUhER_3OAafasp_K8ZpT3tIKwcHr44,24298
+atomicshop/diff_check.py,sha256=BJIhnAgTyJ-nyw3UBKwobvF0lJuhXQ2rPu12NiYETkI,27088
 atomicshop/dns.py,sha256=bNZOo5jVPzq7OT2qCPukXoK3zb1oOsyaelUwQEyK1SA,2500
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
@@ -40,7 +40,7 @@ atomicshop/sys_functions.py,sha256=MTBxRve5bh58SPvhX3gMiGqHlSBuI_rdNN1NnnBBWqI,9
 atomicshop/system_resource_monitor.py,sha256=ilA3wEUJfBjQhRsHDXGH7Q05mYr5KarPjRWP8S6pCTw,13681
 atomicshop/system_resources.py,sha256=0mhDZBEcMzToCOw5ArJhtqYjktOW6iJGdyRkJ01Cpwk,9272
 atomicshop/tempfiles.py,sha256=uq1ve2WlWehZ3NOTXJnpBBMt6HyCdBufqedF0HyzA6k,2517
-atomicshop/timer.py,sha256=KxBBgVM8po6pUJDW8TgY1UXj0iiDmRmL5XDCq0VHAfU,1670
+atomicshop/timer.py,sha256=7Zw1KRV0acHCRATMnanyX2MLBb63Hc-6us3rCZ9dNlY,2345
 atomicshop/urls.py,sha256=CQl1j1kjEVDlAuYJqYD9XxPF1SUSgrmG8PjlcXNEKsQ,597
 atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
@@ -132,15 +132,15 @@ 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=FUAolHTWVFfC14K2cTMK1NE6ORp37A0fCrfwNbxmbIs,12221
+atomicshop/monitor/change_monitor.py,sha256=ySfFCtsCFG3irV6gKr43DbbyQgmTwzG5m3FkCWDa8UI,9246
 atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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
+atomicshop/monitor/checks/dns.py,sha256=XOMVhf2A2A8zEvQxBszL5z_DItJC0pomg_mkiMKMrug,5741
+atomicshop/monitor/checks/hash.py,sha256=f719jU1A_rJi1ixGEHzWIZEoqpHJq4znabZnq4in9IM,2202
+atomicshop/monitor/checks/network.py,sha256=i2jc5LRKeQJRNtOrSbkZQQCMy33No_X-SjMcXDmIh1E,3753
+atomicshop/monitor/checks/process_running.py,sha256=pvSTa3nHDy1YH-35QkFxBUsqnCnfU5PBA_NNjp9iUNg,1889
 atomicshop/monitor/checks/hash_checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/monitor/checks/hash_checks/file.py,sha256=UDHrUphYSKeH4KJR5pC3ilPAGxX0oXTu3UD8ndnR5WU,2733
-atomicshop/monitor/checks/hash_checks/url.py,sha256=aNAL1bIeks6xsRDk-5arGy4rhzrJkJ4ZRCqCQTi4n3U,3237
+atomicshop/monitor/checks/hash_checks/file.py,sha256=o80UpjPNx9-AF5fYkZaP-ASHcBCE2zwGKUVRtDYKQyI,2402
+atomicshop/monitor/checks/hash_checks/url.py,sha256=XxBNjhQZO_JlicgadqBblvt6sIRizerwM-LVCOgMCQU,3020
 atomicshop/ssh_scripts/process_from_ipv4.py,sha256=uDBKZ2Ds20614JW1xMLr4IPB-z1LzIwy6QH5-SJ4j0s,1681
 atomicshop/ssh_scripts/process_from_port.py,sha256=uDTkVh4zc3HOTTGv1Et3IxM3PonDJCPuFRL6rnZDQZ4,1389
 atomicshop/wrappers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=k5XAnklLs97HQYkmF72-RzfNgBGsIx6mgogLugBpd7c,13992
+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.15.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.12.15.dist-info/METADATA,sha256=LvzJt1ZpIyBFDgSjWVcopOaMbDsSgRJTYMKuohIXP0o,10479
-atomicshop-2.12.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.12.15.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.12.15.dist-info/RECORD,,
+atomicshop-2.12.17.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.12.17.dist-info/METADATA,sha256=eRzyeiQbRlaJQ62ckcewFJ7JdMmcSNBZKaVuhM4-GS8,10479
+atomicshop-2.12.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.12.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.12.17.dist-info/RECORD,,