Implement update_wrmapcache functionality from GUI.

[philipp/winterrodeln/wradmin.git] / wradmin / __init__.py

diff --git a/wradmin/__init__.py b/wradmin/__init__.py
index 780492872d8c54aa44ac2a640982b6da32a1328d..c80fc17d6d08371e62d04ecad9d5c842263cc5f5 100644 (file)
--- a/wradmin/__init__.py
+++ b/wradmin/__init__.py
@@ -1,100 +1,90 @@
-# http://flask.pocoo.org/
-# FLASK_APP=wradmin FLASK_DEBUG=1 WRADMIN_SETTINGS=development.cfg python3 -m flask run
-# FLASK_APP=wradmin WRADMIN_SETTINGS=production.cfg python3 -m flask run
-from flask import Flask, send_from_directory, abort, g
+from flask import Flask, send_from_directory, abort, g, render_template, request, redirect, url_for, flash

 from sqlalchemy.engine import create_engine
 import wradmin.model
 from sqlalchemy.engine import create_engine
 import wradmin.model

-from wradmin.genshi import render_genshi_template
+import wradmin.template_helper

 from wradmin.controllers.rodelbahn import RodelbahnController
 from wradmin.controllers.gasthaus import GasthausController
 from wradmin.controllers.bericht import BerichtController
 from wradmin.controllers.coordtool import CoordtoolController
 from wradmin.controllers.rodelbahn import RodelbahnController
 from wradmin.controllers.gasthaus import GasthausController
 from wradmin.controllers.bericht import BerichtController
 from wradmin.controllers.coordtool import CoordtoolController

+from wradmin.auth import password_is_correct
+from wradmin.auth.forms import LoginForm
+from flask_login import LoginManager, current_user, login_required, login_user, logout_user

 
 
 app = Flask(__name__)
 app.config.from_envvar('WRADMIN_SETTINGS')
 
 
 app = Flask(__name__)
 app.config.from_envvar('WRADMIN_SETTINGS')

+wradmin.model.init_model(create_engine(app.config['DATABASE_URI']))
+app.jinja_env.globals.update(h=wradmin.template_helper.PylonsHelper())
+login_manager = LoginManager(app)
+login_manager.login_view = "login"

 
 
 
 

-def get_db():
-    """Opens a new database connection if there is none yet for the
-    current application context.
-    """
-    if not hasattr(g, 'db'):
-        g.db_engine = create_engine(app.config['DATABASE_URI'])
-        wradmin.model.init_model(g.db_engine)
-        g.db = g.db_engine.connect()
-    return g.db
+@app.before_request
+def _before_request():
+    g.user = current_user

 
 
 @app.teardown_appcontext
 
 
 @app.teardown_appcontext

-def close_db(error):
-    """Closes the database again at the end of the request."""
-    if hasattr(g, 'db'):
-        g.db.close()
+def remove_db_session(error):
+    """Removes the database session at the end of the request."""
+    wradmin.model.meta.Session.remove()

 
 
 @app.route("/")
 def index():
 
 
 @app.route("/")
 def index():

-    return render_genshi_template('index.html')
+    return render_template('index.html')

 
 
 @app.route("/rodelbahn/list")
 def rodelbahn_list():
 
 
 @app.route("/rodelbahn/list")
 def rodelbahn_list():

-    get_db()

     return RodelbahnController().list()
 
 
 @app.route("/rodelbahn/view/<int:id>")
 def rodelbahn_view(id):
     return RodelbahnController().list()
 
 
 @app.route("/rodelbahn/view/<int:id>")
 def rodelbahn_view(id):

-    get_db()

     return RodelbahnController().view(id)
 
 
 @app.route("/rodelbahn/update")
 def rodelbahn_update():
     return RodelbahnController().view(id)
 
 
 @app.route("/rodelbahn/update")
 def rodelbahn_update():

-    get_db()

     return RodelbahnController().update()
 
 
 @app.route("/rodelbahn/update_regioncache")
 def rodelbahn_update_regioncache():
     return RodelbahnController().update()
 
 
 @app.route("/rodelbahn/update_regioncache")
 def rodelbahn_update_regioncache():

-    get_db()

     return RodelbahnController().update_regioncache()
 
     return RodelbahnController().update_regioncache()
 

+@app.route("/rodelbahn/update_mapcache")
+def rodelbahn_update_mapcache():
+    return RodelbahnController().update_mapcache()

 
 @app.route("/bericht/list")
 def bericht_list():
 
 @app.route("/bericht/list")
 def bericht_list():

-    get_db()

     return BerichtController().list()
 
 
 @app.route("/bericht/view/<int:id>")
 def bericht_view(id):
     return BerichtController().list()
 
 
 @app.route("/bericht/view/<int:id>")
 def bericht_view(id):

-    get_db()

     return BerichtController().view(id)
 
 
 @app.route("/bericht/change_date_invalid/<int:id>", methods=['POST'])
 def bericht_change_date_invalid(id):
     return BerichtController().view(id)
 
 
 @app.route("/bericht/change_date_invalid/<int:id>", methods=['POST'])
 def bericht_change_date_invalid(id):

-    get_db()
-    return BerichtController().view(id)
+    return BerichtController().change_date_invalid(id)

 
 
 @app.route("/gasthaus/list")
 def gasthaus_list():
 
 
 @app.route("/gasthaus/list")
 def gasthaus_list():

-    get_db()

     return GasthausController().list()
 
 
 @app.route("/gasthaus/view/<int:id>")
 def gasthaus_view(id):
     return GasthausController().list()
 
 
 @app.route("/gasthaus/view/<int:id>")
 def gasthaus_view(id):

-    get_db()

     return GasthausController().view(id)
 
 
 @app.route("/gasthaus/update")
 def gasthaus_update():
     return GasthausController().view(id)
 
 
 @app.route("/gasthaus/update")
 def gasthaus_update():

-    get_db()

     return GasthausController().update()
 
 
     return GasthausController().update()
 
 


@@ -106,3 +96,31 @@ def coordtool_index():
 @app.route("/coordtool/convert", methods=['POST'])
 def coordtool_convert():
     return CoordtoolController().convert()
 @app.route("/coordtool/convert", methods=['POST'])
 def coordtool_convert():
     return CoordtoolController().convert()

+
+
+@app.route("/login", methods=['GET', 'POST'])
+def login():
+    form = LoginForm()
+    if form.validate_on_submit():
+        user = wradmin.model.meta.Session.query(wradmin.model.MwUser).filter_by(user_name=form.user_name.data).first()
+        if user is not None and password_is_correct(form.password.data, user.user_password.decode()):
+            login_user(user, form.remember_me.data)
+            next = request.args.get('next')
+            if next is None or not next.startswith('/'):
+                next = url_for('index')
+            flash('Sie sind nun angemeldet.')
+            return redirect(next)
+        flash('Ungülter Benutzername oder ungültiges Passwort.')
+    return render_template('auth/login.html', form=form)
+
+
+@app.route("/logout")
+def logout():
+    logout_user()
+    flash('Sie wurden ausgeloggt.')
+    return redirect(url_for('index'))
+
+
+@login_manager.user_loader
+def user_loader(user_id):
+    return wradmin.model.meta.Session.query(wradmin.model.MwUser).get(user_id)