From bf60e2edcd6083d4cc13378b1917de9f2dcc29b9 Mon Sep 17 00:00:00 2001 From: Karl Voit Date: Tue, 8 Oct 2024 18:20:55 +0200 Subject: [PATCH] 7Energy: adapted changed file pattern --- guessfilename/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guessfilename/__init__.py b/guessfilename/__init__.py index 2e98563..40abd45 100755 --- a/guessfilename/__init__.py +++ b/guessfilename/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -PROG_VERSION = u"Time-stamp: <2024-09-26 12:41:19 vk>" +PROG_VERSION = u"Time-stamp: <2024-10-08 18:20:16 vk>" # TODO: @@ -305,7 +305,8 @@ class GuessFilename(object): OEMAG_REGEX = re.compile('' + DATESTAMP_REGEX + '.*Einspeisentgelt Nr. 0004313038.PDF') # 20240901-123_7Energy_Karl-Voit_Rechnung-02-2024.pdf - SEVENENERGY_REGEX = re.compile(DATESTAMP_REGEX + r'-(?P\d\d\d)_7Energy_Karl-Voit_Rechnung-' + \ + # 20241001-123_7Energy---BEG_Karl-Voit_Rechnung-05-2024.pdf + SEVENENERGY_REGEX = re.compile(DATESTAMP_REGEX + r'-(?P\d\d\d)_7Energy(---BEG)?_Karl-Voit_Rechnung-' + \ r'(?P\d\d)-' r'(?P\d\d\d\d).pdf$', re.UNICODE) @@ -985,7 +986,7 @@ class GuessFilename(object): ".pdf" # 2024-09-09: 20240901-123_7Energy_Karl-Voit_Rechnung-02-2024.pdf → 2024-09-01 7Energy Verbrauch Rechnung für 2024-02 - 1,23€ - Re-Nr. 20240904-123 -- bill.pdf - if self.config and datetimestr and "_7Energy_" in basename: + if self.config and datetimestr and "_7Energy" in basename: regex_match = re.match(self.SEVENENERGY_REGEX, basename) if regex_match: billamount = self.get_euro_charge_from_context_or_basename(content, "GESAMTSUMME ", " €", basename)