Fixed conflicts.

2 files changed, 91 insertions, 8 deletions

diff --git a/src/web/models/bookmark.py b/src/web/models/bookmark.py
new file mode 100644
index 00000000..6eee3cba
--- /dev/null
+++ b/src/web/models/bookmark.py
@@ -0,0 +1,68 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Newspipe - A Web based news aggregator.
+# Copyright (C) 2010-2016  Cédric Bonhomme - https://www.cedricbonhomme.org
+#
+# For more information : https://github.com/newspipe/newspipe
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+__author__ = "Cedric Bonhomme"
+__version__ = "$Revision: 0.1 $"
+__date__ = "$Date: 2016/12/07 $"
+__revision__ = "$Date: 2016/12/07 $"
+__copyright__ = "Copyright (c) Cedric Bonhomme"
+__license__ = "GPLv3"
+
+from bootstrap import db
+from datetime import datetime
+from sqlalchemy import desc
+from sqlalchemy.orm import validates
+from sqlalchemy.ext.associationproxy import association_proxy
+
+from web.models.tag import BookmarkTag
+from web.models.right_mixin import RightMixin
+
+
+class Bookmark(db.Model, RightMixin):
+    """
+    Represent a bookmark.
+    """
+    id = db.Column(db.Integer(), primary_key=True)
+    href = db.Column(db.String(), default="")
+    title = db.Column(db.String(), default="")
+    description = db.Column(db.String(), default="FR")
+    shared = db.Column(db.Boolean(), default=False)
+    to_read = db.Column(db.Boolean(), default=False)
+    time = db.Column(db.DateTime(), default=datetime.utcnow)
+    user_id = db.Column(db.Integer(), db.ForeignKey('user.id'))
+
+    # relationships
+    tags = db.relationship(BookmarkTag, backref='of_bookmark', lazy='dynamic',
+                               cascade='all,delete-orphan',
+                               order_by=desc(BookmarkTag.text))
+    tags_proxy = association_proxy('tags', 'text')
+
+
+    @validates('description')
+    def validates_title(self, key, value):
+        return str(value).strip()
+
+    @validates('extended')
+    def validates_description(self, key, value):
+        return str(value).strip()
+
+    def __repr__(self):
+        return '<Bookmark %r>' % (self.href)
diff --git a/src/web/models/tag.py b/src/web/models/tag.py
index 8d7fe4d4..ab901cda 100644
--- a/src/web/models/tag.py
+++ b/src/web/models/tag.py
@@ -1,22 +1,37 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from sqlalchemy import Column, ForeignKey, Integer, String
-from sqlalchemy.orm import relationship
-
 from bootstrap import db
 
 
-class Tag(db.Model):
-    text = Column(String, primary_key=True, unique=False)
+class ArticleTag(db.Model):
+    text = db.Column(db.String, primary_key=True, unique=False)
+    # user_id = db.Column(db.Integer(), db.ForeignKey('user.id'))
 
     # foreign keys
-    article_id = Column(Integer, ForeignKey('article.id', ondelete='CASCADE'),
+    article_id = db.Column(db.Integer, db.ForeignKey('article.id', ondelete='CASCADE'),
                         primary_key=True)
 
     # relationships
-    article = relationship('Article', back_populates='tag_objs',
-                           foreign_keys=[article_id])
+    article = db.relationship('Article', back_populates='tag_objs',
+                                                    foreign_keys=[article_id])
 
     def __init__(self, text):
         self.text = text
+
+
+class BookmarkTag(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    text = db.Column(db.String, unique=False)
+
+    # foreign keys
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    bookmark_id = db.Column(db.Integer, db.ForeignKey('bookmark.id', ondelete='CASCADE'))
+
+    # relationships
+    bookmark = db.relationship('Bookmark', back_populates='tags',
+                            cascade="all,delete", foreign_keys=[bookmark_id])
+
+    # def __init__(self, text, user_id):
+    #     self.text = text
+    #     self.user_id = user_id