tubearchivist
/
tubearchivist
mirror of https://github.com/tubearchivist/tubearchivist.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor, use decode_responses in base class

This commit is contained in:
Simon 2023-12-16 17:39:09 +07:00
parent e75ffb603c
commit 8870782a6e
No known key found for this signature in database
GPG Key ID: 2C15AA5E89985DD4
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tubearchivist/home/src/ta/ta_redis.py
View File

@ -20,6 +20,7 @@ class RedisBase:
self.conn = redis.Redis( self.conn = redis.Redis(
host=EnvironmentSettings.REDIS_HOST, host=EnvironmentSettings.REDIS_HOST,
port=EnvironmentSettings.REDIS_PORT, port=EnvironmentSettings.REDIS_PORT,
decode_responses=True,
) )
@ -82,7 +83,7 @@ class RedisArchivist(RedisBase):
if not reply: if not reply:
return [] return []
return [i.decode().lstrip(self.NAME_SPACE) for i in reply] return [i.lstrip(self.NAME_SPACE) for i in reply]
def list_items(self, query: str) -> list: def list_items(self, query: str) -> list:
"""list all matches""" """list all matches"""
@ -108,8 +109,7 @@ class RedisQueue(RedisBase):
def get_all(self): def get_all(self):
"""return all elements in list""" """return all elements in list"""
result = self.conn.execute_command("LRANGE", self.key, 0, -1) result = self.conn.execute_command("LRANGE", self.key, 0, -1)
all_elements = [i.decode() for i in result] return result
return all_elements
def length(self) -> int: def length(self) -> int:
"""return total elements in list""" """return total elements in list"""
@ -136,11 +136,8 @@ class RedisQueue(RedisBase):
def get_next(self) -> str | bool: def get_next(self) -> str | bool:
"""return next element in the queue, False if none""" """return next element in the queue, False if none"""
result = self.conn.execute_command("LPOP", self.key) result = self.conn.execute_command("LPOP", self.key)
if not result:
return False
next_element = result.decode() return result
return next_element
def clear(self) -> None: def clear(self) -> None:
"""delete list from redis""" """delete list from redis"""
@ -170,7 +167,7 @@ class TaskRedis(RedisBase):
def get_all(self) -> list: def get_all(self) -> list:
"""return all tasks""" """return all tasks"""
all_keys = self.conn.execute_command("KEYS", f"{self.BASE}*") all_keys = self.conn.execute_command("KEYS", f"{self.BASE}*")
return [i.decode().replace(self.BASE, "") for i in all_keys] return [i.replace(self.BASE, "") for i in all_keys]
def get_single(self, task_id: str) -> dict: def get_single(self, task_id: str) -> dict:
"""return content of single task""" """return content of single task"""
@ -178,7 +175,7 @@ class TaskRedis(RedisBase):
if not result: if not result:
return {} return {}
return json.loads(result.decode()) return json.loads(result)
def set_key( def set_key(
self, task_id: str, message: dict, expire: bool | int = False self, task_id: str, message: dict, expire: bool | int = False