From 84ac3dc9b804b559abcbe3bcd6dfae9b022206c4 Mon Sep 17 00:00:00 2001
From: YoursFunny <admin@yoursfunny.top>
Date: Sun, 5 Jul 2026 17:51:46 +0800
Subject: [PATCH] feat: add is_format_matched method and improve regex for
 result formatting

---
 module/ocr/ocr.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/ocr/ocr.py b/module/ocr/ocr.py
index 6c3b390..a099d26 100644
--- a/module/ocr/ocr.py
+++ b/module/ocr/ocr.py
@@ -350,6 +350,10 @@ class DigitCounter(Ocr):
     def __init__(self, button: ButtonWrapper, lang='en', name=None):
         super().__init__(button, lang=lang, name=name)
 
+    @classmethod
+    def is_format_matched(cls, result) -> bool:
+        return '/' in result
+
     def format_result(self, result) -> tuple[int, int, int]:
         """
         Do OCR on a counter, such as `14/15`, and returns 14, 1, 15
@@ -360,7 +364,7 @@ class DigitCounter(Ocr):
         result = super().after_process(result)
         logger.attr(name=self.name, text=str(result))
 
-        res = re.search(r'(\d+)/(\d+)', result)
+        res = re.search(r'(\d+)\s*/\s*(\d+)', result)
         if res:
             groups = [int(s) for s in res.groups()]
             current, total = int(groups[0]), int(groups[1])