mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

db with open

Browse source 
switch to using with open
This commit is contained in:
Brian Martin 2019-06-18 20:18:54 -04:00
parent f2585b0450
commit f0c13dc8e2
1 changed files with 93 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

51
bumper/__init__.py
View file

@ -291,13 +291,17 @@ def user_by_deviceid(deviceid):
def user_full_upsert(user): def user_full_upsert(user):
users = db_get().table("users") opendb = db_get()
with opendb:
users = opendb.table("users")
User = Query() User = Query()
users.upsert(user, User.did == user["userid"]) users.upsert(user, User.did == user["userid"])
def user_add_device(userid, devid): def user_add_device(userid, devid):
users = db_get().table("users") opendb = db_get()
with opendb:
users = opendb.table("users")
User = Query() User = Query()
user = users.get(User.userid == userid) user = users.get(User.userid == userid)
userdevices = list(user["devices"]) userdevices = list(user["devices"])
@ -308,7 +312,9 @@ def user_add_device(userid, devid):
def user_remove_device(userid, devid): def user_remove_device(userid, devid):
users = db_get().table("users") opendb = db_get()
with opendb:
users = opendb.table("users")
User = Query() User = Query()
user = users.get(User.userid == userid) user = users.get(User.userid == userid)
userdevices = list(user["devices"]) userdevices = list(user["devices"])
@ -317,9 +323,10 @@ def user_remove_device(userid, devid):
users.upsert({"devices": userdevices}, User.userid == userid) users.upsert({"devices": userdevices}, User.userid == userid)
def user_add_bot(userid, did): def user_add_bot(userid, did):
users = db_get().table("users") opendb = db_get()
with opendb:
users = opendb.table("users")
User = Query() User = Query()
user = users.get(User.userid == userid) user = users.get(User.userid == userid)
userbots = list(user["bots"]) userbots = list(user["bots"])
@ -328,9 +335,10 @@ def user_add_bot(userid, did):
users.upsert({"bots": userbots}, User.userid == userid) users.upsert({"bots": userbots}, User.userid == userid)
def user_remove_bot(userid, did): def user_remove_bot(userid, did):
users = db_get().table("users") opendb = db_get()
with opendb:
users = opendb.table("users")
User = Query() User = Query()
user = users.get(User.userid == userid) user = users.get(User.userid == userid)
userbots = list(user["bots"]) userbots = list(user["bots"])
@ -339,7 +347,6 @@ def user_remove_bot(userid, did):
users.upsert({"bots": userbots}, User.userid == userid) users.upsert({"bots": userbots}, User.userid == userid)
def user_get_tokens(userid): def user_get_tokens(userid):
tokens = db_get().table("tokens") tokens = db_get().table("tokens")
return tokens.search((Query().userid == userid)) return tokens.search((Query().userid == userid))
@ -351,7 +358,9 @@ def user_get_token(userid, token):
def user_add_token(userid, token): def user_add_token(userid, token):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tmptoken = tokens.get((Query().userid == userid) & (Query().token == token)) tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
if not tmptoken: if not tmptoken:
bumperlog.debug("Adding token {} for userid {}".format(token, userid)) bumperlog.debug("Adding token {} for userid {}".format(token, userid))
@ -365,16 +374,18 @@ def user_add_token(userid, token):
} }
) )
def user_revoke_all_tokens(userid): def user_revoke_all_tokens(userid):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tsearch = tokens.search(Query().userid == userid) tsearch = tokens.search(Query().userid == userid)
for i in tsearch: for i in tsearch:
tokens.remove(doc_ids=[i.doc_id]) tokens.remove(doc_ids=[i.doc_id])
def user_revoke_expired_tokens(userid): def user_revoke_expired_tokens(userid):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tsearch = tokens.search(Query().userid == userid) tsearch = tokens.search(Query().userid == userid)
for i in tsearch: for i in tsearch:
if datetime.now() >= datetime.fromisoformat(i["expiration"]): if datetime.now() >= datetime.fromisoformat(i["expiration"]):
@ -383,14 +394,17 @@ def user_revoke_expired_tokens(userid):
def user_revoke_token(userid, token): def user_revoke_token(userid, token):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tmptoken = tokens.get((Query().userid == userid) & (Query().token == token)) tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
if tmptoken: if tmptoken:
tokens.remove(doc_ids=[tmptoken.doc_id]) tokens.remove(doc_ids=[tmptoken.doc_id])
def user_add_authcode(userid, token, authcode): def user_add_authcode(userid, token, authcode):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tmptoken = tokens.get((Query().userid == userid) & (Query().token == token)) tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
if tmptoken: if tmptoken:
tokens.upsert( tokens.upsert(
@ -398,9 +412,10 @@ def user_add_authcode(userid, token, authcode):
((Query().userid == userid) & (Query().token == token)), ((Query().userid == userid) & (Query().token == token)),
) )
def user_revoke_authcode(userid, token, authcode): def user_revoke_authcode(userid, token, authcode):
tokens = db_get().table("tokens") opendb = db_get()
with opendb:
tokens = opendb.table("tokens")
tmptoken = tokens.get((Query().userid == userid) & (Query().token == token)) tmptoken = tokens.get((Query().userid == userid) & (Query().token == token))
if tmptoken: if tmptoken:
tokens.upsert( tokens.upsert(