From 111f15b176433968b5663d7b9138d4b967fa3549 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 6 Mar 2015 14:37:42 +0100 Subject: Simplified manager.py. --- pyaggr3g470r/models/__init__.py | 68 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) (limited to 'pyaggr3g470r/models') diff --git a/pyaggr3g470r/models/__init__.py b/pyaggr3g470r/models/__init__.py index 9584d1f2..42903f4e 100644 --- a/pyaggr3g470r/models/__init__.py +++ b/pyaggr3g470r/models/__init__.py @@ -31,5 +31,71 @@ from .role import Role from .user import User from .article import Article - __all__ = ['Feed', 'Role', 'User', 'Article'] + +import os + +from werkzeug import generate_password_hash + +from sqlalchemy.engine import reflection +from sqlalchemy.schema import ( + MetaData, + Table, + DropTable, + ForeignKeyConstraint, + DropConstraint) + +def db_empty(db): + "Will drop every datas stocked in db." + # From http://www.sqlalchemy.org/trac/wiki/UsageRecipes/DropEverything + conn = db.engine.connect() + + # the transaction only applies if the DB supports + # transactional DDL, i.e. Postgresql, MS SQL Server + trans = conn.begin() + + inspector = reflection.Inspector.from_engine(db.engine) + + # gather all data first before dropping anything. + # some DBs lock after things have been dropped in + # a transaction. + metadata = MetaData() + + tbs = [] + all_fks = [] + + for table_name in inspector.get_table_names(): + fks = [] + for fk in inspector.get_foreign_keys(table_name): + if not fk['name']: + continue + fks.append(ForeignKeyConstraint((), (), name=fk['name'])) + t = Table(table_name, metadata, *fks) + tbs.append(t) + all_fks.extend(fks) + + for fkc in all_fks: + conn.execute(DropConstraint(fkc)) + + for table in tbs: + conn.execute(DropTable(table)) + + trans.commit() + +def db_create(db): + "Will create the database from conf parameters." + db.create_all() + + role_admin = Role(name="admin") + role_user = Role(name="user") + + user1 = User(nickname="admin", + email=os.environ.get("ADMIN_EMAIL", + "root@pyAggr3g470r.localhost"), + pwdhash=generate_password_hash( + os.environ.get("ADMIN_PASSWORD", "password")), + activation_key="") + user1.roles.extend([role_admin, role_user]) + + db.session.add(user1) + db.session.commit() \ No newline at end of file -- cgit From 7a3c694e4b62ea73df023fe8a675896bd70ce1e5 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 9 Mar 2015 13:35:33 +0100 Subject: Bug fix. --- pyaggr3g470r/models/feed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/models') diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py index 24542c28..9002aec3 100644 --- a/pyaggr3g470r/models/feed.py +++ b/pyaggr3g470r/models/feed.py @@ -47,7 +47,7 @@ class Feed(db.Model): # cache handling etag = db.Column(db.String(), default="") - last_modified = db.Column(db.String(), default="") + last_modified = db.Column(db.DateTime(), default=datetime.now) last_retrieved = db.Column(db.DateTime(), default=datetime(1970, 1, 1)) # error logging -- cgit From 427525eda2c227e4b25c11db9fd4f38f9efac54e Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 9 Mar 2015 13:36:35 +0100 Subject: Typo.* --- pyaggr3g470r/models/feed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/models') diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py index 9002aec3..c80f302c 100644 --- a/pyaggr3g470r/models/feed.py +++ b/pyaggr3g470r/models/feed.py @@ -35,7 +35,7 @@ db = g.db class Feed(db.Model): """ - Represent a station. + Represent a feed. """ id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String(), default="No title") -- cgit From 6217315aae1392bc6c2e1881ba8e763def40969a Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 10 Mar 2015 14:28:47 +0100 Subject: changed the type of the column 'last_modified' to string. --- pyaggr3g470r/models/feed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/models') diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py index c80f302c..ccc8094f 100644 --- a/pyaggr3g470r/models/feed.py +++ b/pyaggr3g470r/models/feed.py @@ -47,7 +47,7 @@ class Feed(db.Model): # cache handling etag = db.Column(db.String(), default="") - last_modified = db.Column(db.DateTime(), default=datetime.now) + last_modified = db.Column(db.String(), default="") last_retrieved = db.Column(db.DateTime(), default=datetime(1970, 1, 1)) # error logging -- cgit From 341008ac376479468d68bb2fb1c9ce0cd82b10e8 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 28 Mar 2015 14:37:23 +0100 Subject: Clean the file utils.py --- pyaggr3g470r/models/article.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyaggr3g470r/models') diff --git a/pyaggr3g470r/models/article.py b/pyaggr3g470r/models/article.py index 0466bc35..f026984a 100644 --- a/pyaggr3g470r/models/article.py +++ b/pyaggr3g470r/models/article.py @@ -4,7 +4,7 @@ # pyAggr3g470r - A Web based news aggregator. # Copyright (C) 2010-2015 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://bitbucket.org/cedricbonhomme/pyaggr3g470r/ +# For more information : https://bitbucket.org/cedricbonhomme/pyaggr3g470r # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as -- cgit