Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #86: 修改 searchx.py 模块中不正确的处理逻辑, #88

Merged
merged 2 commits into from
Oct 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions mod/searchx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from mod.searchx import api, kugou, netease


def search_all(title, artist, album, timeout=30):
def search_all(title, artist, album, timeout=15):
funcs = [api, kugou, netease]
results = []

Expand All @@ -18,16 +18,23 @@ def request(task):
_futures.append(executor.submit(request, func))

# 等待所有任务完成,或回收超时任务,处理TimeoutError
for future in futures.as_completed(_futures, timeout=timeout):
future.result()
try:
for future in futures.as_completed(_futures, timeout=timeout):
future.result()
except futures.TimeoutError:
# 记录超时任务
pass

# 回收超时任务
for future in _futures:
if future.done() and future.exception():
future.result()
if future.done():
if future.exception():
# 处理异常任务
pass
else:
future.cancel()
return results

return results

if __name__ == "__main__":
print(search_all("大地", "Beyond", ""))
Loading