Skip to content
Snippets Groups Projects
Commit e2e0e634 authored by Nils G.'s avatar Nils G.
Browse files

Use the 'default' instead of the 'compute' function in model

parent 4ddd55f1
No related branches found
No related tags found
No related merge requests found
...@@ -3,14 +3,14 @@ from hashlib import blake2b ...@@ -3,14 +3,14 @@ from hashlib import blake2b
db.define_table( db.define_table(
'Room', 'Room',
Field('code', 'string', notnull=True, requires=IS_NOT_EMPTY(), writable=False, unique=True), Field('code', 'string', notnull=True, unique=True),
Field('hashcode', 'string', notnull=True, requires=IS_NOT_EMPTY(), writable=False), Field('hashcode', 'string', notnull=True),
Field('player_max', 'integer', notnull=True, requires=IS_NOT_EMPTY()), Field('player_max', 'integer', notnull=True),
Field('creation', 'datetime', default=request.now, notnull=True, requires=IS_NOT_EMPTY()), Field('creation', 'datetime', default=request.now, notnull=True),
Field('heartbeat', 'datetime', default=request.now, notnull=True, requires=IS_NOT_EMPTY()) Field('heartbeat', 'datetime', default=request.now, notnull=True)
) )
def generateRoomCode(_record): def generateRoomCode():
code = None code = None
while not code or db(db.Room.code == code).count() > 0: while not code or db(db.Room.code == code).count() > 0:
...@@ -21,14 +21,11 @@ def generateRoomCode(_record): ...@@ -21,14 +21,11 @@ def generateRoomCode(_record):
return(code) return(code)
def generateHashCode(_record): def generateHashCode():
code = ""
digest = blake2b(digest_size=32) digest = blake2b(digest_size=32)
digest.update(_record.code.encode("utf-8")) digest.update(str(request.now).encode("utf-8"))
digest.update(str(_record.player_max).encode("utf-8"))
digest.update(str(_record.creation).encode("utf-8"))
digest.update(str(random.random()).encode("utf-8")) digest.update(str(random.random()).encode("utf-8"))
return (digest.hexdigest()) return (digest.hexdigest())
db.Room.code.compute = generateRoomCode db.Room.code.default = generateRoomCode
db.Room.hashcode.compute = generateHashCode db.Room.hashcode.default = generateHashCode
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment