From b8229ebca6b04903ac38eb5d60246dc7271687d2 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 22 Mar 2025 05:43:48 +0800 Subject: [PATCH] logreader: avoid repeated prompts in auto_strategy when rlogs are missing (#34890) * avoid repeated prompts in auto_strategy when rlogs are missing * shorter --------- Co-authored-by: Shane Smiskol --- tools/lib/logreader.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/lib/logreader.py b/tools/lib/logreader.py index 9fe73825a8..df981c6184 100755 --- a/tools/lib/logreader.py +++ b/tools/lib/logreader.py @@ -119,7 +119,14 @@ def default_valid_file(fn: LogPath) -> bool: def auto_strategy(rlog_paths: list[LogPath], qlog_paths: list[LogPath], interactive: bool, valid_file: ValidFileCallable) -> list[LogPath]: # auto select logs based on availability - missing_rlogs = [rlog is None or not valid_file(rlog) for rlog in rlog_paths].count(True) + missing_rlogs = sum(rlog is None or not valid_file(rlog) for rlog in rlog_paths) + # If all rlogs are missing, check qlogs + if missing_rlogs == len(rlog_paths): + missing_qlogs = sum(qlog is None or not valid_file(qlog) for qlog in qlog_paths) + if missing_qlogs == len(qlog_paths): + # Neither rlogs nor qlogs are available, return rlog_paths as-is + return rlog_paths + if missing_rlogs != 0: if interactive: if input(f"{missing_rlogs}/{len(rlog_paths)} rlogs were not found, would you like to fallback to qlogs for those segments? (y/n) ").lower() != "y":