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

Apply suggestions from code review 

Co-Authored-By: morpheus65535 <louis_vezina@hotmail.com>
This commit is contained in:
halali 2019-05-20 22:55:57 +02:00 committed by GitHub
parent 79f39e791e
commit f932a52378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bazarr/check_update.py
View File

@ -43,7 +43,7 @@ def check_and_apply_update():
g.fetch('origin') g.fetch('origin')
result = g.diff('--shortstat', 'origin/' + branch) result = g.diff('--shortstat', 'origin/' + branch)
if len(result) == 0: if len(result) == 0:
notifications.write(msg='BAZARR No new version of Bazarr available.', queue='check_update') notifications.write(msg='No new version of Bazarr available.', queue='check_update')
logging.info('BAZARR No new version of Bazarr available.') logging.info('BAZARR No new version of Bazarr available.')
else: else:
g.reset('--hard', 'HEAD') g.reset('--hard', 'HEAD')
@ -57,7 +57,7 @@ def check_and_apply_update():
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.', notifications.write(msg='Could not get releases from GitHub.',
queue='check_update', type='warning') 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
@ -68,10 +68,10 @@ def check_and_apply_update():
if ('v' + os.environ["BAZARR_VERSION"]) != latest_release and settings.general.branch == 'master': if ('v' + os.environ["BAZARR_VERSION"]) != latest_release and settings.general.branch == 'master':
update_from_source() update_from_source()
elif settings.general.branch != 'master': elif settings.general.branch != 'master':
notifications.write(msg="BAZARR Can't update development branch from source", queue='check_update') # fixme notifications.write(msg="Can't update development branch from source", queue='check_update') # fixme
logging.info("BAZARR Can't update development branch from source") # fixme logging.info("BAZARR Can't update development branch from source") # fixme
else: else:
notifications.write(msg='BAZARR is up to date', queue='check_update') notifications.write(msg='Bazarr is up to date', queue='check_update')
logging.info('BAZARR is up to date') logging.info('BAZARR is up to date')
@ -80,12 +80,12 @@ def update_from_source():
update_dir = os.path.join(os.path.dirname(__file__), '..', 'update') update_dir = os.path.join(os.path.dirname(__file__), '..', 'update')
logging.info('BAZARR Downloading update from: ' + tar_download_url) logging.info('BAZARR Downloading update from: ' + tar_download_url)
notifications.write(msg='BAZARR Downloading update from: ' + tar_download_url, queue='check_update') notifications.write(msg='Downloading update from: ' + tar_download_url, queue='check_update')
data = request_content(tar_download_url) data = request_content(tar_download_url)
if not data: if not data:
logging.error("BAZARR Unable to retrieve new version from '%s', can't update", tar_download_url) logging.error("BAZARR Unable to retrieve new version from '%s', can't update", tar_download_url)
notifications.write(msg=("BAZARR Unable to retrieve new version from '%s', can't update", tar_download_url), notifications.write(msg=("Unable to retrieve new version from '%s', can't update", tar_download_url),
type='error', queue='check_update') type='error', queue='check_update')
return return
@ -98,14 +98,14 @@ def update_from_source():
# Extract the tar to update folder # Extract the tar to update folder
logging.info('BAZARR Extracting file: ' + tar_download_path) logging.info('BAZARR Extracting file: ' + tar_download_path)
notifications.write(msg='BAZARR Extracting file: ' + tar_download_path, queue='check_update') notifications.write(msg='Extracting file: ' + tar_download_path, queue='check_update')
tar = tarfile.open(tar_download_path) tar = tarfile.open(tar_download_path)
tar.extractall(update_dir) tar.extractall(update_dir)
tar.close() tar.close()
# Delete the tar.gz # Delete the tar.gz
logging.info('BAZARR Deleting file: ' + tar_download_path) logging.info('BAZARR Deleting file: ' + tar_download_path)
notifications.write(msg='BAZARR Deleting file: ' + tar_download_path, queue='check_update') notifications.write(msg='Deleting file: ' + tar_download_path, queue='check_update')
os.remove(tar_download_path) os.remove(tar_download_path)
# Find update dir name # Find update dir name