From d41ea8388f2802dcd41af1ddc8fbac4b0b441558 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Mon, 21 Jul 2025 06:58:49 -0400 Subject: [PATCH] Fixed url exclusion detection for progress bars. --- .../commands/onScreenUpdate/65000-progress_detector.py | 8 +++----- src/fenrirscreenreader/fenrirVersion.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py b/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py index 010b49b8..da24037a 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py @@ -393,12 +393,10 @@ class command: """Check if text contains URLs that might cause false progress detection""" import re - # Common URL patterns that might contain progress-like patterns + # Specific URL patterns - only match actual URLs, not filenames url_patterns = [ - r"https?://[^\s]+", # http:// or https:// URLs - r"ftp://[^\s]+", # ftp:// URLs - r"www\.[^\s]+", # www. domains - r"[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}[/\w.-]*", # domain.com/path patterns + r"\S+://\S+\.\S{2,}", # Any protocol:// with domain.ext + r"www\.[^\s]+\.[a-zA-Z]{2,}", # www.domain.ext patterns ] for pattern in url_patterns: diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py index 48eecad9..211c52e3 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.17" +version = "2025.07.21" codeName = "testing" code_name = "testing"