small performance improvement, error correction in handling of enclosures

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:

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