Updated db module.
This commit is contained in:
@@ -22,17 +22,20 @@ def get_user_db(username: str, db: ZODB.DB) -> dict:
|
|||||||
else:
|
else:
|
||||||
o.data = base64.b64encode(o.data.encode()).decode()
|
o.data = base64.b64encode(o.data.encode()).decode()
|
||||||
udb['objects'][o] = db_conn.root.objects[o].to_dict()
|
udb['objects'][o] = db_conn.root.objects[o].to_dict()
|
||||||
for m in db_conn.root.messages[username]:
|
if user in db_conn.root.messages:
|
||||||
for a in m.attachments:
|
for m in db_conn.root.messages[username]:
|
||||||
if type(a.data) is bytes:
|
for a in m.attachments:
|
||||||
a.data = base64.b64encode(a.data).decode()
|
if type(a.data) is bytes:
|
||||||
else:
|
a.data = base64.b64encode(a.data).decode()
|
||||||
a.data = base64.b64encode(a.data.encode()).decode()
|
else:
|
||||||
udb['messages'].append(m.to_dict())
|
a.data = base64.b64encode(a.data.encode()).decode()
|
||||||
|
udb['messages'].append(m.to_dict())
|
||||||
for b in db_conn.root.bulletins:
|
for b in db_conn.root.bulletins:
|
||||||
udb['bulletins'].append(b.to_dict())
|
udb['bulletins'].append(b.to_dict())
|
||||||
|
|
||||||
# TODO pack jobs into output
|
if username in db_conn.root.user_jobs:
|
||||||
|
for jid in db_conn.root.user_jobs[username]:
|
||||||
|
udb['jobs'].append(db_conn.root.jobs[jid].to_dict(binary_safe=True))
|
||||||
|
|
||||||
return udb
|
return udb
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user