From 9ce72f8df077e72bd774c55f9a58e885dfdfc0fd Mon Sep 17 00:00:00 2001
From: herby2212 <12448284+herby2212@users.noreply.github.com>
Date: Sun, 26 Feb 2023 22:43:36 +0100
Subject: [PATCH] stats for collections of sub media type

---
 data/interfaces/default/info.html |  8 ++------
 plexpy/datafactory.py             | 14 +++++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 0aebd1f8..93541637 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -543,10 +543,7 @@ DOCUMENTATION :: END
                     </div>
                 </div>
                 % endif
-                <%
-                    collection_valid = data['media_type'] == 'collection' and data['sub_media_type'] in ('movie', 'show', 'artist')
-                %>
-                % if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track') or collection_valid:
+                % if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection'):
                 <div class="col-md-12">
                     <div class="table-card-header">
                         <div class="header-bar">
@@ -854,7 +851,6 @@ DOCUMENTATION :: END
 <%
     data = defaultdict(None, **metadata)
     history_user_id = '' if _session['user_group'] == 'admin' else _session['user_id']
-    collection_valid = data['media_type'] == 'collection' and data['sub_media_type'] in ('movie', 'show', 'artist')
 %>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/export_table.js${cache_param}"></script>
@@ -930,7 +926,7 @@ DOCUMENTATION :: END
     });
 </script>
 % endif
-% if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track') or "${collection_valid}":
+% if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection'):
 <script>
     // Populate watch time stats
     $.ajax({
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index cb0d5d6b..d62eca55 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1159,7 +1159,7 @@ class DataFactory(object):
         rating_keys = []
         if media_type == 'collection':
             pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_item_children(rating_key=rating_key)
+            result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
 
             for child in result['children_list']:
                 rating_keys.append(child['rating_key'])
@@ -1179,14 +1179,14 @@ class DataFactory(object):
                                 'COUNT(DISTINCT %s) AS total_plays, section_id ' \
                                 'FROM session_history ' \
                                 'JOIN session_history_metadata ON session_history_metadata.id = session_history.id ' \
-                                'WHERE stopped >= %s ' \
+                                'WHERE stopped >= ? ' \
                                 'AND (session_history.grandparent_rating_key IN (%s) ' \
                                 'OR session_history.parent_rating_key IN (%s) ' \
                                 'OR session_history.rating_key IN (%s))' % (
-                                    group_by, timestamp_query, rating_keys_arg, rating_keys_arg, rating_keys_arg
+                                    group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
                                 )
                         
-                        result = monitor_db.select(query, args=rating_keys*3)
+                        result = monitor_db.select(query, args=[timestamp_query] + rating_keys * 3)
                     else:
                         result = []
                 else:
@@ -1202,7 +1202,7 @@ class DataFactory(object):
                                     group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
                                 )
                         
-                        result = monitor_db.select(query, args=rating_keys*3)
+                        result = monitor_db.select(query, args=rating_keys * 3)
                     else:
                         result = []
             except Exception as e:
@@ -1246,7 +1246,7 @@ class DataFactory(object):
         rating_keys = []
         if media_type == 'collection':
             pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_item_children(rating_key=rating_key)
+            result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
 
             for child in result['children_list']:
                 rating_keys.append(child['rating_key'])
@@ -1274,7 +1274,7 @@ class DataFactory(object):
                             group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
                         )
 
-                result = monitor_db.select(query, args=rating_keys*3)
+                result = monitor_db.select(query, args=rating_keys * 3)
             else:
                 result = []
         except Exception as e: