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

Some more minor changes

Browse source
This commit is contained in:
Jonathan Wong 2016-01-16 19:27:40 -08:00
parent 35528ef602
commit 3c1290e8fd
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/interfaces/default/js/tables/history_table.js
View file

@ -73,7 +73,7 @@ history_table_options = {
$(td).html(cellData); $(td).html(cellData);
} }
}, },
"width": "7%", "width": "9%",
"className": "no-wrap hidden-xs" "className": "no-wrap hidden-xs"
}, },
{ {
@ -95,7 +95,7 @@ history_table_options = {
$(td).html('n/a'); $(td).html('n/a');
} }
}, },
"width": "7%", "width": "8%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip" "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip"
}, },
{ {
@ -106,7 +106,7 @@ history_table_options = {
$(td).html(cellData); $(td).html(cellData);
} }
}, },
"width": "7%", "width": "10%",
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control" "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
}, },
{ {

6
data/interfaces/default/js/tables/media_info_table.js
View file

@ -187,7 +187,7 @@ media_info_table_options = {
"data": "file_size", "data": "file_size",
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== null && cellData !== '') { if (cellData !== null && cellData !== '') {
$(td).html(Math.round(cellData / 1024 / 1024).toString() + ' MiB'); $(td).html(Math.round(cellData / Math.pow(1024, 2)).toString() + ' MiB');
} else { } else {
if (rowData['section_type'] != 'photo') { get_file_sizes = true; } if (rowData['section_type'] != 'photo') { get_file_sizes = true; }
} }
@ -268,6 +268,10 @@ media_info_table_options = {
}); });
get_file_sizes = false; get_file_sizes = false;
} }
$("#media_info_table_info").append('<span class="hidden-md hidden-sm hidden-xs"> with a total file size of ' +
Math.round(settings.json.filtered_file_size / Math.pow(1024, 3)).toString() + ' GiB' +
' (filtered from ' + Math.round(settings.json.total_file_size / Math.pow(1024, 3)).toString() + ' GiB)</span>');
}, },
"preDrawCallback": function(settings) { "preDrawCallback": function(settings) {
var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows..."; var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";

1
plexpy/datafactory.py
View file

@ -814,6 +814,7 @@ class DataFactory(object):
logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_total_duration: %s." % e) logger.warn(u"PlexPy DataFactory :: Unable to execute database query for get_total_duration: %s." % e)
return None return None
total_duration = 0
for item in result: for item in result:
total_duration = item['total_duration'] total_duration = item['total_duration']

4
plexpy/helpers.py
View file

@ -150,7 +150,7 @@ def human_duration(s, sig='dhms'):
hd = '' hd = ''
if str(s).isdigit(): if str(s).isdigit() and s > 0:
d = int(s / 84600) d = int(s / 84600)
h = int((s % 84600) / 3600) h = int((s % 84600) / 3600)
m = int(((s % 84600) % 3600) / 60) m = int(((s % 84600) % 3600) / 60)
@ -173,6 +173,8 @@ def human_duration(s, sig='dhms'):
hd_list.append(str(s) + ' secs') hd_list.append(str(s) + ' secs')
hd = ' '.join(hd_list) hd = ' '.join(hd_list)
else:
hd = '0'
return hd return hd

8
plexpy/libraries.py
View file

@ -363,15 +363,19 @@ class Libraries(object):
else: else:
results = sorted(results, key=lambda k: k[sort_key], reverse=reverse) results = sorted(results, key=lambda k: k[sort_key], reverse=reverse)
total_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results])
# Paginate results # Paginate results
results = results[json_data['start']:(json_data['start'] + json_data['length'])] results = results[json_data['start']:(json_data['start'] + json_data['length'])]
## Find some way to add total disk space used? filtered_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results])
dict = {'recordsFiltered': filtered_count, dict = {'recordsFiltered': filtered_count,
'recordsTotal': library_count, 'recordsTotal': library_count,
'data': results, 'data': results,
'draw': int(json_data['draw']) 'draw': int(json_data['draw']),
'filtered_file_size': filtered_file_size,
'total_file_size': total_file_size
} }
return dict return dict