diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 649f36ac..a5bdd369 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1101,7 +1101,7 @@ a:hover .dashboard-recent-media-cover { display: block; width: 100%; height: 100%; - background-image: url(../images/plex-logo-light.svg); + background-image: url(../images/plex-logo-light-small.png); background-size: 100px; background-repeat: no-repeat; background-position: center; diff --git a/data/interfaces/default/images/plex-logo-light-small.png b/data/interfaces/default/images/plex-logo-light-small.png new file mode 100644 index 00000000..d2c711cd Binary files /dev/null and b/data/interfaces/default/images/plex-logo-light-small.png differ diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 1cccbf9b..ae303bf6 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -98,13 +98,13 @@ history_table_options = { "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { var transcode_dec = ''; - if (rowData['video_decision'] === 'transcode') { + if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'copy') { + } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') { + } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') { transcode_dec = ''; - } + } $(td).html('
' + transcode_dec + ' ' + cellData + '
'); } }, @@ -237,7 +237,7 @@ history_table_options = { } }, "preDrawCallback": function(settings) { - var msg = "
 Fetching rows...
"; + var msg = " Fetching rows..."; showMsg(msg, false, false, 0) }, "rowCallback": function (row, rowData) { diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js index efb109c3..c4536867 100644 --- a/data/interfaces/default/js/tables/history_table_modal.js +++ b/data/interfaces/default/js/tables/history_table_modal.js @@ -77,11 +77,11 @@ history_table_modal_options = { "createdCell": function (td, cellData, rowData, row, col) { if (cellData !== '') { var transcode_dec = ''; - if (rowData['video_decision'] === 'transcode') { + if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'copy') { + } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') { transcode_dec = ''; - } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') { + } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') { transcode_dec = ''; } $(td).html('
' + transcode_dec + ' ' + cellData + '
'); @@ -134,7 +134,7 @@ history_table_modal_options = { }); }, "preDrawCallback": function(settings) { - var msg = "
 Fetching rows...
"; + var msg = " Fetching rows..."; showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/logs.js b/data/interfaces/default/js/tables/logs.js index cfcd3a57..50cf2cef 100644 --- a/data/interfaces/default/js/tables/logs.js +++ b/data/interfaces/default/js/tables/logs.js @@ -35,7 +35,7 @@ var log_table_options = { $('#ajaxMsg').fadeOut(); }, "preDrawCallback": function(settings) { - var msg = "
 Fetching rows...
"; + var msg = " Fetching rows..."; showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js index bb2667d4..de008320 100644 --- a/data/interfaces/default/js/tables/user_ips.js +++ b/data/interfaces/default/js/tables/user_ips.js @@ -123,7 +123,7 @@ user_ip_table_options = { }, "preDrawCallback": function(settings) { - var msg = "
 Fetching rows...
"; + var msg = " Fetching rows..."; showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index f47daf0f..04bf631b 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -187,7 +187,7 @@ users_list_table_options = { } }, "preDrawCallback": function(settings) { - var msg = "
 Fetching rows...
"; + var msg = " Fetching rows..."; showMsg(msg, false, false, 0) }, "rowCallback": function (row, rowData) { diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 2343ce42..3daf0062 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -60,6 +60,7 @@ class DataFactory(object): 'session_history.user', 'session_history_metadata.media_type', 'session_history_media_info.video_decision', + 'session_history_media_info.audio_decision', 'session_history.user_id as user_id' ] try: @@ -118,6 +119,7 @@ class DataFactory(object): "user": item["user"], "media_type": item["media_type"], "video_decision": item["video_decision"], + "audio_decision": item["audio_decision"], "user_id": item["user_id"] }