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 <shane@smiskol.com>
pull/34917/head
Dean Lee 1 month ago committed by GitHub
parent 2413f73108
commit b8229ebca6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 9
      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]: def auto_strategy(rlog_paths: list[LogPath], qlog_paths: list[LogPath], interactive: bool, valid_file: ValidFileCallable) -> list[LogPath]:
# auto select logs based on availability # 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 missing_rlogs != 0:
if interactive: 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": 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":

Loading…
Cancel
Save