atomicshop 2.2.7__py3-none-any.whl → 2.2.9__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.2.7'
+__version__ = '2.2.9'

atomicshop/appointment_management.py

@@ -38,7 +38,7 @@ class AppointmentManager:
     def read_latest_date_csv(self):
         try:
             # Read the csv to list of dicts.
-            csv_list = read_csv_to_list(file_path=self.latest_date_to_check_filepath, raise_exception=True)
+            csv_list, _ = read_csv_to_list(file_path=self.latest_date_to_check_filepath, raise_exception=True)
             # It has only 1 line, so get it to dict.
             latest_date_dict = csv_list[0]
 
@@ -100,7 +100,7 @@ class BlacklistEngine:
     def read_blacklist_csv(self) -> None:
         try:
             # Read the csv to list of dicts.
-            csv_list = read_csv_to_list(file_path=self.blacklist_dates_filepath, raise_exception=True)
+            csv_list, _ = read_csv_to_list(file_path=self.blacklist_dates_filepath, raise_exception=True)
 
             daterange = None
             # Iterate through all the rows.

atomicshop/datetimes.py

@@ -1,4 +1,3 @@
-# v1.0.2 - 21.03.2023 18:00
 import datetime
 from datetime import timedelta
 import time

atomicshop/file_io/csvs.py

@@ -1,20 +1,26 @@
 import csv
+from typing import Tuple, List
 
 from .file_io import read_file_decorator
+from . import file_io
 
 
 @read_file_decorator
 def read_csv_to_list(file_path: str,
                      file_mode: str = 'r',
                      encoding=None,
+                     header: list = None,
                      file_object=None,
-                     **kwargs) -> list:
+                     **kwargs) -> Tuple[List, List | None]:
     """
     Function to read csv file and output its contents as list of dictionaries for each row.
 
     :param file_path: String with full file path to json file.
     :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.
     :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.
@@ -22,13 +28,15 @@ def read_csv_to_list(file_path: str,
 
     # The header fields will be separated to list of "csv_reader.fieldnames".
 
-    # Create CSV reader from 'input_file'.
-    csv_reader = csv.DictReader(file_object)
+    # Create CSV reader from 'input_file'. By default, the first row will be the header if 'fieldnames' is None.
+    csv_reader = csv.DictReader(file_object, fieldnames=header)
 
     # Create list of dictionaries out of 'csv_reader'.
     csv_list: list = list(csv_reader)
 
-    return csv_list
+    header = csv_reader.fieldnames
+
+    return csv_list, header
 
 
 def write_list_to_csv(csv_list: list, csv_filepath: str) -> None:
@@ -50,3 +58,23 @@ def write_list_to_csv(csv_list: list, csv_filepath: str) -> None:
         writer.writeheader()
         # Write list of dits as rows.
         writer.writerows(csv_list)
+
+
+def get_header(file_path: str, print_kwargs: dict = None) -> list:
+    """
+    Function to get header from CSV file.
+
+    :param file_path: Full file path to CSV file.
+    :param print_kwargs: Keyword arguments dict for 'print_api' function.
+
+    :return: list of strings, each string is a header field.
+    """
+
+    if not print_kwargs:
+        print_kwargs = dict()
+
+    # Get the first line of the file as text, which is the header.
+    header = file_io.read_file(file_path, read_to_list=True, **print_kwargs)[0]
+    # Split the header to list of keys.
+    header = header.split(',')
+    return header

atomicshop/file_io/file_io.py

@@ -1,3 +1,4 @@
+from typing import Union
 import functools
 
 from ..print_api import print_api
@@ -96,8 +97,9 @@ def write_file(content: str,
 def read_file(file_path: str,
               file_mode: str = 'r',
               encoding=None,
+              read_to_list: bool = False,
               file_object=None,
-              **kwargs) -> str:
+              **kwargs) -> Union[str, list]:
     """
     Read file and return its content as string.
 
@@ -105,10 +107,18 @@ def read_file(file_path: str,
     :param file_mode: string, file reading mode. Examples: 'r', 'rb'. Default is 'r'.
     :param encoding: string, read the file with encoding. Example: 'utf-8'. 'None' is default, since it is default
         in 'open()' function.
+    :param read_to_list: Boolean, if True, the file will be read to list of strings, each string is a line.
     :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: string.
+    :return: string or list of strings.
     """
 
     # Read the file to variable.
-    return file_object.read()
+    if read_to_list:
+        # This method avoids creating an intermediary list by directly reading and processing the file within the list
+        # comprehension.
+        result = [line.rstrip() for line in file_object]
+    else:
+        result = file_object.read()
+
+    return result

atomicshop/filesystem.py

@@ -44,6 +44,16 @@ def add_object_to_path(path: str, object_string: str) -> str:
     return os.path.join(path, object_string)
 
 
+def get_file_name_with_extension(file_path: str) -> str:
+    """
+    The function will return file name with extension of the file.
+
+    :param file_path: string, full file path.
+    :return: string.
+    """
+    return str(Path(file_path).name)
+
+
 def get_list_of_directories_in_file_path(
         file_path: str, get_last_part: bool = True, convert_drive_to_string: bool = False) -> list:
     """

atomicshop/mitm/connection_thread_worker.py

@@ -79,7 +79,7 @@ def thread_worker_main(
                                # f"{statistics_dict['response_hex']},"
                                f"\"{statistics_dict['file_path']}\","
                                f"\"{statistics_dict['process_cmd']}\","
-                               f"{statistics_dict['error']},"
+                               f"{statistics_dict['error']}"
                                )
 
     try:

atomicshop/wrappers/loggingw/reading.py

@@ -1,6 +1,7 @@
+import os
 from typing import Literal
 
-from ... import filesystem
+from ... import filesystem, datetimes
 from ...file_io import csvs
 
 
@@ -8,7 +9,9 @@ def get_logs(
         path: str,
         pattern: str = '*.*',
         log_type: Literal['csv'] = 'csv',
+        header_type_of_files: Literal['first', 'all'] = 'first',
         remove_logs: bool = False,
+        move_to_path: str = None,
         print_kwargs: dict = None
 ):
     """
@@ -18,10 +21,20 @@ def get_logs(
     :param pattern: Pattern to match the log files names.
         Default pattern will match all the files.
     :param log_type: Type of log to get.
+    :param header_type_of_files: Type of header to get from the files.
+        'first' - Only the first file has a header for CSV. This header will be used for the rest of the files.
+        'all' - Each CSV file has a header. Get the header from each file.
     :param remove_logs: Boolean, if True, the logs will be removed after getting them.
+    :param move_to_path: Path to move the logs to.
     :param print_kwargs: Keyword arguments dict for 'print_api' function.
     """
 
+    if not print_kwargs:
+        print_kwargs = dict()
+
+    if remove_logs and move_to_path:
+        raise ValueError('Both "remove_logs" and "move_to_path" cannot be True/specified at the same time.')
+
     logs_files: list = filesystem.get_files_and_folders(
         path, string_contains=pattern)
 
@@ -32,13 +45,41 @@ def get_logs(
 
     # Read all the logs.
     logs_content: list = list()
+    header = None
     for single_file in logs_files:
         if log_type == 'csv':
-            logs_content.extend(csvs.read_csv_to_list(single_file, **print_kwargs))
+            if header_type_of_files == 'all':
+                csv_content, _ = csvs.read_csv_to_list(single_file, **print_kwargs)
+                logs_content.extend(csv_content)
+            elif header_type_of_files == 'first':
+                # The function gets empty header to read it from the CSV file, the returns the header that it read.
+                # Then each time the header is fed once again to the function.
+                csv_content, header = csvs.read_csv_to_list(single_file, header=header, **print_kwargs)
+                # Any way the first file will be read with header.
+                logs_content.extend(csv_content)
+
+                # if not header:
+                #     # Get the first line of the file as text, which is the header.
+                #     header = csvs.get_header(single_file, **print_kwargs)
 
     if remove_logs:
         # Remove the statistics files.
         for single_file in logs_files:
             filesystem.remove_file(single_file)
 
+    if move_to_path:
+        # Get formatted time stamp for file name.
+        time_stamp = datetimes.TimeFormats().get_current_formatted_time_filename_stamp()
+        # Remove last separator from path if it exists.
+        move_to_path_with_timestamp = filesystem.remove_last_separator(move_to_path)
+        # Add time stamp to path.
+        move_to_path_with_timestamp = f'{move_to_path_with_timestamp}{os.sep}{time_stamp}'
+        # Create the path.
+        filesystem.create_directory(move_to_path_with_timestamp)
+        # Move the statistics files.
+        for single_file in logs_files:
+            single_file_name = filesystem.get_file_name(single_file)
+            move_to_path_with_file = f'{move_to_path_with_timestamp}{os.sep}{single_file_name}'
+            filesystem.move_file(single_file, move_to_path_with_file)
+
     return logs_content

{atomicshop-2.2.7.dist-info → atomicshop-2.2.9.dist-info}/METADATA

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

{atomicshop-2.2.7.dist-info → atomicshop-2.2.9.dist-info}/RECORD

@@ -1,17 +1,17 @@
-atomicshop/__init__.py,sha256=HNBmCzxX86cIcPQfx_n4-J0nxm0w-fBMbXUvsSuXhFY,122
+atomicshop/__init__.py,sha256=7FCapWCMZHR5sCrftNZYkTxSJzc7M99vB1QB_20E0ws,122
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
-atomicshop/appointment_management.py,sha256=IsaO1O9Lgso_BPm79QNQkIyunYIr7KuAkTYlityM0nw,7257
+atomicshop/appointment_management.py,sha256=N3wVGJgrqJfsj_lqiRfaL3FxMEe57by5Stzanh189mk,7263
 atomicshop/archiver.py,sha256=KKdNI150yiMO_Y1TZdKjXtw4TP5LI5FJzI8VbvFKVwo,4763
 atomicshop/certificates.py,sha256=nxuq6HPBT7RfwRTSipOxoRHBS-nZLsaHR9m6UdHmDn4,297
 atomicshop/command_line_processing.py,sha256=u5yT9Ger_cu7ni5ID0VFlRbVD46ARHeNC9tRM-_YXrQ,1038
 atomicshop/console_output.py,sha256=G-6jxnWooT1nJSaPxcCqIuw8S22R_0lOJcfrdovRhwE,1372
 atomicshop/console_user_response.py,sha256=31HIy9QGXa7f-GVR8MzJauQ79E_ZqAeagF3Ks4GGdDU,3234
-atomicshop/datetimes.py,sha256=kyB8h5LtC6BDD-rJphps3rtJprsIHhQwaWXfW7WfIqU,13526
+atomicshop/datetimes.py,sha256=B_RYGyC9HxKwYdjxjdl0OrdtHQ-cDyoK1KM4-p9cLJ8,13497
 atomicshop/diff_check.py,sha256=RON9cSTgy3jAnwUmAUkOyfF6bgrBKOq9Sbgyl3RYodw,12350
 atomicshop/dns.py,sha256=bNZOo5jVPzq7OT2qCPukXoK3zb1oOsyaelUwQEyK1SA,2500
 atomicshop/domains.py,sha256=i4PioZSumzaIYfutwph0MQ-iO9--MJYv3-JreTkn86Q,2831
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
-atomicshop/filesystem.py,sha256=qirtkFf9ivY0zvcdTatYAZRKEBF6QVq-IAnEvDV2C3g,17401
+atomicshop/filesystem.py,sha256=4JOlQVDavx2W7Xx6TzsQuAjVsGB2SUF01xQCWLz4eNM,17658
 atomicshop/functions.py,sha256=VqLjxAxhaxUr-Ad8P1cw9bZGdZpbtqfCaXQyHf3CM9g,509
 atomicshop/github_wrapper.py,sha256=7pZkhliP4vdcdeVtbgTDEzBS3lUw3-mp5PMWUDA19V0,4347
 atomicshop/hashing.py,sha256=6523xFxuW0Cm1pcJCE63NWeiwt3al3t-FXLv0f0Kzpg,2989
@@ -75,11 +75,11 @@ atomicshop/etw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/etw/dns_trace.py,sha256=ZbEf1gptnUnJwaRURUW9ENDwC9Q41Zl6NtxgMNELJcg,5198
 atomicshop/etw/etw.py,sha256=xVJNbfCq4KgRfsDnul6CrIdAMl9xRBixZ-hUyqiB2g4,2403
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/file_io/csvs.py,sha256=VSxW7962JmhvvrZvKgrB-Ij89AcliMVmYE6k7W34VtM,2000
-atomicshop/file_io/file_io.py,sha256=3w9_CRRDGmIMxQZErmJUyJjH50_6ODUw_6_fyvAZL1c,5176
+atomicshop/file_io/csvs.py,sha256=4R4Kij8FmxNwXFjDtlF_A0flAk0Hj5nZKlEnqC5VxgQ,3125
+atomicshop/file_io/file_io.py,sha256=d7HYaixw12wf0WKKoCpWWjOWtmsFqgGztcSuWL41nlQ,5650
 atomicshop/file_io/jsons.py,sha256=XgQs--Q6LGqC4ZtcyKvlMY_Fajjjp_l5bi6xYCy2fQQ,3383
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/connection_thread_worker.py,sha256=u_d_xMuFKFEYg42kZyCoY7CY4qEMapqRWjQhgRAAveQ,20631
+atomicshop/mitm/connection_thread_worker.py,sha256=7f7T3t6ltndzb3125DgyRTzsD-oAbAfewDIhpNEeHRY,20630
 atomicshop/mitm/import_config.py,sha256=BPZ62ozMUaUKn7Crt6dhzvUgD3dSKd17kMfbJNObvlI,7486
 atomicshop/mitm/initialize_engines.py,sha256=qCtIjaR-sCbcliKKX_I65O6e4fqc-zDHELGglnL92cw,7687
 atomicshop/mitm/initialize_mitm_server.py,sha256=ZEYt5GgnhcgMDGtc4a4klYN0ukq8_ZSg91Uta_vzb7A,11345
@@ -126,7 +126,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=30uaJOJhPJExYptEmwc5HWScI2RbnDlNgybOsxW7klc,11609
-atomicshop/wrappers/loggingw/reading.py,sha256=1WmPl8_Jc1PHXDpvpEJubalFxzmTa0DpTvxehFVvvzw,1510
+atomicshop/wrappers/loggingw/reading.py,sha256=3zT1ahK_xU9YAi3-xk6F2QEzC40lfwTWQr1MrkMpF8o,3786
 atomicshop/wrappers/playwrightw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/playwrightw/_tryouts.py,sha256=l1BLkFsiIMNlgv7nfZd1XGEvXQkIQkIcg48__9OaC00,4920
 atomicshop/wrappers/playwrightw/base.py,sha256=zwHfbFZV7qqpmReJg5lEpKtOO23DRxEd61ZdoLBU_9Q,9833
@@ -154,8 +154,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=7-G1t2yyDA-cNQF8zCpQS
 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.2.7.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.2.7.dist-info/METADATA,sha256=jMjqlMZGxGDvnoszJCov1Y63NuJbBZq3uecEmOpsHuM,9506
-atomicshop-2.2.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-atomicshop-2.2.7.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.2.7.dist-info/RECORD,,
+atomicshop-2.2.9.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.2.9.dist-info/METADATA,sha256=uXxMGqgUIcJdkLOtXGzXJ0RNNDaXtX1ex4gwK0Dz-14,9506
+atomicshop-2.2.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+atomicshop-2.2.9.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.2.9.dist-info/RECORD,,