sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Use list comprehension instead of class methods.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-11-12 12:03:46 +01:00
parent 5602ba950f
commit 19f1dea4fa
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/events.py
View File

@ -73,16 +73,16 @@ def user_ressource_subscription_handler(app, user_id, session_id,
with app.app_context(): with app.app_context():
# Gather current values from database. # Gather current values from database.
user = User.query.filter_by(id=user_id).first() user = User.query.filter_by(id=user_id).first()
corpora = user.corpora_as_dict() corpora = {corpus.id: corpus.to_dict() for corpus in user.corpora}
jobs = user.jobs_as_dict() jobs = {job.id: job.to_dict() for job in user.jobs}
# Send initial values to the user. # Send initial values to the user.
socketio.emit(init_events['corpora'], json.dumps(corpora), socketio.emit(init_events['corpora'], json.dumps(corpora),
room=session_id) room=session_id)
socketio.emit(init_events['jobs'], json.dumps(jobs), room=session_id) socketio.emit(init_events['jobs'], json.dumps(jobs), room=session_id)
while session_id in connected_sessions: while session_id in connected_sessions:
# Get new values from the database # Get new values from the database
new_corpora = user.corpora_as_dict() new_corpora = {corpus.id: corpus.to_dict() for corpus in user.corpora}
new_jobs = user.jobs_as_dict() new_jobs = {job.id: job.to_dict() for job in user.jobs}
# Compute JSON patches. # Compute JSON patches.
corpora_patch = jsonpatch.JsonPatch.from_diff(corpora, new_corpora) corpora_patch = jsonpatch.JsonPatch.from_diff(corpora, new_corpora)
jobs_patch = jsonpatch.JsonPatch.from_diff(jobs, new_jobs) jobs_patch = jsonpatch.JsonPatch.from_diff(jobs, new_jobs)

12
app/models.py
View File

@ -208,18 +208,6 @@ class User(UserMixin, db.Model):
""" """
return self.can(Permission.ADMIN) return self.can(Permission.ADMIN)
def corpora_as_dict(self):
corpora = {}
for corpus in self.corpora:
corpora[str(corpus.id)] = corpus.to_dict()
return corpora
def jobs_as_dict(self):
jobs = {}
for job in self.jobs:
jobs[str(job.id)] = job.to_dict()
return jobs
def delete_user(self): def delete_user(self):
""" """
Delete user from database. Also delete all associated jobs and corpora Delete user from database. Also delete all associated jobs and corpora