X-Git-Url: https://git.cweiske.de/enigma2-curlytx.git/blobdiff_plain/bfed8f31ab030b3f51dde4585ca368822e12a57c..5a3881a8fa5611a7defe420be7d36611a35b999d:/src/CurlyTxSettings.py

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index c04acb2..5d39725 100644
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -12,7 +12,7 @@ from Components.Sources.StaticText import StaticText
 from Screens.MessageBox import MessageBox
 
 from . import config
-from config import createPage, loadDefaultPageOptions
+from config import createPage, loadDefaultPageOptions, feedPagesToConfig, feedSettingsToConfig, savePageConfig
 from Components.config import config, getConfigListEntry, ConfigSelection
 from Components.ConfigList import ConfigList, ConfigListScreen
 
@@ -152,33 +152,21 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
 
         self["config"].setList(self.getConfigList())
 
-    def feedPagesReceived(self, pages):
-        if len(pages) == 0:
-            return
-
-        del config.plugins.CurlyTx.pages[:]
-
-        for pageData in pages:
-            page = createPage()
-            config.plugins.CurlyTx.pages.append(page)
-            page.title.setValue(pageData["title"])
-            page.uri.setValue(pageData["url"])
-
+    def feedPagesReceived(self, pages, settings):
+        feedPagesToConfig(pages)
+        feedSettingsToConfig(settings)
         self["config"].setList(self.getConfigList())
 
-    def feedPagesFail(self, failure):
+    def feedPagesFail(self, errorMessage):
         """ Downloading the page url feed failed somehow """
         self.session.open(
             MessageBox,
-            _("Error loading page feed:") + "\n\n" + str(failure.getErrorMessage()),
+            _("Error loading page feed:") + "\n\n" + str(errorMessage),
             MessageBox.TYPE_ERROR
             )
 
     def keySave(self):
-        for i in range(0, len(config.plugins.CurlyTx.pages)):
-            config.plugins.CurlyTx.pages[i].save()
-
-        config.plugins.CurlyTx.pages.save()
+        savePageConfig()
         ConfigListScreen.keySave(self)
 
     def cancelConfirm(self, result):