From f921035ee76ba2e42b38305c51a0f61f2d3e5df3 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Thu, 24 Sep 2015 18:18:07 -0700
Subject: [PATCH 1/4] Fix ajax message alignment on datatables

---
 data/interfaces/default/js/tables/history_table.js       | 2 +-
 data/interfaces/default/js/tables/history_table_modal.js | 2 +-
 data/interfaces/default/js/tables/logs.js                | 2 +-
 data/interfaces/default/js/tables/user_ips.js            | 2 +-
 data/interfaces/default/js/tables/users.js               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 1cccbf9b..ba214107 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -237,7 +237,7 @@ history_table_options = {
         }
     },
     "preDrawCallback": function(settings) {
-        var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching 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..770ecf47 100644
--- a/data/interfaces/default/js/tables/history_table_modal.js
+++ b/data/interfaces/default/js/tables/history_table_modal.js
@@ -134,7 +134,7 @@ history_table_modal_options = {
         });
     },
     "preDrawCallback": function(settings) {
-        var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching 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 = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching 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 = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching 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 = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     },
     "rowCallback": function (row, rowData) {

From e9585ea15dc786194f0ef07e84e5e52ce5405afc Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Fri, 25 Sep 2015 11:55:22 -0700
Subject: [PATCH 2/4] Use .png Plex logo instead of .svg

* Fix .svg not showing on some devices
---
 data/interfaces/default/css/plexpy.css           |   2 +-
 .../default/images/plex-logo-light-small.png     | Bin 0 -> 1441 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 data/interfaces/default/images/plex-logo-light-small.png

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 0000000000000000000000000000000000000000..d2c711cda0435583bd9d598e35f35aed0c146395
GIT binary patch
literal 1441
zcmV;S1z!4zP)<h;3K|Lk000e1NJLTq003kF001Be1^@s6<SX4S0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%LrFwIRCwC#TFq}8MHGKCb|S$c*+$S0
zM8yVB1)_?qiW?G2F5IZhKL9b6KtiC{f<q4l$7(@HfZ_@Ss8UEcajeCSlidTiqMFYN
zq>_amia<@Bf>f0>yS%qMYtOECcgAZ6g6*fg?1y(}X6McC_j@zD%t3>6)<AEff65qZ
zCS8bCEaRpeR}S94kg^R__B?LtFc@pM<>IMBCT=dF8;k+)jML?e<CZ&(BgM@HjdpI}
z##CHp@je<)9Z{r4V`X*GF+*dIpSfn?rb7GF@d0PT-D8-)^1;5M#(*?6sx9#Wwcj13
zSn<k`1*MAUXaFLF$<96JtR1ZK#>a*c6AU`Pq>0WNAMi62#b_8B!_F=c8h}a22qJ{s
zK<ZkHDS`&6p@R<k$9Lfw%ELro$11;Bh>8j!1BClX@%GzPmcRPRR6auA7B#A=`Z~-M
zqTUD{Q>1em71XeTXZDDwH+m?piESxG{qXHu`!Au8=h~v4wQ&n1>K&oyP74Dwd*8Ev
zwM5(Mg3gnSuARkt-Fvc$aE<6Fti%+Ym?UI*;!eMk|CDn22zH3NN{EJfhq40b@b?X*
zFB*6yeEvm^V31Yhe&Q(}&=RAlqPR2%Lu5x!{((q_YL~#vLhp%uar28O@(GL(NOQ3-
ztMUon$H-e2a7)U(hRe7^T4J@eBSPdU^MdW`=QY#ZLRS@iHn9mKWRJdjz17LOf&$+`
ziUanoU*Oi|H+6KjG3bDdoE=%(B<iZU@sNYkNr7Fz{o@(f+4@GA<_<a_#z;m5QG$VJ
z`P2mhF+O#1A@sL@cr8iDt*9TeeWaVFLb&$?o%J$N6}qUjhhA#6taH;P1~?h?5dxuk
z3J!Jq#s%26-iHbEm2jF{jVn8w@*xQs=l>`AQtshe?ckX&Y_0#gI`tf*<Rzdd(yShX
zvi<XE$R0Qj?5+peRFyOx;Ju;(-Ca;rp(75GL$$2Jz@si-Pr&ICc(!u`{{H@iJPBS;
zWJ5&&{FU4dF{9rQYcr~p?(8T?$>Ha3T1Z<JkFNw}K@cq*d)Pth+WGx+(3ra^5t0-0
z3A2ZGHdUiwxL|^#K6o73dV+uF+Gi~t8Xt7pOO-Cb2$|!swZLki<DaL0h#woHkuhNM
zv5ySJa#Md<R*Z-*?1lBKaEiHG1z%mATE?Ew$-(dfA?;&8Cg)axW!)J9t%R>9>FXc@
zVu`$ZPtufbD%<lzpPM!vaF(1vAegVcgdDJKfQf@oLuUVR`PQ{07Rjaz0Qm(m{U532
z6A2A#=!P2%DJYIjaY3r0w08oj>XG-tch1u*gQ#T_WkB#IHeM|0wksd*Tcl2HYln*n
z2s%;K!>`Npk1$GR{|!+edi&|@jDaXvaU}63dI~rOgU>t(lMlWeJFgV;xp6=SN>x#A
zd)vF`-cha~h!u}<K+@Xfckjs~0`f8vz!!7dJErq|`q+AAdQMfGAtu@5fTXeS-oDqs
zk-y?}rM9e%3V{%7=BY2~#gk6fNm`WKt$9dVGgEvzWa*~aJ(e9?E_OCj3^Uyoq%cJ>
zFEC)cfBsuQdf$-;^(%@MISo$y>SRz^mg1|EG}iu7Ww$;hmF?@(2j&@f>Y1z)`AMnt
zS!wnD!k;DSxr<S>6k!E_AdD$XXFy?Al_=t_GYh>E8qifSXVVt=aX=LI)f)$wk&be{
zi2K6by$_|sCvHY98x?eD+h6Az2PDBRo;sAn&MwELw*J0tvzqzhRxO71X-3}AsBVeg
vH;n_L7TgG`3ZSHg=Ts=rL5Z6N|0BQv^3JB4R%>E<00000NkvXXu0mjfx8=60

literal 0
HcmV?d00001


From dcb7486fd6807e99a9a20d41f97532e76dc0f7b0 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Fri, 25 Sep 2015 12:13:00 -0700
Subject: [PATCH 3/4] Fix audio transcode/stream/play icon on history tables

---
 data/interfaces/default/js/tables/history_table.js       | 9 +++++----
 data/interfaces/default/js/tables/history_table_modal.js | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index ba214107..7fd7662d 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -98,14 +98,15 @@ 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 = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['video_decision'] === 'copy') {
+                    } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
-                    } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
+                    } else {
+                        $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                     }
-                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                 }
             },
             "width": "15%",
diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js
index 770ecf47..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 = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['video_decision'] === 'copy') {
+                    } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
-                    } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
                     }
                     $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');

From 7327be1ff87e113b2bd6f4f8550bbe60d6fd5a80 Mon Sep 17 00:00:00 2001
From: Jonathan Wong <Jonny.Wong.16@gmail.com>
Date: Sun, 27 Sep 2015 10:26:35 -0700
Subject: [PATCH 4/4] Pass audio_decision to history tables

---
 data/interfaces/default/js/tables/history_table.js | 5 ++---
 plexpy/datafactory.py                              | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 7fd7662d..ae303bf6 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -104,9 +104,8 @@ history_table_options = {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
                     } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
-                    } else {
-                        $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
-                    }
+                    } 
+                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                 }
             },
             "width": "15%",
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"]
                    }