mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Some logging improvements

This commit is contained in:
Halali 2019-03-20 23:42:19 +01:00
parent 478b284ddf
commit e6b324b08f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bazarr/check_update.py
View File

@ -82,6 +82,9 @@ def check_updates():
version = request_json(url, timeout=20, validator=lambda x: type(x) == dict) version = request_json(url, timeout=20, validator=lambda x: type(x) == dict)
if version is None: if version is None:
notifications.write(
msg='BAZARR Could not get the latest version from GitHub.',
queue='check_update', type='warning')
logging.warn( logging.warn(
'BAZARR Could not get the latest version from GitHub.') 'BAZARR Could not get the latest version from GitHub.')
return return
@ -91,6 +94,8 @@ def check_updates():
# See how many commits behind we are # See how many commits behind we are
if not current_version: if not current_version:
notifications.write(msg='BAZARR You are running an unknown version of Bazarr. Run the updater to identify your version',
queue='check_update', type='warning')
logging.warn( logging.warn(
'BAZARR You are running an unknown version of Bazarr. Run the updater to identify your version') 'BAZARR You are running an unknown version of Bazarr. Run the updater to identify your version')
return return
@ -106,6 +111,8 @@ def check_updates():
commits = request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict) commits = request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict)
if commits is None: if commits is None:
notifications.write(msg='BAZARR Could not get commits behind from GitHub.',
queue='check_update', type='warning')
logging.warn('BAZARR Could not get commits behind from GitHub.') logging.warn('BAZARR Could not get commits behind from GitHub.')
return return
@ -113,8 +120,9 @@ def check_updates():
commits_behind = int(commits['behind_by']) commits_behind = int(commits['behind_by'])
logging.debug("BAZARR In total, %d commits behind", commits_behind) logging.debug("BAZARR In total, %d commits behind", commits_behind)
except KeyError: except KeyError:
notifications.write(msg='BAZARR Cannot compare versions. Are you running a local development version?', queue='check_update')
logging.info('BAZARR Cannot compare versions. Are you running a local development version?') logging.info('BAZARR Cannot compare versions. Are you running a local development version?')
commits_behind = 0 return
if commits_behind > 0: if commits_behind > 0:
logging.info('BAZARR New version is available. You are %s commits behind' % commits_behind) logging.info('BAZARR New version is available. You are %s commits behind' % commits_behind)
@ -130,6 +138,8 @@ def check_updates():
releases = request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == list) releases = request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == list)
if releases is None: if releases is None:
notifications.write(msg='BAZARR Could not get releases from GitHub.',
queue='check_update', type='warning')
logging.warn('BAZARR Could not get releases from GitHub.') logging.warn('BAZARR Could not get releases from GitHub.')
return return
else: else:
@ -172,6 +182,8 @@ def update(source, restart=True):
output, err = run_git('pull ' + 'origin' + ' ' + settings.general.branch) output, err = run_git('pull ' + 'origin' + ' ' + settings.general.branch)
if not output: if not output:
notifications.write(msg='Unable to download latest version',
queue='check_update', type='error')
logging.error('BAZARR Unable to download latest version') logging.error('BAZARR Unable to download latest version')
return return