version update -> 3.10.2

* additional format for reading bouquet file name

app/eparser/enigma/bouquets.py

@@ -181,6 +181,7 @@ class ServiceType(Enum):
 class BouquetsReader:
     """ Class for reading and parsing bouquets. """
     _BQ_PAT = re.compile(r".*FROM BOUQUET\s+\"((.*bouquet|alternatives)?\.?([\w-]+)\.?(\w+)?)\"\s+.*$", re.IGNORECASE)
+    _BQ_PAT2 = re.compile(r"#SERVICE:+\s+(?:[0-9a-f]+:+)+([^:]+[.](?:tv|radio))$", re.IGNORECASE)
     _BQ_POST_PAT = re.compile(r".*FROM BOUQUET\s+\"((.*bouquet|alternatives)?\.?(.*)\.?(\w+)?)\"\s+.*$", re.IGNORECASE)
     _STREAM_TYPES = {"4097", "5001", "5002", "8193", "8739"}
 
@@ -207,9 +208,10 @@ class BouquetsReader:
 
             for line in file.readlines():
                 if "#SERVICE" in line:
-                    mt = re.match(self._BQ_PAT, line)
                     s_data = line.split(":")
-                    s_type = ServiceType(s_data[1])
+                    s_type = ServiceType.BOUQUET
+
+                    mt = re.match(self._BQ_PAT, line) or re.match(self._BQ_PAT2, line)
                     if not mt:
                         # Additional file name checking.
                         mt = re.match(self._BQ_POST_PAT, line)
@@ -217,7 +219,13 @@ class BouquetsReader:
                             log(f"Warning: The bouquet file name may be formed incorrectly. -> {mt.group(1)}")
 
                     if mt:
-                        file_name, prefix, b_name = mt.group(1), mt.group(2), mt.group(3)
+                        if len(mt.groups()) > 1:
+                            file_name, prefix, b_name = mt.group(1), mt.group(2), mt.group(3)
+                            s_data[:2] = "10"
+                        else:
+                            file_name, prefix, b_name = mt.group(1), "", ""
+                            s_type = ServiceType(s_data[2])
+
                         if b_name in b_names:
                             log(f"The list of bouquets contains duplicate [{b_name}] names!")
                         else:
@@ -231,7 +239,6 @@ class BouquetsReader:
                         else:
                             real_b_names[rb_name] = 0
                         # Locked, hidden.
-                        s_data[:2] = "10"
                         locked = ":".join(s_data).rstrip()
                         hidden = s_type is ServiceType.HIDDEN
                         bouquets[2].append(Bouquet(rb_name, bq_type, services, locked, hidden, file_name))

app/ui/dialogs.glade

@@ -40,7 +40,7 @@ Author: Dmitriy Yefremov
     <property name="icon_name">system-help</property>
     <property name="type_hint">normal</property>
     <property name="program_name">DemonEditor</property>
-    <property name="version">3.10.0 Beta</property>
+    <property name="version">3.10.2 Beta</property>
     <property name="copyright">2018-2024 Dmitriy Yefremov
 </property>
     <property name="comments" translatable="yes">Enigma2 channel and satellite list editor.</property>

app/ui/main.glade

@@ -1722,7 +1722,7 @@ Author: Dmitriy Yefremov
                               <object class="GtkLabel" id="app_ver_label">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="label">3.10.0 Beta</property>
+                                <property name="label">3.10.2 Beta</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>

app/ui/main.py

@@ -77,7 +77,7 @@ from .xml.edit import SatellitesTool
 
 class Application(Gtk.Application):
     """ Main application class. """
-    VERSION = "3.10.0"
+    VERSION = "3.10.2"
 
     SERVICE_MODEL = "services_list_store"
     FAV_MODEL = "fav_list_store"
@@ -1172,7 +1172,10 @@ class Application(Gtk.Application):
         self._stack.set_visible_child_name(page_name)
 
     def on_page_changed(self, app, page):
-        if not self._settings.load_last_config and not len(self._bouquets_model):
+        if page is not Page.SERVICES:
+            return
+
+        if all((not self._settings.load_last_config, not self.is_data_loading(), not len(self._bouquets_model))):
             self.open_data()
 
     def set_use_alt_layout(self, action, value):
@@ -2226,7 +2229,7 @@ class Application(Gtk.Application):
 
     def on_data_extract(self, app, page):
         """ Opening the data archive via "File/Extract...". """
-        if page is Page.SERVICES:
+        if page is Page.INFO or page is Page.SERVICES:
             file_filter = None
             if IS_DARWIN:
                 file_filter = Gtk.FileFilter()
@@ -2291,6 +2294,7 @@ class Application(Gtk.Application):
         return tmp_path
 
     def update_data(self, data_path, callback=None):
+        self._services_load_spinner.start()
         self._profile_combo_box.set_sensitive(False)
         self._alt_revealer.set_visible(False)
         self._filter_services_button.set_active(False)
@@ -2483,7 +2487,6 @@ class Application(Gtk.Application):
             self._services[srv.fav_id] = srv
         self.update_services_counts(len(self._services.values()))
         self._wait_dialog.hide()
-        self._services_load_spinner.start()
         factor = self.DEL_FACTOR / 4
 
         for index, srv in enumerate(to_add):

build/linux/build-deb.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VER="3.10.0_Beta"
+VER="3.10.2_Beta"
 B_PATH="dist/DemonEditor"
 DEB_PATH="$B_PATH/usr/share/demoneditor"
 

build/linux/deb/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: demon-editor
-Version: 3.10.0-Beta
+Version: 3.10.2-Beta
 Section: utils
 Priority: optional
 Architecture: all

build/mac/DemonEditor.spec

@@ -81,7 +81,7 @@ app = BUNDLE(coll,
                  'CFBundleGetInfoString': "Enigma2 channel and satellite editor",
                  'LSApplicationCategoryType': 'public.app-category.utilities',
                  'LSMinimumSystemVersion': '10.13',
-                 'CFBundleShortVersionString': f"3.10.0.{BUILD_DATE} Beta",
+                 'CFBundleShortVersionString': f"3.10.2.{BUILD_DATE} Beta",
                  'NSHumanReadableCopyright': u"Copyright © 2024, Dmitriy Yefremov",
                  'NSRequiresAquaSystemAppearance': 'false',
                  'NSHighResolutionCapable': 'true'