Fixes for dodgy blogs, new feedparser

[planet-ucc.git] / XMLParse2.py

diff --git a/XMLParse2.py b/XMLParse2.py
index 861b333..d1ca814 100644 (file)
--- a/XMLParse2.py
+++ b/XMLParse2.py
@@ -42,19 +42,20 @@ class XMLParse:
                "Return a single Blog object"
                item            = Blog()
                if self.blogObject and self.blogObject.cache:
-                       sys.stdout.write('Downloading feed %s...' % self.feedURL)
+                       sys.stdout.write('Downloading feed %s... ' % self.feedURL)
                        try:
                                data    = feedparser.parse(self.feedURL, self.blogObject.cache.etag, self.blogObject.cache.date)
-                               sys.stdout.write('done.\n')
+                               # check to see what we got returned
+                               if data['items'] == [] and data['channel'] == {}:
+                                       sys.stdout.write('cached.\n')
+                                       return self.blogObject
+                               else:
+                                       sys.stdout.write('done.\n')
                        except:
                                sys.stdout.write('failed.\n')
                                return None
-                       # check to see what we got returned
-                       if data['items'] == [] and data['channel'] == {}:
-                               sys.stdout.write('Feed %s is upto date.\n' % self.feedURL)
-                               return self.blogObject
                else:
-                       sys.stdout.write('Downloading feed from %s (no cache)...' % self.feedURL)
+                       sys.stdout.write('Downloading feed (no cache) %s... ' % self.feedURL)
                        try:
                                data    = feedparser.parse(self.feedURL)
                                sys.stdout.write('done.\n')