oleksiisaiun_lab6_monaco 4.1__tar.gz → 5.1__tar.gz

{oleksiisaiun_lab6_monaco-4.1 → oleksiisaiun_lab6_monaco-5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oleksiisaiun_lab6_monaco
-Version: 4.1
+Version: 5.1
 Summary: The Python application that implements Monaco Racing Report in OOP format
 Author-email: Oleksii Saiun <oleksiisaiun@example.com>
 License: MIT

{oleksiisaiun_lab6_monaco-4.1 → oleksiisaiun_lab6_monaco-5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oleksiisaiun_lab6_monaco"
-version = "4.1"
+version = "5.1"
 description = "The Python application that implements Monaco Racing Report in OOP format"
 authors = [
     { name = "Oleksii Saiun", email = "oleksiisaiun@example.com" }

{oleksiisaiun_lab6_monaco-4.1 → oleksiisaiun_lab6_monaco-5.1}/src/oleksiisaiun_lab6_monaco/race_report.py

@@ -1,8 +1,20 @@
 import os
 from dataclasses import dataclass
 from datetime import datetime
-from constants import *
 
+import re
+ABBR_ROW_PATTERN = re.compile(
+    r"^(?P<abbr>[A-Z]{3})_(?P<driver>[A-Za-z .'-]+)_(?P<team>[A-Z0-9 &'()-]+)$"
+)
+
+START_STOP_ROW_PATTERN = re.compile(
+    r'^(?P<abbr>[A-Z]{3})(?P<time_event>\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2}\.\d{3})$'
+)
+
+ERR_MSG__LAP_TIME_ZERO_OR_NEGATIVE="LAP_TIME_CAN_NOT_BE_ZERO_OR_NEGATIVE"
+ERR_MSG__EMPTY_START_OR_STOP_TIME="EMPTY_START_OR_STOP_TIME"
+ERR_MSG__INVALID_FORMAT_OF_TIME_EVENT_ROW ='INVALID_FORMAT_OF_TIME_EVENT_ROW'
+ERR_PREFIX='INVALID_ABBREVIATION_ROW_'
 
 @dataclass
 class RecordData:

{oleksiisaiun_lab6_monaco-4.1 → oleksiisaiun_lab6_monaco-5.1}/src/oleksiisaiun_lab6_monaco.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oleksiisaiun_lab6_monaco
-Version: 4.1
+Version: 5.1
 Summary: The Python application that implements Monaco Racing Report in OOP format
 Author-email: Oleksii Saiun <oleksiisaiun@example.com>
 License: MIT

{oleksiisaiun_lab6_monaco-4.1 → oleksiisaiun_lab6_monaco-5.1}/src/oleksiisaiun_lab6_monaco.egg-info/SOURCES.txt

@@ -3,9 +3,7 @@ MANIFEST.in
 README.md
 pyproject.toml
 src/oleksiisaiun_lab6_monaco/__init__.py
-src/oleksiisaiun_lab6_monaco/constants.py
 src/oleksiisaiun_lab6_monaco/race_report.py
-src/oleksiisaiun_lab6_monaco/utilities.py
 src/oleksiisaiun_lab6_monaco.egg-info/PKG-INFO
 src/oleksiisaiun_lab6_monaco.egg-info/SOURCES.txt
 src/oleksiisaiun_lab6_monaco.egg-info/dependency_links.txt

oleksiisaiun_lab6_monaco-4.1/src/oleksiisaiun_lab6_monaco/constants.py

@@ -1,16 +0,0 @@
-import re
-
-
-ABBR_ROW_PATTERN = re.compile(
-    r"^(?P<abbr>[A-Z]{3})_(?P<driver>[A-Za-z .'-]+)_(?P<team>[A-Z0-9 &'()-]+)$"
-)
-
-
-START_STOP_ROW_PATTERN = re.compile(
-    r'^(?P<abbr>[A-Z]{3})(?P<time_event>\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2}\.\d{3})$'
-)
-
-ERR_MSG__LAP_TIME_ZERO_OR_NEGATIVE="LAP_TIME_CAN_NOT_BE_ZERO_OR_NEGATIVE"
-ERR_MSG__EMPTY_START_OR_STOP_TIME="EMPTY_START_OR_STOP_TIME"
-ERR_MSG__INVALID_FORMAT_OF_TIME_EVENT_ROW ='INVALID_FORMAT_OF_TIME_EVENT_ROW'
-ERR_PREFIX='INVALID_ABBREVIATION_ROW_'

oleksiisaiun_lab6_monaco-4.1/src/oleksiisaiun_lab6_monaco/utilities.py

@@ -1,43 +0,0 @@
-import os
-from datetime import datetime
-from race_report import RecordData
-from constants import ABBR_ROW_PATTERN,START_STOP_ROW_PATTERN,ERR_MSG__INVALID_FORMAT_OF_TIME_EVENT_ROW
-
-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