oleksiisaiun_lab6_monaco 2.1__py3-none-any.whl → 4.1__py3-none-any.whl

oleksiisaiun_lab6_monaco/__init__.py

@@ -1,5 +1,2 @@
-from .oleksiisaiun_lab6_monaco import race_report
-__all__ = ["main_run"]
-
-
-
+from .race_report import main_run
+__all__ = ["main_run"]

oleksiisaiun_lab6_monaco/race_report.py

@@ -1,7 +1,6 @@
 import os
 from dataclasses import dataclass
 from datetime import datetime
-import utilities as util
 from constants import *
 
 
@@ -59,8 +58,50 @@ class RecordData:
         )
 
 
+def _is_valid_datetime(value: str, datetime_format: str = "%Y-%m-%d_%H:%M:%S.%f") -> bool:
+    try:
+        datetime.strptime(value, datetime_format)
+        return True
+    except ValueError:
+        return False
+
+
+def _validate_if_file_exists(filepath) -> bool:
+    """Check if the folder and file exist, raise error if not."""
+    if not os.path.isfile(filepath):
+        raise FileNotFoundError(f"File not found: {filepath}")
+
+    folder = os.path.dirname(filepath)
+    if folder and not os.path.exists(folder):
+        raise FileNotFoundError(f"Folder does not exist: {folder}")
+    return True
+
+
+def _validate_abbreviation_row(row: str) -> RecordData:
+    match = ABBR_ROW_PATTERN.match(row)
+    if match:
+        driver_entry = RecordData(abbr=match.group('abbr'), driver=match.group('driver'), team=match.group('team'))
+        return driver_entry
+
+    return None
+
+
+def _validate_start_stop_row(row: str) -> (str, datetime):
+    match = START_STOP_ROW_PATTERN.match(row)
+    if match:
+        abbr = match.group('abbr')
+        time_event_raw = match.group('time_event')
+        if _is_valid_datetime(time_event_raw):
+            time_event = datetime.strptime(time_event_raw, "%Y-%m-%d_%H:%M:%S.%f")
+            event_time_out = (abbr, time_event)
+            return event_time_out
+
+    print(f"discard row: [{row}], because {ERR_MSG__INVALID_FORMAT_OF_TIME_EVENT_ROW}")
+    return None  # if start or stop row has invalid then a row is discarded
+
+
 def _create_driver_record(row) -> RecordData:
-    record_driver_out = util.validate_abbreviation_row(row)
+    record_driver_out = _validate_abbreviation_row(row)
     if record_driver_out is None:
         error_val = {row: ERR_PREFIX}
         record_driver_out = RecordData(error=[error_val])
@@ -94,7 +135,7 @@ def _read_file_start_stop(filepath: str) -> dict[str, datetime]:
             if not line:
                 continue  # Skip empty lines
 
-            time_event_record = util.validate_start_stop_row(line)
+            time_event_record = _validate_start_stop_row(line)
 
             if time_event_record is not None:
                 abbr = time_event_record[0]
@@ -115,8 +156,8 @@ def build_report(
     list_records_good = list()
     list_records_bad = list()
 
-    if (util.validate_if_file_exists(filepath_abbr)) and (util.validate_if_file_exists(filepath_start)) and (
-            util.validate_if_file_exists(filepath_stop)):
+    if (_validate_if_file_exists(filepath_abbr)) and (_validate_if_file_exists(filepath_start)) and (
+            _validate_if_file_exists(filepath_stop)):
         [dict_records_good, dict_records_bad] = _read_file_abbreviation(filepath_abbr)
 
         dict_start = _read_file_start_stop(filepath=filepath_start)
@@ -167,16 +208,13 @@ def print_report(records_good: list[RecordData], records_bad: list[RecordData],
 
 
 def main_run():
-
-    #folder = '/Users/oleksiisaiun/Documents/ALESHA/REPO/PYCHARM/GIT_FOXMINDED_LABS/TRAINING_PYTHON/python_lab_6_oop_monaco_report/data'
     folder = 'data'
     file_abbr = 'abbreviations.txt'
     file_start = 'start.log'
     file_stop = 'end.log'
 
-
     data_report = build_report(folder=folder, file_abbr=file_abbr, file_start=file_start, file_stop=file_stop)
-    print_report(records_good=data_report[0], records_bad=data_report[1],sort_by_lap_asc=False)
+    print_report(records_good=data_report[0], records_bad=data_report[1], sort_by_lap_asc=False)
 
 
 if __name__ == '__main__':

{oleksiisaiun_lab6_monaco-2.1.dist-info → oleksiisaiun_lab6_monaco-4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oleksiisaiun_lab6_monaco
-Version: 2.1
+Version: 4.1
 Summary: The Python application that implements Monaco Racing Report in OOP format
 Author-email: Oleksii Saiun <oleksiisaiun@example.com>
 License: MIT
@@ -39,4 +39,4 @@ uv pip install oleksiisaiun_lab6_monaco
 #1. Go to root folder of this package:
 #2. Run command
 uv build
-uv publish --token pypi-AgEIcHlwaS5vcmcCJGRhNmIxOTBlLTg3NTUtNGNmZi1iN2IyLWJkNGIwYWUxZjA2MwACKlszLCIzM2M1MmJiZS01NzhhLTQ5NGYtYjlmOS1hYzQzZTI4NTVkZTQiXQAABiDaegtzwu6CCdvCLNhLmzk9layeLZeP5-pYbnmR9aZYLA
+uv publish --token pypi-AgEIcHlwaS5vcmcCJDUyMzdmMjgzLTc4MGItNDhkYy1hNDRjLWNkMDZiNjczMWQ1OAACKlszLCIzM2M1MmJiZS01NzhhLTQ5NGYtYjlmOS1hYzQzZTI4NTVkZTQiXQAABiA428Uogwjs1PKhckDGrAhK0Mp8qv0-8_N7OLBIb66x1Q

{oleksiisaiun_lab6_monaco-2.1.dist-info → oleksiisaiun_lab6_monaco-4.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-oleksiisaiun_lab6_monaco/__init__.py,sha256=46Y73XFu5gzed_J-oS8IzXXF8SCeaIA3dNbQhqJe3O8,76
+oleksiisaiun_lab6_monaco/__init__.py,sha256=6RVWsHhSn20meF0sg-al1_6WHkzuH5bInJRhLhZHQ8Q,56
 oleksiisaiun_lab6_monaco/constants.py,sha256=AhfKQOCkcLiILoQ5vf9CD-oBoPMSrXIaPiQhegg5tAw,504
-oleksiisaiun_lab6_monaco/race_report.py,sha256=lyahDK62FCEsHmt6DfGJabyK63Z4643spdzsKiHfVs8,6224
+oleksiisaiun_lab6_monaco/race_report.py,sha256=R9boLa6OaA1pG4JHoFaNvc7jyr_AnUCEPlr39qj-qyg,7500
 oleksiisaiun_lab6_monaco/utilities.py,sha256=c3BCr1RdAsvCGNUhQW-Rx4eZszDGjFsIs_POL5BXs3M,1628
 oleksiisaiun_lab6_monaco/data/abbreviations.txt,sha256=3GAAVS7XOzXvfIC90WS8pEuCKtavQwGHV97do8xJ20o,663
 oleksiisaiun_lab6_monaco/data/end.log,sha256=4wE9PQZfaPeFOfKGf24XUCiNfVe2DJwbOzyDuIt7FNs,513
 oleksiisaiun_lab6_monaco/data/start.log,sha256=rKe7QZzeUVN8j4KVzs11sFfGtGZUw2Zuz3z-1RA9gv8,514
-oleksiisaiun_lab6_monaco-2.1.dist-info/licenses/LICENSE,sha256=SLpkaez9xkCMD5ce3l3sJM59kS962nWIiMb-jdywXlg,1070
-oleksiisaiun_lab6_monaco-2.1.dist-info/METADATA,sha256=foLqOZ2yqAWcnUvq7RQPLoXMsq8t07tNEEXGn6xsfO0,1460
-oleksiisaiun_lab6_monaco-2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-oleksiisaiun_lab6_monaco-2.1.dist-info/top_level.txt,sha256=M7B-GnGgDZrj10nblmrJGJMRFcOZ7d2hU_J_mijACfQ,25
-oleksiisaiun_lab6_monaco-2.1.dist-info/RECORD,,
+oleksiisaiun_lab6_monaco-4.1.dist-info/licenses/LICENSE,sha256=SLpkaez9xkCMD5ce3l3sJM59kS962nWIiMb-jdywXlg,1070
+oleksiisaiun_lab6_monaco-4.1.dist-info/METADATA,sha256=t54vvqatAWuG1pfeWj_0B0XmTtA4mT5wCSC-O3Tqkac,1460
+oleksiisaiun_lab6_monaco-4.1.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+oleksiisaiun_lab6_monaco-4.1.dist-info/top_level.txt,sha256=M7B-GnGgDZrj10nblmrJGJMRFcOZ7d2hU_J_mijACfQ,25
+oleksiisaiun_lab6_monaco-4.1.dist-info/RECORD,,

{oleksiisaiun_lab6_monaco-2.1.dist-info → oleksiisaiun_lab6_monaco-4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any