From a61d93ddcc883a3c8ad4e55cdd4fad0c2c5ab4ea Mon Sep 17 00:00:00 2001 From: Capybara-z Date: Wed, 19 Feb 2025 01:31:15 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B0=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - фикс парсера времени для старых панелей --- handlers/keys/subscriptions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/handlers/keys/subscriptions.py b/handlers/keys/subscriptions.py index eb1ef33a..b3fef841 100644 --- a/handlers/keys/subscriptions.py +++ b/handlers/keys/subscriptions.py @@ -156,10 +156,13 @@ async def handle_subscription(request, old_subscription=False): except ValueError: continue parts = meta.split("-") - candidate = parts[-1] if parts else "" + candidate = parts[-1].strip() if parts else "" candidate_decoded = urllib.parse.unquote(candidate) - # Ищем формат "11D,1H", либо "1H" - m = re.search(r'(?:(\d+)D,?)?(\d+)H', candidate_decoded) + m = re.search( + r'(?:(\d+)\s*[Dd]\s*,?\s*)?(\d+)\s*[Hh][^\d]*', + candidate_decoded, + re.IGNORECASE + ) if m: d = int(m.group(1)) if m.group(1) else 0 h = int(m.group(2))