sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 19:17:21 +08:00
Code Activity

Fix: Failed to get local git commit

Browse Source
This commit is contained in:
LmeSzinc
2020-06-22 13:44:12 +08:00
parent 0ebbe181e7
commit b9f7848a7c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/update.py
View File

@@ -95,9 +95,12 @@ class Update:
datetime.datetime, str datetime.datetime, str
""" """
cmd = ['git', 'log', '--no-merges', '-1'] cmd = ['git', 'log', '--no-merges', '-1']
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
result = process.communicate(timeout=4)[0].decode("utf-8") result, error = process.communicate(timeout=4)
result = result.decode("utf-8")
if error:
logger.warning('Failed to get local git commit')
return None
date = datetime.strptime(result.split('\n')[2][8:], '%a %b %d %H:%M:%S %Y %z') date = datetime.strptime(result.split('\n')[2][8:], '%a %b %d %H:%M:%S %Y %z')
date -= date.utcoffset() date -= date.utcoffset()
date = date.replace(tzinfo=None) date = date.replace(tzinfo=None)
@@ -123,8 +126,10 @@ class Update:
commits = [ commits = [
self.get_github_commit('whoamikyo', token=self.config.GITHUB_TOKEN, proxy=self.config.UPDATE_PROXY), self.get_github_commit('whoamikyo', token=self.config.GITHUB_TOKEN, proxy=self.config.UPDATE_PROXY),
self.get_github_commit('LmeSzinc', token=self.config.GITHUB_TOKEN, proxy=self.config.UPDATE_PROXY), self.get_github_commit('LmeSzinc', token=self.config.GITHUB_TOKEN, proxy=self.config.UPDATE_PROXY),
self.get_local_commit()
] ]
local = self.get_local_commit()
if local is not None:
commits.append(local)
commits.sort(key=lambda x: x[0]) commits.sort(key=lambda x: x[0])
text = [f'{commit[0]} {commit[1]}' for commit in commits] text = [f'{commit[0]} {commit[1]}' for commit in commits]
@@ -137,5 +142,5 @@ class Update:
else: else:
logger.info(f' {line}') logger.info(f' {line}')
if commits[-1][1] != '<local>': if commits[-1][1] != '<local>' and local is not None:
logger.warning('A new update is available') logger.warning('A new update is available')