renil/lx-music-api-server
1
0
Fork 0
mirror of https://github.com/MeoProject/lx-music-api-server.git synced 2025-05-23 19:17:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复使用redis缓存的时候过期时间错误

Browse Source
This commit is contained in:
Folltoshe 2024-11-17 22:34:14 +08:00
parent 196732ab7d
commit d3ab5f910d
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/Httpx.py
View File

@ -175,11 +175,12 @@ def request(url: str, options={}) -> requests.Response:
# 缓存写入 # 缓存写入
if cache_info and cache_info != "no-cache": if cache_info and cache_info != "no-cache":
cache_data = pickle.dumps(req) cache_data = pickle.dumps(req)
expire_time = (cache_info if isinstance(cache_info, int) else 3600) + int(time.time()) expire_time = cache_info if isinstance(cache_info, int) else 3600
expire_at = int((time.time) + expire_time)
config.updateCache( config.updateCache(
"httpx", "httpx",
cache_key, cache_key,
{"expire": True, "time": expire_time, "data": utils.createBase64Encode(cache_data)}, {"expire": True, "time": expire_at, "data": utils.createBase64Encode(cache_data)},
expire_time, expire_time,
) )
logger.debug("缓存已更新: " + url) logger.debug("缓存已更新: " + url)
@ -331,11 +332,12 @@ async def AsyncRequest(url, options={}) -> ClientResponse:
# 缓存写入 # 缓存写入
if cache_info and cache_info != "no-cache": if cache_info and cache_info != "no-cache":
cache_data = pickle.dumps(req) cache_data = pickle.dumps(req)
expire_time = (cache_info if isinstance(cache_info, int) else 3600) + int(time.time()) expire_time = cache_info if isinstance(cache_info, int) else 3600
expire_at = int((time.time) + expire_time)
config.updateCache( config.updateCache(
"httpx_async", "httpx_async",
cache_key, cache_key,
{"expire": True, "time": expire_time, "data": utils.createBase64Encode(cache_data)}, {"expire": True, "time": expire_at, "data": utils.createBase64Encode(cache_data)},
expire_time, expire_time,
) )
logger.debug("缓存已更新: " + url) logger.debug("缓存已更新: " + url)

15
modules/__init__.py
View File

@ -95,18 +95,18 @@ async def url(source, songId, quality, query={}):
logger.info(f'获取{source}_{songId}_{quality}成功，URL：{result["url"]}') logger.info(f'获取{source}_{songId}_{quality}成功，URL：{result["url"]}')
canExpire = sourceExpirationTime[source]["expire"] canExpire = sourceExpirationTime[source]["expire"]
expireTime = sourceExpirationTime[source]["time"] + int(time.time()) expireTime = int(sourceExpirationTime[source]["time"] * 0.75)
canUseTime = int(expireTime - sourceExpirationTime[source]["time"] * 0.25) expireAt = int(expireTime + time.time())
config.updateCache( config.updateCache(
"urls", "urls",
f"{source}_{songId}_{quality}", f"{source}_{songId}_{quality}",
{ {
"expire": canExpire, "expire": canExpire,
# 取有效期的75%作为链接可用时长 # 取有效期的75%作为链接可用时长
"time": canUseTime, "time": expireAt,
"url": result["url"], "url": result["url"],
}, },
canUseTime if canExpire else None, expireTime if canExpire else None,
) )
logger.debug(f'缓存已更新：{source}_{songId}_{quality}, URL：{result["url"]}, expire: {expireTime}') logger.debug(f'缓存已更新：{source}_{songId}_{quality}, URL：{result["url"]}, expire: {expireTime}')
@ -121,7 +121,7 @@ async def url(source, songId, quality, query={}):
"result": result["quality"], "result": result["quality"],
}, },
"expire": { "expire": {
"time": expireTime if canExpire else None, "time": expireAt if canExpire else None,
"canExpire": canExpire, "canExpire": canExpire,
}, },
}, },
@ -149,13 +149,14 @@ async def lyric(source, songId, _, query):
} }
try: try:
result = await func(songId) result = await func(songId)
expireTime = int(time.time() + (86400 * 3)) expireTime = 86400 * 3
expireAt = int(time.time() + expireTime)
config.updateCache( config.updateCache(
"lyric", "lyric",
f"{source}_{songId}", f"{source}_{songId}",
{ {
"data": result, "data": result,
"time": expireTime, # 歌词缓存3天 "time": expireAt, # 歌词缓存3天
"expire": True, "expire": True,
}, },
expireTime, expireTime,