epg config dialog skeleton

app/tools/epg.py

@@ -47,12 +47,9 @@ class ChannelsParser:
 
     @staticmethod
     def get_refs_from_xml(path):
-        services = []
+        refs = {}
         dom = parse(path)
 
-        description = "".join(n.data + "\n" for n in dom.childNodes if n.nodeType == Node.COMMENT_NODE)
-        services.append(BouquetService(name=description, type=BqServiceType.MARKER, data=None, num=-1))
-
         for elem in dom.getElementsByTagName("channels"):
             c_count = 0
             comment_count = 0
@@ -65,19 +62,17 @@ class ChannelsParser:
                         comment_count += 1
                         txt = n.data.strip()
                         if comment_count:
-                            services.append(BouquetService(name=txt, type=BqServiceType.MARKER, data=None, num=c_count))
                             comment_count -= 1
                         else:
-                            services.append(BouquetService(name=txt,
-                                                           type=BqServiceType.DEFAULT,
-                                                           data="{}:{}:{}:{}".format(*current_data.split(":")[3:7]),
-                                                           num=c_count))
+                            ref_data = current_data.split(":")
+                            refs["{}:{}:{}".format(*ref_data[3:6])] = (txt, "{}:{}:{}:{}".format(*ref_data[3:7]))
+
                     if n.hasChildNodes():
                         for s_node in n.childNodes:
                             if s_node.nodeType == Node.TEXT_NODE:
                                 comment_count -= 1
                                 current_data = s_node.data
-        return services
+        return refs
 
     @staticmethod
     def write_refs_to_xml(path, services):

app/ui/epg_dialog.py

@@ -1,3 +1,5 @@
+from enum import Enum
+
 from app.commons import run_idle
 from app.eparser.ecommons import BouquetService, BqServiceType
 from app.tools.epg import EPG, ChannelsParser
@@ -6,6 +8,11 @@ from .main_helper import on_popup_menu
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN, Column, EPG_ICON
 
 
+class RefsSource(Enum):
+    LAMEDB = 0
+    XML = 1
+
+
 class EpgDialog:
 
     def __init__(self, transient, options, services, bouquet, fav_model):
@@ -27,6 +34,7 @@ class EpgDialog:
         self._ex_fav_model = fav_model
         self._options = options
         self._bouquet = bouquet
+        self._refs_source = RefsSource.XML
 
         builder = Gtk.Builder()
         builder.set_translation_domain(TEXT_DOMAIN)
@@ -62,18 +70,33 @@ class EpgDialog:
 
         try:
             refs = EPG.get_epg_refs(self._options.get("data_dir_path", "") + "epg.dat")
-            # for source lamedb
-            srvs = {k[:k.rfind(":")]: v for k, v in self._services.items()}
-            list(map(self._services_model.append,
-                     map(lambda s: (s.service, s.fav_id),
-                         filter(None, [srvs.get(ref) for ref in refs]))))
+            if self._refs_source is RefsSource.LAMEDB:
+                self.init_lamedb_source(refs)
+            elif self._refs_source is RefsSource.XML:
+                self.init_xml_source(refs)
+            else:
+                self.show_info_message("Unknown names source!", Gtk.MessageType.ERROR)
+                return
         except (FileNotFoundError, ValueError) as e:
-            self.show_info_message("Read epg.dat error: {}".format(e), Gtk.MessageType.ERROR)
+            self.show_info_message("Read data error: {}".format(e), Gtk.MessageType.ERROR)
         else:
             if len(self._services_model) == 0:
                 msg = "Current epg.dat file does not contains references for the services of this bouquet!"
                 self.show_info_message(msg, Gtk.MessageType.ERROR)
 
+    def init_lamedb_source(self, refs):
+        srvs = {k[:k.rfind(":")]: v for k, v in self._services.items()}
+        list(map(self._services_model.append,
+                 map(lambda s: (s.service, s.fav_id),
+                     filter(None, [srvs.get(ref) for ref in refs]))))
+
+    def init_xml_source(self, refs):
+        s_refs = ChannelsParser.get_refs_from_xml(self._options.get("data_dir_path", "") + "channels.xml")
+        for ref in refs:
+            srv = s_refs.get(ref, None)
+            if srv:
+                self._services_model.append(srv)
+
     def show(self):
         self._dialog.show()
 
@@ -113,13 +136,17 @@ class EpgDialog:
             name = "".join(r[Column.FAV_SERVICE].split()).upper()
             ref = source.get(name, None)
             if ref:
-                self.assign_data(r, ref)
+                self.assign_data(r, ref, True)
                 success_count += 1
 
         self.show_info_message("Done! Count of successfully configured services: {}".format(success_count),
                                Gtk.MessageType.INFO)
 
-    def assign_data(self, row, ref):
+    def assign_data(self, row, ref, show_error=False):
+        if row[Column.FAV_TYPE] == BqServiceType.MARKER.value:
+            if not show_error:
+                self.show_info_message(get_message("Not allowed in this context!"), Gtk.MessageType.ERROR)
+            return
         row[Column.FAV_LOCKED] = EPG_ICON
         fav_id = row[Column.FAV_ID]
         fav_id_data = fav_id.split(":")