diff --git a/app/tools/epg.py b/app/tools/epg.py index b1f34a33..5e043a15 100644 --- a/app/tools/epg.py +++ b/app/tools/epg.py @@ -310,12 +310,15 @@ class XmlTvReader(Reader): import gzip with gzip.open(self._path, "rb") as gzf: - log("Processing XMLTV data...") - list(map(self.process_node, ET.iterparse(gzf))) - log("XMLTV data parsing is complete.") + self.process_data(gzf) except OSError as e: log(f"{self.__class__.__name__} [parse] error: {e}") + def process_data(self, data): + log("Processing XMLTV data...") + list(map(self.process_node, ET.iterparse(data))) + log("XMLTV data parsing is complete.") + def process_node(self, node): event, element = node if element.tag == self.CH_TAG: diff --git a/app/ui/epg/epg.py b/app/ui/epg/epg.py index 7a35c330..b0358923 100644 --- a/app/ui/epg/epg.py +++ b/app/ui/epg/epg.py @@ -129,7 +129,7 @@ class EpgSettingsPopover(Gtk.Popover): self._app = app self._app.connect("profile-changed", self.on_profile_changed) - handlers = {"on_save": self.on_save, + handlers = {"on_apply": self.on_apply, "on_close": lambda b: self.popdown()} builder = get_builder(f"{UI_RESOURCES_PATH}epg{SEP}settings.glade", handlers) self.add(builder.get_object("main_box")) @@ -157,7 +157,7 @@ class EpgSettingsPopover(Gtk.Popover): self._url_entry.set_text(settings.epg_xml_source) self._dat_path_box.set_active_id(settings.epg_dat_path) - def on_save(self, button): + def on_apply(self, button): settings = self._app.app_settings if self._http_src_button.get_active(): settings.epg_source = EpgSource.HTTP @@ -171,6 +171,8 @@ class EpgSettingsPopover(Gtk.Popover): settings.epg_dat_path = self._dat_path_box.get_active_id() self.popdown() + self._app.change_action_state("display_epg", GLib.Variant.new_boolean(True)) + def on_profile_changed(self, app, p): self.init() diff --git a/app/ui/epg/settings.glade b/app/ui/epg/settings.glade index 17b3e1f8..7e13bba1 100644 --- a/app/ui/epg/settings.glade +++ b/app/ui/epg/settings.glade @@ -108,7 +108,7 @@ Author: Dmitriy Yefremov *.dat file - True + False False True False @@ -213,7 +213,7 @@ Author: Dmitriy Yefremov True False - Download: + Update: False @@ -255,7 +255,7 @@ Author: Dmitriy Yefremov - True + False False False vertical @@ -318,12 +318,12 @@ Author: Dmitriy Yefremov True expand - - Save + + Apply True True True - + True