Fix timestamp fixing

Sort activity points only by distance ignoring timestamps

Fix using string together with `Path`

Fix not working CLI

Author: outcatcher

README.md

@@ -5,6 +5,8 @@
 
 Точки маршрута привязываются к тренировке по расстоянию от начала пути.
 
+Автоматически исправляет неверные временные метки в файле активности.
+
 ## Использование
 
 [Пример результата](https://www.strava.com/activities/11471378450)
@@ -14,10 +16,11 @@
 ```shell
 > firome --route test/2024-05-21_1597851131.gpx --recording test/40B032FC.fit
 
-route: test/2024-05-21_1597851131.gpx
-recording: test/40B032FC.fit.zip
+route: /home/akachurin/Downloads/13.06.25.gpx
+recording: /home/akachurin/Downloads/42AE8F03.fit.zip
+found 16 broken timestamps in activity
 
-result: 1716922421.tcx
+result: 1750283535.tcx
 ```
 
 ### GUI
@@ -49,7 +52,6 @@ _Язык приложения зависит от языка системы_
 - Должен быть ZIP архивом
 - Должен содержать один файл с активностью/маршрутом
 - Дополнительно для UI:
-  - Поддерживаются только для фалов активности 
   - Должны иметь расширение `.fit.zip`
 
 

Taskfile.yaml

@@ -2,55 +2,70 @@ version: "3"
 
 tasks:
   _prepare:
+    internal: true
     cmds:
       - pip install -r requirements.txt
 
   run:
+    desc: Run the CLI application
     deps:
       - _prepare
     cmds:
       - python -m firome {{.CLI_ARGS}}
 
   generate:
+    desc: Generate UI files
     cmds:
       - pyside6-uic firome/ui/assets/main.ui -o firome/ui/main_ui.py
 
   ui:
+    desc: Run the UI application
     deps:
       - _prepare
     cmds:
       - python -m firome.ui
 
-  build:
+  build:cli:
+    desc: Build the CLI application
     deps:
       - _prepare
     preconditions:
-      - pip install pyinstaller  # TODO: use tox or other dependency splitting
+      - pip install pyinstaller # TODO: use tox or other dependency splitting
     cmds:
       - pyinstaller --onefile --console --name firome firome/__main__.py
 
-  build-ui:
+  build:ui:
+    desc: Build the UI application
     deps:
       - _prepare
     preconditions:
-      - pip install pyinstaller  # TODO: use tox or other dependency splitting
+      - pip install pyinstaller # TODO: use tox or other dependency splitting
     cmds:
       - pyinstaller --onefile --windowed --add-data "firome/i18n/assets/*.ini:firome/i18n/assets" --name firome-ui firome/ui/__main__.py
 
+  build:all:
+    desc: Build both the CLI and UI applications
+    deps:
+      - build:cli
+      - build:ui
+
   lint:
+    desc: Run the linter
     preconditions:
-      - pip install ruff  # TODO: use tox or other dependency splitting
+      - pip install ruff # TODO: use tox or other dependency splitting
     cmds:
       - ruff check
-  
-  lint-fix:
+
+  lint:fix:
+    desc: Run the linter and fix issues
     preconditions:
-      - pip install ruff  # TODO: use tox or other dependency splitting
+      - pip install ruff # TODO: use tox or other dependency splitting
     cmds:
       - ruff check --fix
 
   format:
+    desc: Run the formatter
     preconditions:
-      - pip install ruff  # TODO: use tox or other dependency splitting
+      - pip install ruff # TODO: use tox or other dependency splitting
     cmds:
       - ruff format

firome/__init__.py

@@ -1 +1 @@
-__version__ = "v0.4.4"
+__version__ = "v0.4.5"

firome/__main__.py

@@ -2,8 +2,11 @@
 import logging
 import sys
 import time
+from pathlib import Path
 
 from firome import __version__
+from firome.codecs.fit import parse_fit
+from firome.codecs.gpx import interpolate, parse_gpx
 from firome.codecs.tcx import export_as_tcx
 from firome.logger import LOGGER
 from firome.merge import merge
@@ -16,10 +19,10 @@ def __no_prio_args():
 parser = argparse.ArgumentParser(
     description="Combines GPX file with training data with GPX file with position data based on the distance",
 )
-parser.add_argument("--route", type=str, required=__no_prio_args(),
-                    help="Path to GPX file with route of the training")
-parser.add_argument("--recording", type=str, required=__no_prio_args(),
-                    help="Path to FIT file with GPS-less data of the training")
+parser.add_argument("--route", type=Path, required=__no_prio_args(), help="Path to GPX file with route of the training")
+parser.add_argument(
+    "--recording", type=Path, required=__no_prio_args(), help="Path to FIT file with GPS-less data of the training",
+)
 parser.add_argument("--precision", type=float, default=1.0, help="Precision of interpolation, meters")
 parser.add_argument("--output", choices=["tcx"], default="tcx", help="Output format")
 parser.add_argument("--debug", action="store_true", help="Enable debug logging")
@@ -29,7 +32,8 @@ def __no_prio_args():
     args = parser.parse_args()
 
     if args.version:
-        print(__version__)  # noqa: T201  # not for debug
+        print("Firome version", __version__)  # noqa: T201  # not for debug
+        print("Python version", sys.version)  # noqa: T201  # not for debug
         sys.exit(0)
 
     LOGGER.info("route: %s", args.route)
@@ -38,7 +42,10 @@ def __no_prio_args():
     if args.debug:
         LOGGER.setLevel(logging.DEBUG)
 
-    points = merge(args.route, args.recording, args.precision)
+    route_points = interpolate(parse_gpx(args.route), args.precision)
+    activity_points = parse_fit(args.recording.resolve())
+
+    points = merge(route_points, activity_points, args.precision)
 
     if args.output == "tcx":
         output_path = f"{int(time.time())}.tcx"

firome/codecs/fit/parse.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timezone
+from pathlib import Path
 
 from fitdecode import FIT_FRAME_DATA, FitDataMessage, FitReader
 
@@ -10,20 +11,22 @@
 __max_delta_days = 120  # expected activity date range from now
 
 
-def parse_fit(src: str) -> list[DataPoint]:
+def parse_fit(src: Path) -> list[DataPoint]:
     """Parse FIT file by given path."""
-    if src.lower().endswith(".zip"):
+    if src.suffix.lower() == ".zip":
         src = unzip(src)
 
-    if not src.lower().endswith(".fit"):
+    if not src.suffix.lower() == ".fit":
         raise UnsupportedFileExtError(src)
 
     with FitReader(src) as fit:
         return FitParser(fit).process()
 
+
 class FitParserRecreatedError(Exception):
     """__FitParser был создан второй раз."""
 
+
 class FitParser:
     """FIT file parser."""
 
@@ -53,7 +56,6 @@ def process(self):
 
         self._closed = True
 
-        result.sort(key=lambda x: x.timestamp)
         result.sort(key=lambda x: x.distance)
 
         # expecting sorted list here
@@ -104,7 +106,7 @@ def _ts_ok(prev, curr, nxt):
         return False
 
     # if next < prev, then next is broken
-    if (curr > nxt) and (nxt >= prev):
+    if curr > nxt >= prev:
         return False
 
     return (curr - prev).days == 0

firome/codecs/gpx/__init__.py

@@ -3,4 +3,4 @@
 from .interpolate import interpolate
 from .parse import parse_gpx
 
-__all__ = ["parse_gpx", "interpolate"]
+__all__ = ["interpolate", "parse_gpx"]

firome/codecs/gpx/interpolate.py

@@ -102,7 +102,7 @@ def __gpx_calculate_distance(gpx_data: _GPXData, *, use_ele: bool = True) -> lis
         if gpx_data["ele"] and use_ele:
             dist_ele = gpx_data["ele"][i + 1] - gpx_data["ele"][i]
 
-            gpx_dist[i + 1] = np.sqrt(dist_latlon ** 2 + dist_ele ** 2)
+            gpx_dist[i + 1] = np.sqrt(dist_latlon**2 + dist_ele**2)
         else:
             gpx_dist[i + 1] = dist_latlon
 

firome/codecs/gpx/parse.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from geopy.distance import geodesic
 from lxml import etree
 
@@ -7,17 +9,17 @@
 from ..zip import unzip
 
 
-def parse_gpx(src: str) -> list[PositionPoint]:
+def parse_gpx(src: Path) -> list[PositionPoint]:
     """Parse GPX file by given path."""
-    if src.lower().endswith(".zip"):
+    if src.suffix.lower() == ".zip":
         src = unzip(src)
 
-    if not src.lower().endswith(".gpx"):
+    if not src.suffix.lower() == ".gpx":
         raise UnsupportedFileExtError(src)
 
     result = []
 
-    root: etree.ElementBase = etree.parse(src).getroot()  # noqa:S320  # локальное приложение
+    root: etree.ElementBase = etree.parse(src).getroot()  # локальное приложение
 
     default_ns = root.nsmap[None]
 

firome/codecs/tcx/export.py

@@ -21,9 +21,10 @@ def export_as_tcx(points: list[DataPoint], destination: str, fields=None):
 
     root_attrs = {
         etree.QName(
-            "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation",
+            "http://www.w3.org/2001/XMLSchema-instance",
+            "schemaLocation",
         ): "http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2 "
-           "http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd",
+        "http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd",
     }
     root: ElementBase = etree.Element(_with_ns("TrainingCenterDatabase"), root_attrs, nsmap=_namespaces)
 

firome/codecs/zip/unzip.py

@@ -5,7 +5,7 @@
 from .errors import EmptyArchiveError, MultipleFilesError
 
 
-def unzip(src: str) -> str:
+def unzip(src: Path) -> Path:
     """Unzip source archive returning path of extracted file."""
     tmp_dir = tempfile.mkdtemp(prefix="firome-")