aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/runserver.py2
-rw-r--r--src/web/controllers/__init__.py3
-rw-r--r--src/web/controllers/bookmark.py20
-rw-r--r--src/web/models/__init__.py8
-rw-r--r--src/web/models/article.py10
-rw-r--r--src/web/models/bookmark.py75
-rw-r--r--src/web/models/tag.py30
-rw-r--r--src/web/models/user.py4
-rw-r--r--src/web/views/__init__.py3
-rw-r--r--src/web/views/bookmark.py80
10 files changed, 15 insertions, 220 deletions
diff --git a/src/runserver.py b/src/runserver.py
index ff4fe444..1099b483 100755
--- a/src/runserver.py
+++ b/src/runserver.py
@@ -56,8 +56,6 @@ with application.app_context():
application.register_blueprint(views.admin_bp)
application.register_blueprint(views.users_bp)
application.register_blueprint(views.user_bp)
- application.register_blueprint(views.bookmarks_bp)
- application.register_blueprint(views.bookmark_bp)
if __name__ == '__main__':
diff --git a/src/web/controllers/__init__.py b/src/web/controllers/__init__.py
index dd497e9a..a1b89ea8 100644
--- a/src/web/controllers/__init__.py
+++ b/src/web/controllers/__init__.py
@@ -3,8 +3,7 @@ from .category import CategoryController
from .article import ArticleController
from .user import UserController
from .icon import IconController
-from .bookmark import BookmarkController
__all__ = ['FeedController', 'CategoryController', 'ArticleController',
- 'UserController', 'IconController', 'BookmarkController']
+ 'UserController', 'IconController']
diff --git a/src/web/controllers/bookmark.py b/src/web/controllers/bookmark.py
deleted file mode 100644
index f7dab9d8..00000000
--- a/src/web/controllers/bookmark.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import logging
-import itertools
-from datetime import datetime, timedelta
-
-from bootstrap import db
-from .abstract import AbstractController
-from web.models import Bookmark
-
-logger = logging.getLogger(__name__)
-
-
-class BookmarkController(AbstractController):
- _db_cls = Bookmark
-
- def count_by_href(self, **filters):
- return self._count_by(Bookmark.href, filters)
-
- def update(self, filters, attrs, *args, **kwargs):
- #self.tag_objs = attrs['tags']
- return super().update(filters, attrs, *args, **kwargs)
diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py
index 229a99e5..1fc0c3e0 100644
--- a/src/web/models/__init__.py
+++ b/src/web/models/__init__.py
@@ -32,13 +32,9 @@ from .user import User
from .article import Article
from .icon import Icon
from .category import Category
-#from .tag import Tag
-from .tag import BookmarkTag
-from .tag import ArticleTag
-from .bookmark import Bookmark
+from .tag import Tag
-__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag',
- 'Bookmark', 'ArticleTag', 'BookmarkTag']
+__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag']
import os
diff --git a/src/web/models/article.py b/src/web/models/article.py
index 6245b10e..87ad1a9a 100644
--- a/src/web/models/article.py
+++ b/src/web/models/article.py
@@ -34,8 +34,6 @@ from sqlalchemy.ext.associationproxy import association_proxy
from web.models.right_mixin import RightMixin
-
-
class Article(db.Model, RightMixin):
"Represent an article from a feed."
id = db.Column(db.Integer(), primary_key=True)
@@ -54,10 +52,10 @@ class Article(db.Model, RightMixin):
category_id = db.Column(db.Integer(), db.ForeignKey('category.id'))
# relationships
- tag_objs = db.relationship('ArticleTag', back_populates='article',
- cascade='all,delete-orphan',
- lazy=False,
- foreign_keys='[ArticleTag.article_id]')
+ tag_objs = db.relationship('Tag', back_populates='article',
+ cascade='all,delete-orphan',
+ lazy=False,
+ foreign_keys='[Tag.article_id]')
tags = association_proxy('tag_objs', 'text')
# index
diff --git a/src/web/models/bookmark.py b/src/web/models/bookmark.py
deleted file mode 100644
index 6101a5f0..00000000
--- a/src/web/models/bookmark.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /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.orm import validates
-from sqlalchemy.ext.associationproxy import association_proxy
-
-from web.models.right_mixin import RightMixin
-
-
-bookmarktags_table = db.Table('bookmarktags', db.metadata,
- db.Column('bookmark_id', db.Integer, db.ForeignKey("bookmark.id"),
- primary_key=True),
- db.Column('tag_text', db.String, db.ForeignKey("BookmarkTag.text"),
- primary_key=True)
-)
-
-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
- tag_objs = db.relationship("BookmarkTag", secondary=lambda: bookmarktags_table)
- # tag_objs = db.relationship('BookmarkTag', back_populates='bookmark',
- # cascade='all,delete-orphan',
- # lazy=False,
- # foreign_keys='[BookmarkTag.bookmark_id]')
- tags = association_proxy('tag_objs', '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 c23d15ea..8d7fe4d4 100644
--- a/src/web/models/tag.py
+++ b/src/web/models/tag.py
@@ -1,38 +1,22 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
+from sqlalchemy import Column, ForeignKey, Integer, String
+from sqlalchemy.orm import relationship
+
from bootstrap import db
-class ArticleTag(db.Model):
- text = db.Column(db.String, primary_key=True, unique=False)
+class Tag(db.Model):
+ text = Column(String, primary_key=True, unique=False)
# foreign keys
- article_id = db.Column(db.Integer, db.ForeignKey('article.id', ondelete='CASCADE'),
+ article_id = Column(Integer, ForeignKey('article.id', ondelete='CASCADE'),
primary_key=True)
# relationships
- article = db.relationship('Article', back_populates='tag_objs',
+ article = relationship('Article', back_populates='tag_objs',
foreign_keys=[article_id])
def __init__(self, text):
self.text = text
-
-
-class BookmarkTag(db.Model):
- __tablename__ = 'BookmarkTag'
- #id = db.Column(db.Integer, primary_key=True)
- text = db.Column(db.String, primary_key=True)
-
- # foreign keys
- # bookmark_id = db.Column(db.Integer, db.ForeignKey('bookmark.id', ondelete='CASCADE'),
- # primary_key=True)
-
- # relationships
- # bookmark = db.relationship('Bookmark', back_populates='tag_objs',
- # single_parent=True,
- # cascade="all, delete-orphan",
- # foreign_keys=[bookmark_id])
-
- def __init__(self, text):
- self.text = text
diff --git a/src/web/models/user.py b/src/web/models/user.py
index d2b3c52a..460958e0 100644
--- a/src/web/models/user.py
+++ b/src/web/models/user.py
@@ -38,7 +38,6 @@ from bootstrap import db
from web.models.right_mixin import RightMixin
from web.models.category import Category
from web.models.feed import Feed
-from web.models.bookmark import Bookmark
class User(db.Model, UserMixin, RightMixin):
@@ -72,9 +71,6 @@ class User(db.Model, UserMixin, RightMixin):
feeds = db.relationship('Feed', backref='user',
cascade='all, delete-orphan',
foreign_keys=[Feed.user_id])
- bookmarks = db.relationship('Bookmark', backref='user',
- cascade='all, delete-orphan',
- foreign_keys=[Bookmark.user_id])
@staticmethod
def _fields_base_write():
diff --git a/src/web/views/__init__.py b/src/web/views/__init__.py
index 41bb52f3..e0e49927 100644
--- a/src/web/views/__init__.py
+++ b/src/web/views/__init__.py
@@ -6,12 +6,11 @@ from web.views.category import category_bp, categories_bp
from web.views.icon import icon_bp
from web.views.admin import admin_bp
from web.views.user import user_bp, users_bp
-from web.views.bookmark import bookmark_bp, bookmarks_bp
__all__ = ['views', 'home', 'session_mgmt', 'v2', 'v3',
'article_bp', 'articles_bp', 'feed_bp', 'feeds_bp',
'category_bp', 'categories_bp', 'icon_bp',
- 'admin_bp', 'user_bp', 'users_bp', 'bookmark_bp', 'bookmarks_bp']
+ 'admin_bp', 'user_bp', 'users_bp']
import conf
from flask import request
diff --git a/src/web/views/bookmark.py b/src/web/views/bookmark.py
deleted file mode 100644
index c2fdc597..00000000
--- a/src/web/views/bookmark.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import logging
-from werkzeug.exceptions import BadRequest
-
-from flask import Blueprint, render_template, flash, \
- redirect, request, url_for
-from flask_babel import gettext
-from flask_login import login_required, current_user
-
-import conf
-from bootstrap import db
-from web.forms import BookmarkForm
-from web.controllers import BookmarkController
-from web.models.tag import BookmarkTag
-
-logger = logging.getLogger(__name__)
-bookmarks_bp = Blueprint('bookmarks', __name__, url_prefix='/bookmarks')
-bookmark_bp = Blueprint('bookmark', __name__, url_prefix='/bookmark')
-
-
-@bookmarks_bp.route('/', methods=['GET'])
-@login_required
-def list():
- "Lists the bookmarks."
- bookmark_contr = BookmarkController(current_user.id)
- return render_template('bookmarks.html',
- bookmarks=BookmarkController(current_user.id).read().order_by('time'))
-
-
-@bookmark_bp.route('/create', methods=['GET'])
-@bookmark_bp.route('/edit/<int:bookmark_id>', methods=['GET'])
-@login_required
-def form(bookmark_id=None):
- action = gettext("Add a bookmark")
- head_titles = [action]
- if bookmark_id is None:
- return render_template('edit_bookmark.html', action=action,
- head_titles=head_titles, form=BookmarkForm())
- bookmark = BookmarkController(current_user.id).get(id=bookmark_id)
- action = gettext('Edit bookmark')
- head_titles = [action]
- form = BookmarkForm(obj=bookmark)
- form.tags.data = bookmark.tags
- return render_template('edit_bookmark.html', action=action,
- head_titles=head_titles, bookmark=bookmark,
- form=form)
-
-
-@bookmark_bp.route('/create', methods=['POST'])
-@bookmark_bp.route('/edit/<int:bookmark_id>', methods=['POST'])
-@login_required
-def process_form(bookmark_id=None):
- form = BookmarkForm()
- bookmark_contr = BookmarkController(current_user.id)
-
- if not form.validate():
- return render_template('edit_bookmark.html', form=form)
-
- # Edit an existing bookmark
- bookmark_attr = {'href': form.href.data,
- 'description': form.description.data,
- 'title': form.title.data,
- 'tags': [tag.strip() for tag in form.tags.data.split(',')],
- 'shared': form.shared.data,
- 'to_read': form.to_read.data}
-
- if bookmark_id is not None:
- # bookmark = BookmarkController(current_user.id).get(id=bookmark_id)
- # form.populate_obj(bookmark)
- # bookmark.tags = [tag.strip() for tag in form.tags.data.split(',')],
- # db.session.commit()
- bookmark_contr.update({'id': bookmark_id}, bookmark_attr)
- flash(gettext('Bookmark successfully updated.'), 'success')
- return redirect(url_for('bookmark.form', bookmark_id=bookmark_id))
-
- # Create a new bookmark
- new_bookmark = bookmark_contr.create(**bookmark_attr)
-
- flash(gettext('Bookmark successfully created.'), 'success')
-
- return redirect(url_for('bookmark.form', bookmark_id=new_bookmark.id))
bgstack15