From f89196041bc94d2841ffdde1de8965dd3bb6eaf8 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Thu, 2 Apr 2020 16:50:58 +0300
Subject: [PATCH] epg options fix

---
 app/connections.py   |  5 +++--
 app/settings.py      | 43 ++++++++++++++++++++++++++++---------------
 app/ui/epg_dialog.py | 19 +++++++++----------
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/app/connections.py b/app/connections.py
index 66101273..9089c54b 100644
--- a/app/connections.py
+++ b/app/connections.py
@@ -100,8 +100,9 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=print):
             stb_path = settings.services_path
             epg_options = settings.epg_options
             if epg_options:
-                stb_path = epg_options.epg_dat_stb_path or stb_path
-                save_path = epg_options.epg_dat_path or save_path
+                stb_path = epg_options.get("epg_dat_stb_path", stb_path)
+                save_path = epg_options.get("epg_dat_path", save_path)
+
             ftp.cwd(stb_path)
             ftp.dir(files.append)
             for file in files:
diff --git a/app/settings.py b/app/settings.py
index d0de7f4a..8aac31b8 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -237,21 +237,7 @@ class Settings:
     def setting_type(self, s_type):
         self._cp_settings["setting_type"] = s_type.value
 
-    @property
-    def language(self):
-        return self._settings.get("language", locale.getlocale()[0] or "en_US")
-
-    @language.setter
-    def language(self, value):
-        self._settings["language"] = value
-
-    @property
-    def load_last_config(self):
-        return self._settings.get("load_last_config", False)
-
-    @load_last_config.setter
-    def load_last_config(self, value):
-        self._settings["load_last_config"] = value
+    # ******* Network ******** #
 
     @property
     def host(self):
@@ -473,6 +459,17 @@ class Settings:
     def play_streams_mode(self, value):
         self._settings["play_streams_mode"] = value
 
+    # *********** EPG ************ #
+
+    @property
+    def epg_options(self):
+        """ Options used by the EPG dialog. """
+        return self._cp_settings.get("epg_options", None)
+
+    @epg_options.setter
+    def epg_options(self, value):
+        self._cp_settings["epg_options"] = value
+
     # ***** Program settings ***** #
 
     @property
@@ -555,6 +552,22 @@ class Settings:
     def fav_click_mode(self, value):
         self._settings["fav_click_mode"] = value
 
+    @property
+    def language(self):
+        return self._settings.get("language", locale.getlocale()[0] or "en_US")
+
+    @language.setter
+    def language(self, value):
+        self._settings["language"] = value
+
+    @property
+    def load_last_config(self):
+        return self._settings.get("load_last_config", False)
+
+    @load_last_config.setter
+    def load_last_config(self, value):
+        self._settings["load_last_config"] = value
+
     @property
     def is_darwin(self):
         return IS_DARWIN
diff --git a/app/ui/epg_dialog.py b/app/ui/epg_dialog.py
index 151bea9f..912de5cd 100644
--- a/app/ui/epg_dialog.py
+++ b/app/ui/epg_dialog.py
@@ -486,7 +486,7 @@ class EpgDialog:
         epg_dat_path = self._settings.data_local_path + "epg/"
         self._epg_dat_path_entry.set_text(epg_dat_path)
         default_epg_data_stb_path = "/etc/enigma2"
-        epg_options = self._settings.get("epg_options")
+        epg_options = self._settings.epg_options
         if epg_options:
             self._refs_source = RefsSource.XML if epg_options.get("xml_source", False) else RefsSource.SERVICES
             self._xml_radiobutton.set_active(self._refs_source is RefsSource.XML)
@@ -506,15 +506,14 @@ class EpgDialog:
         os.makedirs(os.path.dirname(self._epg_dat_path_entry.get_text()), exist_ok=True)
 
     def on_options_save(self, item=None):
-        epg_options = {"xml_source": self._xml_radiobutton.get_active(),
-                       "use_web_source": self._use_web_source_switch.get_active(),
-                       "local_path_to_xml": self._xml_chooser_button.get_filename(),
-                       "url_to_xml": self._url_to_xml_entry.get_text(),
-                       "enable_filtering": self._enable_filtering_switch.get_active(),
-                       "epg_dat_path": self._epg_dat_path_entry.get_text(),
-                       "epg_dat_stb_path": self._epg_dat_stb_path_entry.get_text(),
-                       "epg_data_update_on_start": self._update_on_start_switch.get_active()}
-        self._settings.add("epg_options", epg_options)
+        self._settings.epg_options = {"xml_source": self._xml_radiobutton.get_active(),
+                                      "use_web_source": self._use_web_source_switch.get_active(),
+                                      "local_path_to_xml": self._xml_chooser_button.get_filename(),
+                                      "url_to_xml": self._url_to_xml_entry.get_text(),
+                                      "enable_filtering": self._enable_filtering_switch.get_active(),
+                                      "epg_dat_path": self._epg_dat_path_entry.get_text(),
+                                      "epg_dat_stb_path": self._epg_dat_stb_path_entry.get_text(),
+                                      "epg_data_update_on_start": self._update_on_start_switch.get_active()}
 
     def on_resize(self, window):
         if self._settings: