1
0
forked from bot/app

fix: 天气查询失败的问题

This commit is contained in:
远野千束 2024-04-15 20:43:39 +08:00
parent 0d3361dc99
commit 016fe3ef72

View File

@ -20,41 +20,14 @@ def detect_update() -> bool:
def update_liteyuki() -> tuple[bool, str]: def update_liteyuki() -> tuple[bool, str]:
"""更新轻雪 """更新轻雪
:return: 是否更新成功更新变动""" :return: 是否更新成功更新变动"""
# origins = ["origin", "origin2"]
# repo = Repo(".")
#
# # Get the current HEAD commit
# current_head_commit = repo.head.commit
#
# # Fetch the latest information from the cloud
# repo.remotes.origin.fetch()
#
# # Get the latest HEAD commit
# new_head_commit = repo.commit('origin/main')
#
# # If the new HEAD commit is different from the current HEAD commit, there is a new commit
# diffs = current_head_commit.diff(new_head_commit)
# logs = ""
# for diff in diffs.iter_change_type('M'):
# logs += f"\n{diff.a_path}"
#
# for origin in origins:
# try:
# repo.remotes[origin].pull()
# break
# except Exception as e:
# nonebot.logger.error(f"Pull from {origin} failed: {e}")
# continue
# else:
# return False, 0
#
# return True, len(logs)
new_commit_detected = detect_update() new_commit_detected = detect_update()
if new_commit_detected: if new_commit_detected:
repo = Repo(".") repo = Repo(".")
logs = "" logs = ""
# 对每个远程仓库进行更新 # 对每个远程仓库进行更新
for remote_url in remote_urls: for remote_url in remote_urls:
logs += f"\nremote: {remote_url}"
repo.remotes.origin.set_url(remote_url) repo.remotes.origin.set_url(remote_url)
repo.remotes.origin.pull() repo.remotes.origin.pull()
diffs = repo.head.commit.diff("origin/main") diffs = repo.head.commit.diff("origin/main")