From: Neal H. Walfield <neal@walfield.org>
Date: Tue, 6 Sep 2011 10:20:44 +0000 (+0200)
Subject: Correctly set update time to never.
X-Git-Url: http://vcs.maemo.org/git/?p=feedingit;a=commitdiff_plain;h=bbf326b51e054992cfb00b1e8c69738adb28d418

Correctly set update time to never.

 - Check if the update time is 0 in Listing.getFeedUpdateTime.
---

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index cdf478e..22db363 100644
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -1346,8 +1346,6 @@ class FeedingIt:
                 unreadItems = self.listing.getFeedNumberOfUnreadItems(key)
                 title = xml.sax.saxutils.escape(self.listing.getFeedTitle(key))
                 updateTime = self.listing.getFeedUpdateTime(key)
-                if updateTime == 0:
-                    updateTime = "Never"
                 subtitle = '%s / %d unread items' % (updateTime, unreadItems)
                 if unreadItems:
                     markup = FEED_TEMPLATE_UNREAD % (title, subtitle)
diff --git a/src/rss_sqlite.py b/src/rss_sqlite.py
index 98c414a..75c0f34 100644
--- a/src/rss_sqlite.py
+++ b/src/rss_sqlite.py
@@ -963,7 +963,11 @@ class Listing:
                 logger.debug("Feed %s (%s) unknown." % (key, title))
         
     def getFeedUpdateTime(self, key):
-        return time.ctime(self.db.execute("SELECT updateTime FROM feeds WHERE id=?;", (key,)).fetchone()[0])
+        update_time = self.db.execute(
+            "SELECT updateTime FROM feeds WHERE id=?;", (key,)).fetchone()[0]
+        if not update_time:
+            return "Never"
+        return time.ctime(update_time)
         
     def getFeedNumberOfUnreadItems(self, key):
         return self.db.execute("SELECT unread FROM feeds WHERE id=?;", (key,)).fetchone()[0]