From 5087dcc5bb453e15e5428f689ce2b90e000038d4 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Thu, 11 Jan 2024 13:14:10 -0500
Subject: [PATCH] More migration to segmentrangereader (#30959)

* filter log message

* ffr

* gtfs

* gtfs
old-commit-hash: 32dfb3f8f28df60657e8d94c53d219e4606f2375
---
 selfdrive/debug/filter_log_message.py         | 37 ++++++-------------
 selfdrive/debug/fingerprint_from_route.py     |  6 +--
 .../test/get_thumbnails_for_segment.py        | 15 ++------
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/selfdrive/debug/filter_log_message.py b/selfdrive/debug/filter_log_message.py
index 20cef0fcc0..f8e78c8b98 100755
--- a/selfdrive/debug/filter_log_message.py
+++ b/selfdrive/debug/filter_log_message.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
-import os
 import argparse
 import json
 
 import cereal.messaging as messaging
-from openpilot.tools.lib.logreader import LogReader
-from openpilot.tools.lib.route import Route
+from openpilot.tools.lib.srreader import SegmentRangeReader
 
 LEVELS = {
   "DEBUG": 10,
@@ -53,31 +51,18 @@ if __name__ == "__main__":
   parser.add_argument("route", type=str, nargs='*', help="route name + segment number for offline usage")
   args = parser.parse_args()
 
-  logs = None
-  if len(args.route):
-    if os.path.exists(args.route[0]):
-      logs = [args.route[0]]
-    else:
-      r = Route(args.route[0])
-      logs = [q_log if r_log is None else r_log for (q_log, r_log) in zip(r.qlog_paths(), r.log_paths(), strict=True)]
-
-  if len(args.route) == 2 and logs:
-    n = int(args.route[1])
-    logs = [logs[n]]
-
   min_level = LEVELS[args.level]
 
-  if logs:
-    for log in logs:
-      if log:
-        lr = LogReader(log)
-        for m in lr:
-          if m.which() == 'logMessage':
-            print_logmessage(m.logMonoTime, m.logMessage, min_level)
-          elif m.which() == 'errorLogMessage' and 'qlog' in log:
-            print_logmessage(m.logMonoTime, m.errorLogMessage, min_level)
-          elif m.which() == 'androidLog':
-            print_androidlog(m.logMonoTime, m.androidLog)
+  if args.route:
+    for route in args.route:
+      lr = SegmentRangeReader(route)
+      for m in lr:
+        if m.which() == 'logMessage':
+          print_logmessage(m.logMonoTime, m.logMessage, min_level)
+        elif m.which() == 'errorLogMessage':
+          print_logmessage(m.logMonoTime, m.errorLogMessage, min_level)
+        elif m.which() == 'androidLog':
+          print_androidlog(m.logMonoTime, m.androidLog)
   else:
     sm = messaging.SubMaster(['logMessage', 'androidLog'], addr=args.addr)
     while True:
diff --git a/selfdrive/debug/fingerprint_from_route.py b/selfdrive/debug/fingerprint_from_route.py
index c2bff7c638..a019e09260 100755
--- a/selfdrive/debug/fingerprint_from_route.py
+++ b/selfdrive/debug/fingerprint_from_route.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
-from openpilot.tools.lib.route import Route
-from openpilot.tools.lib.logreader import MultiLogIterator
+from openpilot.tools.lib.srreader import ReadMode, SegmentRangeReader
 
 
 def get_fingerprint(lr):
@@ -40,6 +39,5 @@ if __name__ == "__main__":
     print("Usage: ./fingerprint_from_route.py <route>")
     sys.exit(1)
 
-  route = Route(sys.argv[1])
-  lr = MultiLogIterator(route.log_paths()[:5])
+  lr = SegmentRangeReader(sys.argv[1], mode=ReadMode.QLOG)
   get_fingerprint(lr)
diff --git a/system/camerad/test/get_thumbnails_for_segment.py b/system/camerad/test/get_thumbnails_for_segment.py
index 43f543f1bd..95d865e4e4 100755
--- a/system/camerad/test/get_thumbnails_for_segment.py
+++ b/system/camerad/test/get_thumbnails_for_segment.py
@@ -1,26 +1,19 @@
 #!/usr/bin/env python3
-
+import argparse
 import os
-
 from tqdm import tqdm
 
-from openpilot.tools.lib.logreader import LogReader
-from openpilot.tools.lib.route import Route
-
-import argparse
+from openpilot.tools.lib.srreader import SegmentRangeReader
 
 if __name__ == "__main__":
   parser = argparse.ArgumentParser()
   parser.add_argument("route", help="The route name")
-  parser.add_argument("segment", type=int,  help="The index of the segment")
   args = parser.parse_args()
 
-  out_path = os.path.join("jpegs", f"{args.route.replace('|', '_')}_{args.segment}")
+  out_path = os.path.join("jpegs", f"{args.route.replace('|', '_').replace('/', '_')}")
   os.makedirs(out_path, exist_ok=True)
 
-  r = Route(args.route)
-  path = r.log_paths()[args.segment] or r.qlog_paths()[args.segment]
-  lr = list(LogReader(path))
+  lr = SegmentRangeReader(args.route)
 
   for msg in tqdm(lr):
     if msg.which() == 'thumbnail':