refactoring of data model

models/feed.py

@@ -2,9 +2,11 @@
 #coding: utf-8
 
 from sqlalchemy import Column, Integer, String, Boolean, Enum
+from sqlalchemy.orm import relationship, backref
 
 from models import Base
 
+
 class Feed(Base):
     __tablename__ = 'feed'
 
@@ -19,6 +21,8 @@ class Feed(Base):
     html2textcontent = Column(Boolean)
     html2textignoreimages = Column(Boolean)
     enabled = Column(Boolean)
+    entries = relationship("Entry", backref=backref('feed'), cascade='all, delete, delete-orphan')
+    feedinfo = relationship("Feedinfo", backref=backref('feed'), cascade='all, delete, delete-orphan', uselist=False)
 
     def __init__(self, url, daily, readability, fullpage, enabled, html2textcontent):
         self.url = url
@@ -36,7 +40,7 @@ class Feed(Base):
         else:
             title = '<unknown>'
             last = '<never>'
-        entries = len(self.entry)
+        entries = len(self.entries)
         url = self.url
         return u'%3d %s (%d entries, last fetched %s)\n    %s' % (id, title, entries, last, url)
 
@@ -45,3 +49,7 @@ class Feed(Base):
 
     def __repr__(self):
         return "<Feed('%d','%s')>" % (self.id, self.url)
+
+    def reset(self):
+        self.entries[:] = []
+        self.feedinfo = None