From 71131c699e811418265ef8611eba6dc3aab5edd4 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Tue, 9 Feb 2016 17:58:56 -0800
Subject: [PATCH] Add total duration to libraries and users tables

---
 data/interfaces/default/css/plexpy.css        |  4 +++
 data/interfaces/default/js/script.js          | 29 +++++++++++++++----
 .../interfaces/default/js/tables/libraries.js | 18 +++++++++++-
 data/interfaces/default/js/tables/users.js    | 18 +++++++++++-
 data/interfaces/default/libraries.html        |  6 ++++
 data/interfaces/default/users.html            |  6 ++++
 plexpy/libraries.py                           |  4 +++
 plexpy/users.py                               |  4 +++
 8 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 6c683f76..c271be54 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -2180,6 +2180,10 @@ a .home-platforms-instance-list-oval:hover,
 .refresh-libraries-button {
     float: right;
 }
+.refresh-users-button,
+.refresh-libraries-button {
+    margin-right: 5px;
+}
 .nav-settings,
 .nav-settings ul {
     margin: 0px 0px 20px 0px;
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 5d82f90c..1c416319 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -252,13 +252,13 @@ function isPrivateIP(ip_address) {
 
 function humanTime(seconds) {
     if (seconds >= 86400) {
-        text = '<h3>' + Math.floor(moment.duration(seconds, 'seconds').asDays()) +
-                '</h3><p> days </p><h3>' +  Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
-                '</h3><p> hrs</p><h3>'  +  Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
+        text = '<h3>' + Math.floor(moment.duration(seconds, 'seconds').asDays()) + '</h3><p> days</p>' +
+               '<h3>' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '</h3><p> hrs</p>' +
+               '<h3>' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
         return text;
     } else if (seconds >= 3600) {
-        text = '<h3>' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
-                '</h3><p>hrs</p><h3>' +  Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
+        text = '<h3>' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '</h3><p> hrs</p>' +
+               '<h3>' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
         return text;
     } else if (seconds >= 60) {
         text = '<h3>' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
@@ -269,6 +269,25 @@ function humanTime(seconds) {
     }
 }
 
+function humanTimeClean(seconds) {
+    if (seconds >= 86400) {
+        text = Math.floor(moment.duration(seconds, 'seconds').asDays()) + ' days ' +
+               Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' +
+               Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+        return text;
+    } else if (seconds >= 3600) {
+        text = Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' +
+               Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+        return text;
+    } else if (seconds >= 60) {
+        text = Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+        return text;
+    } else {
+        text = '0';
+        return text;
+    }
+}
+
 String.prototype.toProperCase = function () {
     return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
 };
diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index 377295ae..46844506 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -161,12 +161,28 @@ libraries_list_table_options = {
                     $(td).html('n/a');
                 }
             },
-            "width": "25%",
+            "width": "18%",
             "className": "hidden-sm hidden-xs"
         },
         {
             "targets": [9],
             "data": "plays",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null && cellData !== '') {
+                    $(td).html(cellData);
+                }
+            },
+            "searchable": false,
+            "width": "7%"
+        },
+        {
+            "targets": [10],
+            "data": "duration",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null && cellData !== '') {
+                    $(td).html(humanTimeClean(cellData));
+                }
+            },
             "searchable": false,
             "width": "10%"
         }
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index f7147a17..d1abb6c9 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -165,12 +165,28 @@ users_list_table_options = {
                     $(td).html('n/a');
                 }
             },
-            "width": "30%",
+            "width": "23%",
             "className": "hidden-sm hidden-xs"
         },
         {
             "targets": [8],
             "data": "plays",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null && cellData !== '') {
+                    $(td).html(cellData);
+                }
+            },
+            "searchable": false,
+            "width": "7%"
+        },
+        {
+            "targets": [9],
+            "data": "duration",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null && cellData !== '') {
+                    $(td).html(humanTimeClean(cellData));
+                }
+            },
             "searchable": false,
             "width": "10%"
         }
diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html
index 1e99697c..41fc9825 100644
--- a/data/interfaces/default/libraries.html
+++ b/data/interfaces/default/libraries.html
@@ -2,6 +2,7 @@
 
 <%def name="headIncludes()">
 <link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
 <link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
@@ -23,6 +24,7 @@
             <span><i class="fa fa-book"></i> All Libraries</span>
         </div>
         <div class="button-bar">
+            <div class="colvis-button-bar hidden-xs"></div>
             % if config['update_section_ids'] == -1:
             <button class="btn btn-dark refresh-libraries-button" id="refresh-libraries-list" disabled><i class="fa fa-refresh"></i> Refresh libraries</button>
             % else:
@@ -48,6 +50,7 @@
                 <th align="left" id="last_accessed">Last Accessed</th>
                 <th align="left" id="last_played">Last Played</th>
                 <th align="left" id="total_plays">Total Plays</th>
+                <th align="left" id="total_duration">Total Duration</th>
             </tr>
             </thead>
             <tbody>
@@ -79,6 +82,7 @@
 
 <%def name="javascriptIncludes()">
 <script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
 <script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
 <script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
 <script src="interfaces/default/js/moment-with-locale.js"></script>
@@ -96,6 +100,8 @@
         }
 
         libraries_list_table = $('#libraries_list_table').DataTable(libraries_list_table_options);
+        var colvis = new $.fn.dataTable.ColVis(libraries_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });
+        $(colvis.button()).appendTo('div.colvis-button-bar');
 
         clearSearchButton('libraries_list_table', libraries_list_table);
 
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 69c725a2..9b1a9dd1 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -2,6 +2,7 @@
 
 <%def name="headIncludes()">
 <link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
 <link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
@@ -12,6 +13,7 @@
             <span><i class="fa fa-group"></i> All Users</span>
         </div>
         <div class="button-bar">
+            <div class="colvis-button-bar hidden-xs"></div>
             <button class="btn btn-dark refresh-users-button" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
             <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                 <i class="fa fa-pencil"></i> Edit mode
@@ -32,6 +34,7 @@
                 <th align="left" id="last_player">Last Player</th>
                 <th align="left" id="last_played">Last Played</th>
                 <th align="left" id="total_plays">Total Plays</th>
+                <th align="left" id="total_duration">Total Duration</th>
             </tr>
             </thead>
             <tbody>
@@ -67,6 +70,7 @@
 
 <%def name="javascriptIncludes()">
 <script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
 <script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
 <script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
 <script src="interfaces/default/js/moment-with-locale.js"></script>
@@ -84,6 +88,8 @@
         }
 
         users_list_table = $('#users_list_table').DataTable(users_list_table_options);
+        var colvis = new $.fn.dataTable.ColVis(users_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });
+        $(colvis.button()).appendTo('div.colvis-button-bar');
 
         clearSearchButton('users_list_table', users_list_table);
 
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index cbe2e33e..771f3c7a 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -133,6 +133,9 @@ class Libraries(object):
                    'library_sections.custom_thumb_url AS custom_thumb',
                    'library_sections.art',
                    'COUNT(session_history.id) AS plays',
+                   'SUM(CASE WHEN session_history.stopped > 0 THEN (session_history.stopped - session_history.started) \
+                    ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
+                    session_history.paused_counter END) AS duration',
                    'MAX(session_history.started) AS last_accessed',
                    'MAX(session_history.id) AS id',
                    'session_history_metadata.full_title AS last_played',
@@ -200,6 +203,7 @@ class Libraries(object):
                    'library_thumb': library_thumb,
                    'library_art': item['art'],
                    'plays': item['plays'],
+                   'duration': item['duration'],
                    'last_accessed': item['last_accessed'],
                    'id': item['id'],
                    'last_played': item['last_played'],
diff --git a/plexpy/users.py b/plexpy/users.py
index 19294285..8f5c5d9c 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -32,6 +32,9 @@ class Users(object):
                    'users.thumb AS user_thumb',
                    'users.custom_avatar_url AS custom_thumb',
                    'COUNT(session_history.id) AS plays',
+                   'SUM(CASE WHEN session_history.stopped > 0 THEN (session_history.stopped - session_history.started) \
+                    ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
+                    session_history.paused_counter END) AS duration',
                    'MAX(session_history.started) AS last_seen',
                    'MAX(session_history.id) AS id',
                    'session_history_metadata.full_title AS last_played',
@@ -100,6 +103,7 @@ class Users(object):
                    'friendly_name': item['friendly_name'],
                    'user_thumb': user_thumb,
                    'plays': item['plays'],
+                   'duration': item['duration'],
                    'last_seen': item['last_seen'],
                    'last_played': item['last_played'],
                    'id': item['id'],