public/Zdalne-systemy-z-kit-uVPN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Mateusz779 2023-04-18 14:21:34 +02:00
parent 7993ca75ea
commit ccb1d4bc19
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
db.py
View File

@ -63,17 +63,17 @@ def add_conf_image(name, token):
""",(name, token,)) """,(name, token,))
conn.commit() conn.commit()
def get_conf(columns, param, value): def get_conf(sql,value):
connect() connect()
with get_cur() as cur: with get_cur() as cur:
cur.execute(f"SELECT {columns} FROM image WHERE {param} = {value}") cur.execute(sql,(value,))
try: try:
return cur.fetchone()[0] return cur.fetchone()[0]
except: except:
return None return None
def get_conf_image(token): def get_conf_image(token):
return get_conf("image_name", "token", token) return get_conf("SELECT image_name FROM image WHERE token = %s", token)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -85,7 +85,7 @@ def get_conf_image(token):
# return None # return None
def get_conf_id(token): def get_conf_id(token):
return get_conf("id", "token", token) return get_conf("SELECT id FROM image WHERE token = %s", token)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -97,7 +97,7 @@ def get_conf_id(token):
# return None # return None
def get_conf_id_name(name): def get_conf_id_name(name):
return get_conf("id", "image_name", name) return get_conf("SELECT id FROM image WHERE image_name = %s", name)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -181,10 +181,10 @@ def get_image_allocation_all():
return None return None
def get_image_allocation(column, param, value): def get_image_allocation(sql, value):
connect() connect()
with get_cur() as cur: with get_cur() as cur:
cur.execute(f"SELECT {column} FROM image_allocation WHERE {param} = {value} ") cur.execute(sql, (value,))
try: try:
return cur.fetchone()[0] return cur.fetchone()[0]
except: except:
@ -198,7 +198,7 @@ def get_image_allocation_time(token):
return get_image_allocation_time_imageid(image_id) return get_image_allocation_time_imageid(image_id)
def get_image_allocation_time_imageid(image_id): def get_image_allocation_time_imageid(image_id):
get_image_allocation("last_access_time", "image_id", image_id) get_image_allocation("SELECT last_access_time FROM image_allocation WHERE image_id = %s", image_id)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -210,7 +210,7 @@ def get_image_allocation_time_imageid(image_id):
# return None # return None
def get_image_allocation_time_id(id): def get_image_allocation_time_id(id):
get_image_allocation("last_access_time", "id", id) get_image_allocation("SELECT last_access_time FROM image_allocation WHERE id = %s", id)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -226,7 +226,7 @@ def get_image_allocation_clientip(token):
if id_image is None: if id_image is None:
return None return None
get_image_allocation("client_ip", "image_id", id_image) get_image_allocation("SELECT last_access_time FROM image_allocation WHERE id = %s", id_image)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -269,12 +269,10 @@ def del_image_allocation_token(token):
return del_image_allocation_id_image(id_image) return del_image_allocation_id_image(id_image)
def del_image_allocation(column, value): def del_image_allocation(sql, value):
connect() connect()
with get_cur() as cur: with get_cur() as cur:
cur.execute(""" cur.execute(sql, (value, ))
DELETE FROM image_allocation WHERE `%s` = %s
""",(column,value, ))
try: try:
conn.commit() conn.commit()
return True return True
@ -282,7 +280,7 @@ def del_image_allocation(column, value):
return None return None
def del_image_allocation_id_image(image_id): def del_image_allocation_id_image(image_id):
return del_image_allocation("image_id", image_id) return del_image_allocation("DELETE FROM image_allocation WHERE image_id = %s", image_id)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""
@ -295,7 +293,7 @@ def del_image_allocation_id_image(image_id):
# return None # return None
def del_image_allocation_id(id): def del_image_allocation_id(id):
return del_image_allocation("id", id) return del_image_allocation("DELETE FROM image_allocation WHERE id = %s", id)
# connect() # connect()
# with get_cur() as cur: # with get_cur() as cur:
# cur.execute(""" # cur.execute("""