mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-06-28 01:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

segmentrangereader: support sort_by_time (#30954)

Browse Source 
support sort-by-time
old-commit-hash: cfb23eb2d160639b870690a9bd6e7ba5350e3bc6
This commit is contained in:
Justin Newberry
2024-01-10 16:36:55 -05:00
committed by GitHub
parent 19a15e05a9
commit 9e6c6d92b0
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/lib/srreader.py
+14 -14
View File
@@ -31,49 +31,49 @@ def parse_slice(sr: SegmentRange):
s = create_slice_from_string(sr._slice)
return segs[s] if isinstance(s, slice) else [segs[s]]
def comma_api_source(sr: SegmentRange, mode=ReadMode.RLOG):
def comma_api_source(sr: SegmentRange, mode=ReadMode.RLOG, sort_by_time=False):
segs = parse_slice(sr)
route = Route(sr.route_name)
log_paths = route.log_paths() if mode == ReadMode.RLOG else route.qlog_paths()
for seg in segs:
yield LogReader(log_paths[seg])
yield LogReader(log_paths[seg], sort_by_time=sort_by_time)
def internal_source(sr: SegmentRange, mode=ReadMode.RLOG):
def internal_source(sr: SegmentRange, mode=ReadMode.RLOG, sort_by_time=False):
segs = parse_slice(sr)
for seg in segs:
yield LogReader(f"cd:/{sr.dongle_id}/{sr.timestamp}/{seg}/{'rlog' if mode == ReadMode.RLOG else 'qlog'}.bz2")
yield LogReader(f"cd:/{sr.dongle_id}/{sr.timestamp}/{seg}/{'rlog' if mode == ReadMode.RLOG else 'qlog'}.bz2", sort_by_time=sort_by_time)
def openpilotci_source(sr: SegmentRange, mode=ReadMode.RLOG):
def openpilotci_source(sr: SegmentRange, mode=ReadMode.RLOG, sort_by_time=False):
segs = parse_slice(sr)
for seg in segs:
yield LogReader(get_url(sr.route_name, seg, 'rlog' if mode == ReadMode.RLOG else 'qlog'))
yield LogReader(get_url(sr.route_name, seg, 'rlog' if mode == ReadMode.RLOG else 'qlog'), sort_by_time=sort_by_time)
def auto_source(sr: SegmentRange, mode=ReadMode.RLOG):
def auto_source(*args, **kwargs):
# Automatically determine viable source
try:
next(internal_source(sr, mode))
return internal_source(sr, mode)
next(internal_source(*args, **kwargs))
return internal_source(*args, **kwargs)
except Exception:
pass
try:
next(openpilotci_source(sr, mode))
return openpilotci_source(sr, mode)
next(openpilotci_source(*args, **kwargs))
return openpilotci_source(*args, **kwargs)
except Exception:
pass
return comma_api_source(sr, mode)
return comma_api_source(*args, **kwargs)
class SegmentRangeReader:
def __init__(self, segment_range: str, mode=ReadMode.RLOG, source=auto_source):
def __init__(self, segment_range: str, mode=ReadMode.RLOG, source=auto_source, sort_by_time=False):
sr = SegmentRange(segment_range)
self.lrs = source(sr, mode)
self.lrs = source(sr, mode, sort_by_time)
def __iter__(self):
for lr in self.lrs: