sqlalchemy was requesting icons everytime feed where listed

so i choosed to move the icons into their own table

3 files changed, 13 insertions, 5 deletions

diff --git a/pyaggr3g470r/models/__init__.py b/pyaggr3g470r/models/__init__.py
index ba52b0de..b578094c 100644
--- a/pyaggr3g470r/models/__init__.py
+++ b/pyaggr3g470r/models/__init__.py
@@ -30,8 +30,9 @@ from .feed import Feed
 from .role import Role
 from .user import User
 from .article import Article
+from .icon import Icon
 
-__all__ = ['Feed', 'Role', 'User', 'Article']
+__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon']
 
 import os
 
diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py
index 75e55df1..07b0fc99 100644
--- a/pyaggr3g470r/models/feed.py
+++ b/pyaggr3g470r/models/feed.py
@@ -35,7 +35,7 @@ class Feed(db.Model):
     """
     Represent a feed.
     """
-    id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer(), primary_key=True)
     title = db.Column(db.String(), default="")
     description = db.Column(db.String(), default="FR")
     link = db.Column(db.String())
@@ -43,7 +43,6 @@ class Feed(db.Model):
     enabled = db.Column(db.Boolean(), default=True)
     created_date = db.Column(db.DateTime(), default=datetime.now)
     filters = db.Column(db.PickleType, default=[])
-    icon = db.Column(db.String(), default="")
 
     # cache handling
     etag = db.Column(db.String(), default="")
@@ -55,7 +54,8 @@ class Feed(db.Model):
     error_count = db.Column(db.Integer(), default=0)
 
     # relationship
-    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    icon_url = db.Column(db.String(), db.ForeignKey('icon.url'), default=None)
+    user_id = db.Column(db.Integer(), db.ForeignKey('user.id'))
     articles = db.relationship('Article', backref='source', lazy='dynamic',
                                cascade='all,delete-orphan',
                                order_by=desc("Article.date"))
@@ -71,7 +71,7 @@ class Feed(db.Model):
                 "link": self.link,
                 "site_link": self.site_link,
                 "etag": self.etag,
-                "icon": self.icon,
+                "icon_url": self.icon_url,
                 "error_count": self.error_count,
                 "last_modified": self.last_modified,
                 "last_retrieved": self.last_retrieved}
diff --git a/pyaggr3g470r/models/icon.py b/pyaggr3g470r/models/icon.py
new file mode 100644
index 00000000..22ef1164
--- /dev/null
+++ b/pyaggr3g470r/models/icon.py
@@ -0,0 +1,7 @@
+from bootstrap import db
+
+
+class Icon(db.Model):
+    url = db.Column(db.String(), primary_key=True)
+    content = db.Column(db.String(), default=None)
+    mimetype = db.Column(db.String(), default="application/image")