github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 06:00:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source
This commit is contained in:
JonnyWong16 2020-03-29 10:30:15 -07:00
commit c1a7b3753c
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/js/script.js
View file

@ -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 // 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; var thresh = si ? 1000 : 1024;
if (Math.abs(bytes) < thresh) { if (Math.abs(bytes) < thresh) {
return bytes + ' B'; return bytes + ' B';

2
plexpy/helpers.py
View file

@ -1047,7 +1047,7 @@ def build_datatables_json(kwargs, dt_columns, default_sort_col=None):
return json.dumps(json_data) return json.dumps(json_data)
def humanFileSize(bytes, si=False): def humanFileSize(bytes, si=True):
if str(bytes).isdigit(): if str(bytes).isdigit():
bytes = cast_to_float(bytes) bytes = cast_to_float(bytes)
else: else:

2
plexpy/versioncheck.py
View file

@ -264,7 +264,7 @@ def update():
logger.info('Windows .exe updating not supported yet.') logger.info('Windows .exe updating not supported yet.')
elif plexpy.INSTALL_TYPE == 'git': 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)) plexpy.CONFIG.GIT_BRANCH))
if not output: if not output: