show error message when loading the page url feed fails

diff --git a/src/AtomFeed.py b/src/AtomFeed.py
index 2a9f55d319be2a473ebd7a1be899c221adbb4656..9e76e9ff4deedc50511fc812559a7b9e66829555 100644 (file)
--- a/src/AtomFeed.py
+++ b/src/AtomFeed.py
@@ -9,16 +9,12 @@ from xml.etree.cElementTree import fromstring
 class AtomFeed:
     """ Simple XML parser that extracts pages from a atom feed """
     ns = "{http://www.w3.org/2005/Atom}"
-    def __init__(self, url, callback):
+    def __init__(self, url, callback, errorCallback):
         """ Fetches the URL
 
         Parsed pages are sent back to callback by parse()
         """
-        getPage(url).addCallback(self.parse, callback).addErrback(self.fail)
-
-
-    def fail(self, msg):
-        print("CurlyTx", msg)
+        getPage(url).addCallback(self.parse, callback).addErrback(errorCallback)
 
     def parse(self, data, callback):
         """ Parse atom feed data into pages list and run callback """

diff --git a/src/CurlyTxSettings.py b/src/CurlyTxSettings.py
index f733e125839a898246ed2e41282fad24ae3d381a..c04acb2091b0685ef69fa30ca5b080494e686578 100644 (file)
--- a/src/CurlyTxSettings.py
+++ b/src/CurlyTxSettings.py
@@ -134,7 +134,10 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
                 )
         elif config.plugins.CurlyTx.feedUrl.value:
             from AtomFeed import AtomFeed
-            AtomFeed(config.plugins.CurlyTx.feedUrl.value, self.feedPagesReceived)
+            AtomFeed(
+                config.plugins.CurlyTx.feedUrl.value,
+                self.feedPagesReceived, self.feedPagesFail
+                )
         else:
             self.session.open(
                 MessageBox, _("No page feed URL defined"), MessageBox.TYPE_ERROR
@@ -163,6 +166,14 @@ class CurlyTxSettings(ConfigListScreen, HelpableScreen, Screen):
 
         self["config"].setList(self.getConfigList())
 
+    def feedPagesFail(self, failure):
+        """ Downloading the page url feed failed somehow """
+        self.session.open(
+            MessageBox,
+            _("Error loading page feed:") + "\n\n" + str(failure.getErrorMessage()),
+            MessageBox.TYPE_ERROR
+            )
+
     def keySave(self):
         for i in range(0, len(config.plugins.CurlyTx.pages)):
             config.plugins.CurlyTx.pages[i].save()