PlotJuggler: fix support for Cabana links (#24037)

* support Cabana links better

* not needed

* Update tools/plotjuggler/juggle.py
old-commit-hash: a953d8222d
taco
Shane Smiskol 3 years ago committed by GitHub
parent 2b7ac102af
commit 38c74c325b
  1. 8
      tools/plotjuggler/juggle.py

@ -12,8 +12,6 @@ import argparse
from common.basedir import BASEDIR from common.basedir import BASEDIR
from selfdrive.test.process_replay.compare_logs import save_log from selfdrive.test.process_replay.compare_logs import save_log
from tools.lib.api import CommaApi
from tools.lib.auth_config import get_token
from tools.lib.robust_logreader import RobustLogReader from tools.lib.robust_logreader import RobustLogReader
from tools.lib.route import Route, SegmentName from tools.lib.route import Route, SegmentName
from urllib.parse import urlparse, parse_qs from urllib.parse import urlparse, parse_qs
@ -79,9 +77,9 @@ def juggle_route(route_or_segment_name, segment_count, qlog, can, layout, dbc=No
segment_start = 0 segment_start = 0
if 'cabana' in route_or_segment_name: if 'cabana' in route_or_segment_name:
query = parse_qs(urlparse(route_or_segment_name).query) query = parse_qs(urlparse(route_or_segment_name).query)
api = CommaApi(get_token()) route_or_segment_name = query["route"][0]
logs = api.get(f'v1/route/{query["route"][0]}/log_urls?sig={query["sig"][0]}&exp={query["exp"][0]}')
elif route_or_segment_name.startswith("http://") or route_or_segment_name.startswith("https://") or os.path.isfile(route_or_segment_name): if route_or_segment_name.startswith(("http://", "https://")) or os.path.isfile(route_or_segment_name):
logs = [route_or_segment_name] logs = [route_or_segment_name]
else: else:
route_or_segment_name = SegmentName(route_or_segment_name, allow_route_name=True) route_or_segment_name = SegmentName(route_or_segment_name, allow_route_name=True)

Loading…
Cancel
Save