From e2e0e634927aa4c591302b2c5ca60b8805201b42 Mon Sep 17 00:00:00 2001
From: Nils G <nils.gondermann@ruhr-uni-bochum.de>
Date: Tue, 7 Apr 2020 15:20:39 +0200
Subject: [PATCH] Use the 'default' instead of the 'compute' function in model
---
models/f_room.py | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/models/f_room.py b/models/f_room.py
index 8b985dc..3b4e794 100644
--- a/models/f_room.py
+++ b/models/f_room.py
@@ -3,14 +3,14 @@ from hashlib import blake2b
db.define_table(
'Room',
- Field('code', 'string', notnull=True, requires=IS_NOT_EMPTY(), writable=False, unique=True),
- Field('hashcode', 'string', notnull=True, requires=IS_NOT_EMPTY(), writable=False),
- Field('player_max', 'integer', notnull=True, requires=IS_NOT_EMPTY()),
- Field('creation', 'datetime', default=request.now, notnull=True, requires=IS_NOT_EMPTY()),
- Field('heartbeat', 'datetime', default=request.now, notnull=True, requires=IS_NOT_EMPTY())
+ Field('code', 'string', notnull=True, unique=True),
+ Field('hashcode', 'string', notnull=True),
+ Field('player_max', 'integer', notnull=True),
+ Field('creation', 'datetime', default=request.now, notnull=True),
+ Field('heartbeat', 'datetime', default=request.now, notnull=True)
)
-def generateRoomCode(_record):
+def generateRoomCode():
code = None
while not code or db(db.Room.code == code).count() > 0:
@@ -21,14 +21,11 @@ def generateRoomCode(_record):
return(code)
-def generateHashCode(_record):
- code = ""
+def generateHashCode():
digest = blake2b(digest_size=32)
- digest.update(_record.code.encode("utf-8"))
- digest.update(str(_record.player_max).encode("utf-8"))
- digest.update(str(_record.creation).encode("utf-8"))
+ digest.update(str(request.now).encode("utf-8"))
digest.update(str(random.random()).encode("utf-8"))
return (digest.hexdigest())
-db.Room.code.compute = generateRoomCode
-db.Room.hashcode.compute = generateHashCode
+db.Room.code.default = generateRoomCode
+db.Room.hashcode.default = generateHashCode
--
GitLab