Log filenames: make tuples (#35771)

* make tuples

* spelling: this linter is hardcore
pull/35773/head
Harald Schäfer 3 days ago committed by GitHub
parent ffc8ea5a86
commit 103b4df18c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      tools/lib/logreader.py
  2. 13
      tools/lib/route.py

@ -21,7 +21,8 @@ from openpilot.common.swaglog import cloudlog
from openpilot.tools.lib.comma_car_segments import get_url as get_comma_segments_url
from openpilot.tools.lib.openpilotci import get_url
from openpilot.tools.lib.filereader import DATA_ENDPOINT, FileReader, file_exists, internal_source_available
from openpilot.tools.lib.route import QCAMERA_FILENAMES, CAMERA_FILENAMES, DCAMERA_FILENAMES, ECAMERA_FILENAMES, Route, SegmentRange
from openpilot.tools.lib.route import QCAMERA_FILENAMES, CAMERA_FILENAMES, DCAMERA_FILENAMES, \
ECAMERA_FILENAMES, BOOTLOG_FILENAMES, Route, SegmentRange
from openpilot.tools.lib.log_time_series import msgs_to_time_series
LogMessage = type[capnp._DynamicStructReader]
@ -102,12 +103,14 @@ class ReadMode(enum.StrEnum):
class FileName(enum.Enum):
#TODO use the ones from route.py
RLOG = ("rlog.zst", "rlog.bz2")
QLOG = ("qlog.zst", "qlog.bz2")
QCAMERA = tuple(QCAMERA_FILENAMES)
FCAMERA = tuple(CAMERA_FILENAMES)
ECAMERA = tuple(ECAMERA_FILENAMES)
DCAMERA = tuple(DCAMERA_FILENAMES)
QCAMERA = QCAMERA_FILENAMES
FCAMERA = CAMERA_FILENAMES
ECAMERA = ECAMERA_FILENAMES
DCAMERA = DCAMERA_FILENAMES
BOOTLOG = BOOTLOG_FILENAMES
LogPath = str | None

@ -10,12 +10,13 @@ from openpilot.tools.lib.auth_config import get_token
from openpilot.tools.lib.api import APIError, CommaApi
from openpilot.tools.lib.helpers import RE
QLOG_FILENAMES = ['qlog.bz2', 'qlog.zst', 'qlog']
QCAMERA_FILENAMES = ['qcamera.ts']
LOG_FILENAMES = ['rlog.bz2', 'raw_log.bz2', 'rlog.zst', 'rlog']
CAMERA_FILENAMES = ['fcamera.hevc', 'video.hevc']
DCAMERA_FILENAMES = ['dcamera.hevc']
ECAMERA_FILENAMES = ['ecamera.hevc']
QLOG_FILENAMES = ('qlog.bz2', 'qlog.zst', 'qlog')
QCAMERA_FILENAMES = ('qcamera.ts',)
LOG_FILENAMES = ('rlog.bz2', 'raw_log.bz2', 'rlog.zst', 'rlog')
CAMERA_FILENAMES = ('fcamera.hevc', 'video.hevc')
DCAMERA_FILENAMES = ('dcamera.hevc',)
ECAMERA_FILENAMES = ('ecamera.hevc',)
BOOTLOG_FILENAMES = ('bootlog.zst', 'bootlog.bz2', 'bootlog')
class Route:

Loading…
Cancel
Save