From 5f4cee759f707e215e661988b78bc6d67cd9281e Mon Sep 17 00:00:00 2001 From: DYefremov Date: Thu, 5 May 2022 23:21:26 +0300 Subject: [PATCH] bouquets reading correction (#104) --- app/eparser/enigma/bouquets.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/eparser/enigma/bouquets.py b/app/eparser/enigma/bouquets.py index d400e587..c62234ed 100644 --- a/app/eparser/enigma/bouquets.py +++ b/app/eparser/enigma/bouquets.py @@ -168,9 +168,9 @@ class ServiceType(Enum): class BouquetsReader: """ Class for reading and parsing bouquets. """ - _ALT_PAT = re.compile(".*alternatives\\.+(.*)\\.([tv|radio]+).*") - _BQ_PAT = re.compile(".*userbouquet\\.+(.*)\\.+[tv|radio].*") - _SUB_BQ_PAT = re.compile(".*subbouquet\\.+(.*)\\.([tv|radio]+).*") + _ALT_PAT = re.compile(r".*alternatives\.+(.*)\.([tv|radio]+).*") + _BQ_PAT = re.compile(r".*\s+\W(.*bouquet)\.+(.*)\.+[tv|radio].*") + _SUB_BQ_PAT = re.compile(r".*subbouquet\.+(.*)\.([tv|radio]+).*") _STREAM_TYPES = {"4097", "5001", "5002", "8193", "8739"} __slots__ = ["_path"] @@ -198,15 +198,15 @@ class BouquetsReader: if "#SERVICE" in line: name = re.match(self._BQ_PAT, line) if name: - b_name = name.group(1) + prefix, b_name = name.group(1), name.group(2) if b_name in b_names: log(f"The list of bouquets contains duplicate [{b_name}] names!") else: b_names.add(b_name) - rb_name, services = self.get_bouquet(self._path, b_name, bq_type) + rb_name, services = self.get_bouquet(self._path, b_name, bq_type, prefix) if rb_name in real_b_names: - log(f"Bouquet file 'userbouquet.{b_name}.{bq_type}' has duplicate name: {rb_name}") + log(f"Bouquet file '{prefix}.{b_name}.{bq_type}' has duplicate name: {rb_name}") real_b_names[rb_name] += 1 rb_name = f"{rb_name} {real_b_names[rb_name]}" else: