diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py b/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py index 56502712..946dd844 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py @@ -147,8 +147,12 @@ class command: curl_match = re.search( r"(\d+\s+\d+\s+\d+\s+\d+.*?(?:k|M|G)?.*?--:--:--|Speed)", text ) + # Pattern 1e: General transfer progress (size, rate, time patterns) + transfer_match = re.search( + r"\d+\s+\d+[kMGT]?\s+\d+\s+\d+[kMGT]?.*?\d+\.\d+[kMGT].*?\d+:\d+:\d+", text + ) - if time_match or token_match or dd_match or curl_match: + if time_match or token_match or dd_match or curl_match or transfer_match: # For non-percentage progress, use a single activity beep every 2 # seconds if ( @@ -183,7 +187,7 @@ class command: # Pattern 3: Progress bars ([#### ], [====> ], etc.) # Improved pattern to avoid matching IRC channels like [#channel] - bar_match = re.search(r"\[([#=\-\*]+)([\s\.]*)\]", text) + bar_match = re.search(r"\[([#=\*]+)([\s\.\-]*)\]", text) if bar_match: filled = len(bar_match.group(1)) unfilled = len(bar_match.group(2)) diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py index b17d7e73..5cb0b9ed 100644 --- a/src/fenrirscreenreader/fenrirVersion.py +++ b/src/fenrirscreenreader/fenrirVersion.py @@ -4,6 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributors. -version = "2025.07.09" +version = "2025.07.13" codeName = "testing" code_name = "testing"