From 777b8de0e3bbbd858a11e65a073bfe61802907f6 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Mon, 8 Apr 2013 21:19:29 +0200 Subject: [PATCH] small performance improvement, error correction in handling of enclosures --- atomstrom.py | 8 ++------ models/entry.py | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/atomstrom.py b/atomstrom.py index 349d613..d825e9d 100755 --- a/atomstrom.py +++ b/atomstrom.py @@ -124,13 +124,9 @@ def process_feed_entry(session, feed, entry): return 1 def fetch_single_feed(session, feed): - print 'processing %s' % feed.url - thisfeedinfo = session.query(Feedinfo).\ - filter(Feedinfo.feed_id==feed.id).\ - first() + print 'processing %d: %s' % (feed.id, feed.url) fetched = False - if thisfeedinfo: - feed.feedinfo = thisfeedinfo + if feed.feedinfo: if (not feed.feedinfo.nextfetch) or (feed.feedinfo.nextfetch < datetime.now()): print 'feed known, fetching...' try: diff --git a/models/entry.py b/models/entry.py index e328d15..ce56125 100644 --- a/models/entry.py +++ b/models/entry.py @@ -69,11 +69,11 @@ class Entry(Base): if entry.has_key('enclosures') and len(entry.get('enclosures')) > 0: enclosures = '' for enclosure in entry.get('enclosures'): - url = enclosure['href'] - length = size_human_readable(int(enclosure['length'])) if not enclosures == '': enclosures += '\n' - enclosures += '%s (%s)' % (url, length) + enclosures += enclosure['href'] + if enclosure.has_key('length'): + enclosures += ' (%s)' % size_human_readable(int(enclosure['length'])) self.enclosures = enclosures if feed.resolveredirects: print ' fetching final link <%s>' % entry.link