diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 4954ebd6..089488c9 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -461,7 +461,7 @@ $('*').on('click', '.refresh_pms_image', function (e) { }); // Taken from http://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable#answer-14919494 -function humanFileSize(bytes, si) { +function humanFileSize(bytes, si = true) { var thresh = si ? 1000 : 1024; if (Math.abs(bytes) < thresh) { return bytes + ' B'; diff --git a/plexpy/helpers.py b/plexpy/helpers.py index ee1ab5e6..13b23bf4 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -1047,7 +1047,7 @@ def build_datatables_json(kwargs, dt_columns, default_sort_col=None): return json.dumps(json_data) -def humanFileSize(bytes, si=False): +def humanFileSize(bytes, si=True): if str(bytes).isdigit(): bytes = cast_to_float(bytes) else: diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py index dbd79b69..20917579 100644 --- a/plexpy/versioncheck.py +++ b/plexpy/versioncheck.py @@ -264,7 +264,7 @@ def update(): logger.info('Windows .exe updating not supported yet.') elif plexpy.INSTALL_TYPE == 'git': - output, err = runGit('pull {} {} --ff-only'.format(plexpy.CONFIG.GIT_REMOTE, + output, err = runGit('pull --ff-only {} {}'.format(plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH)) if not output: