NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix for not displaying information when there is no update available + simplification

Browse Source
This commit is contained in:
Virgil Grigoras 2018-09-10 11:20:34 +02:00
parent f7872aded0
commit b2b092c190
2 changed files with 80 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/helper.py
View File

@ -568,7 +568,7 @@ def get_current_version_info():
return False
if is_sha1(content[0]) and len(content[1]) > 0:
return {'sha': content[0], 'datetime': content[1]}
return {'hash': content[0], 'datetime': content[1]}
except FileNotFoundError:
return False
return False

25
cps/web.py
View File

@ -1090,6 +1090,8 @@ def get_update_status():
'message': '',
'current_commit_hash': ''
}
parents = []
repository_url = 'https://api.github.com/repos/janeczku/calibre-web'
tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
@ -1098,7 +1100,7 @@ def get_update_status():
if version is False:
status['current_commit_hash'] = _(u'Unknown')
else:
status['current_commit_hash'] = version['sha']
status['current_commit_hash'] = version['hash']
try:
r = requests.get(repository_url + '/git/refs/heads/master')
@ -1114,11 +1116,23 @@ def get_update_status():
status['message'] = _(u'General error')
if status['message'] != '':
status['success'] = False
return json.dumps(status)
if 'object' in commit and commit['object']['sha'] != status['current_commit_hash']:
if 'object' not in commit:
status['message'] = _(u'Unexpected data while reading update information')
return json.dumps(status)
if commit['object']['sha'] == status['current_commit_hash']:
status.update({
'update': False,
'success': True,
'message': _(u'Now update available. You already have the latest version installed')
})
return json.dumps(status)
# a new update is available
status['update'] = True
try:
r = requests.get(repository_url + '/git/commits/' + commit['object']['sha'])
r.raise_for_status()
@ -1133,13 +1147,9 @@ def get_update_status():
status['error'] = _(u'General error')
if status['message'] != '':
status['success'] = False
return json.dumps(status)
if 'committer' in update_data and 'message' in update_data:
parents = []
status['update'] = True
status['success'] = True
status['message'] = _(u'A new update is available. Click on the button below update to the latest version.')
@ -1188,6 +1198,7 @@ def get_update_status():
else:
# parent is our current version
break
else:
status['success'] = False
status['message'] = _(u'Could not fetch update information')