From a953d8222d0267b6d53d476939e7426152a96543 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 5 Apr 2022 11:24:03 -0700 Subject: [PATCH] PlotJuggler: fix support for Cabana links (#24037) * support Cabana links better * not needed * Update tools/plotjuggler/juggle.py --- tools/plotjuggler/juggle.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/plotjuggler/juggle.py b/tools/plotjuggler/juggle.py index 6f7be73490..3e8775eb8b 100755 --- a/tools/plotjuggler/juggle.py +++ b/tools/plotjuggler/juggle.py @@ -12,8 +12,6 @@ import argparse from common.basedir import BASEDIR 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.route import Route, SegmentName 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 if 'cabana' in route_or_segment_name: query = parse_qs(urlparse(route_or_segment_name).query) - api = CommaApi(get_token()) - 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): + route_or_segment_name = query["route"][0] + + if route_or_segment_name.startswith(("http://", "https://")) or os.path.isfile(route_or_segment_name): logs = [route_or_segment_name] else: route_or_segment_name = SegmentName(route_or_segment_name, allow_route_name=True)