From 9d59aa3409fddaf4b2fa98f7a68fceeb285ddefe Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Tue, 7 Sep 2021 13:50:23 +0200
Subject: [PATCH] Move event handlers to a dedicated event directory
---
app/__init__.py | 4 ++--
app/corpora/events.py | 2 +-
app/{socketio_events.py => events/socketio.py} | 12 ++++++------
app/{sqlalchemy_events.py => events/sqlalchemy.py} | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
rename app/{socketio_events.py => events/socketio.py} (92%)
rename app/{sqlalchemy_events.py => events/sqlalchemy.py} (98%)
diff --git a/app/__init__.py b/app/__init__.py
index 8a6b4325..e7a21381 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -32,8 +32,8 @@ def create_app(config_name):
app, message_queue=app.config['NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI'])
with app.app_context():
- from . import socketio_events
- from . import sqlalchemy_events
+ from .events import socketio as socketio_events
+ from .events import sqlalchemy as sqlalchemy_events
from .admin import admin as admin_blueprint
from .auth import auth as auth_blueprint
from .corpora import corpora as corpora_blueprint
diff --git a/app/corpora/events.py b/app/corpora/events.py
index e0a88062..a420993b 100644
--- a/app/corpora/events.py
+++ b/app/corpora/events.py
@@ -5,7 +5,7 @@ from socket import gaierror
from werkzeug.utils import secure_filename
from .. import db, socketio
from ..decorators import socketio_login_required
-from ..socketio_events import socketio_sessions
+from ..events.socketio import sessions as socketio_sessions
from ..models import Corpus
import cqi
import math
diff --git a/app/socketio_events.py b/app/events/socketio.py
similarity index 92%
rename from app/socketio_events.py
rename to app/events/socketio.py
index 614668ad..539680f8 100644
--- a/app/socketio_events.py
+++ b/app/events/socketio.py
@@ -1,9 +1,9 @@
from flask import request
from flask_login import current_user
from flask_socketio import join_room, leave_room
-from . import socketio
-from .decorators import socketio_login_required
-from .models import User
+from .. import socketio
+from ..decorators import socketio_login_required
+from ..models import User
'''
@@ -11,7 +11,7 @@ from .models import User
' of all connected sessions, which can be used to determine the runtimes of
' associated background tasks.
'''
-socketio_sessions = []
+sessions = []
###############################################################################
@@ -24,7 +24,7 @@ def socketio_connect():
' The Socket.IO module creates a session id (sid) for each request.
' On connect the sid is saved in the connected sessions list.
'''
- socketio_sessions.append(request.sid)
+ sessions.append(request.sid)
@socketio.on('disconnect')
@@ -34,7 +34,7 @@ def socketio_disconnect():
' list.
'''
try:
- socketio_sessions.remove(request.sid)
+ sessions.remove(request.sid)
except ValueError:
pass
diff --git a/app/sqlalchemy_events.py b/app/events/sqlalchemy.py
similarity index 98%
rename from app/sqlalchemy_events.py
rename to app/events/sqlalchemy.py
index 54737a52..256b6453 100644
--- a/app/sqlalchemy_events.py
+++ b/app/events/sqlalchemy.py
@@ -1,6 +1,6 @@
from datetime import datetime
-from . import db, socketio
-from .models import Corpus, CorpusFile, Job, JobInput, JobResult
+from .. import db, socketio
+from ..models import Corpus, CorpusFile, Job, JobInput, JobResult
###############################################################################
--
GitLab