Commit: 78b336a87914f4d54834ee9d80eac895b0121b22 - newsfour (git)

news4 - RSS aggrigation system

Commit MetaInfo

• Revision: 78b336a87914f4d54834ee9d80eac895b0121b22 (tree)
• Time: 2012-10-02 05:50:51
• Author: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

fix timestamp-compareing problem

Change Summary

• modified: fetcher.py
• modified: gnews.py
• modified: renderer.py

Incremental Difference

--- a/fetcher.py
+++ b/fetcher.py
@@ -4,6 +4,7 @@
 import re
 
 import feedparser
+import dateutil.parser
 from config import config as config, target_rss as target_rss
 
 class FeedFetcher(object):
@@ -21,10 +22,12 @@ class FeedFetcher(object):
                 'title': e.title,
                 'link': e.link,
                 'body': e.description,
-                'date': e.updated,
+                'date': dateutil.parser.parse(e.updated),
                 'feed': self._feed,
                 'tags': [],
                 }
+            if entry['date'].tzinfo == None:
+                entry['date'] = entry['date'].replace(tzinfo=dateutil.tz.tzutc())
             entries.append(entry)
         return entries
 

--- a/gnews.py
+++ b/gnews.py
@@ -32,7 +32,11 @@ def main():
                 tags[tag]['quoted_name'] = urllib.quote(tag.encode('utf-8'))
 
     # sort by date
-    entries.sort(lambda x,y: -cmp(x["date"],y["date"]))
+    cmp_entries = (lambda x,y: 1 if (x["date"] < y["date"]) else -1)
+    entries.sort(cmp_entries)
+
+    for e in entries:
+        print e["date"]
 
     # Do rendering
     params = {'tags':tags, 'page':{}}

--- a/renderer.py
+++ b/renderer.py
@@ -11,8 +11,8 @@ from config import config, target_rss
 from propertizer import propertize
 
 def date_format(date):
-    dt = dateutil.parser.parse(date)
-    return dt.strftime('%Y/%m/%d %H:%M')
+    #dt = dateutil.parser.parse(date)
+    return date.strftime('%Y/%m/%d %H:%M')
 
 class Renderer(object):
     def __init__(self):