From 1699fc09cf2ae92c38375dda5a6ce6be4efcbe3c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 17 Feb 2020 17:32:52 -0800
Subject: [PATCH] Get history using title and year for Live TV info page

---
 data/interfaces/default/info.html | 20 +++++++++++++++++++-
 plexpy/datafactory.py             |  1 +
 plexpy/webserve.py                | 25 +++++++++++++++++--------
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index a32df9d1..73277984 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -617,7 +617,25 @@ DOCUMENTATION :: END
     data = defaultdict(None, **metadata)
 %>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
-% if data['media_type'] in ('show', 'artist'):
+% if data['live']:
+<script>
+    function get_history() {
+        history_table_options.ajax = {
+            url: 'get_history',
+            type: 'POST',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    live: "${data['live']}",
+                    full_title: "${data['full_title']}",
+                    year: "${data['year']}",
+                    user_id: "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"
+                };
+            }
+        }
+    }
+</script>
+% elif data['media_type'] in ('show', 'artist'):
 <script>
     function get_history() {
         history_table_options.ajax = {
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index cd7999db..148ea002 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1093,6 +1093,7 @@ class DataFactory(object):
                         'media_index': item['media_index'],
                         'studio': item['studio'],
                         'title': item['title'],
+                        'full_title': item['full_title'],
                         'content_rating': item['content_rating'],
                         'summary': item['summary'],
                         'tagline': item['tagline'],
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 7ba8bb22..de9fbb51 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1683,31 +1683,40 @@ class WebInterface(object):
         elif user:
             custom_where.append(['session_history.user', user])
         if 'rating_key' in kwargs:
-            rating_key = kwargs.get('rating_key', "")
+            rating_key = kwargs.get('rating_key', '')
             custom_where.append(['session_history.rating_key', rating_key])
         if 'parent_rating_key' in kwargs:
-            rating_key = kwargs.get('parent_rating_key', "")
+            rating_key = kwargs.get('parent_rating_key', '')
             custom_where.append(['session_history.parent_rating_key', rating_key])
         if 'grandparent_rating_key' in kwargs:
-            rating_key = kwargs.get('grandparent_rating_key', "")
+            rating_key = kwargs.get('grandparent_rating_key', '')
             custom_where.append(['session_history.grandparent_rating_key', rating_key])
         if 'start_date' in kwargs:
-            start_date = kwargs.get('start_date', "")
+            start_date = kwargs.get('start_date', '')
             custom_where.append(['strftime("%Y-%m-%d", datetime(started, "unixepoch", "localtime"))', start_date])
         if 'reference_id' in kwargs:
-            reference_id = kwargs.get('reference_id', "")
+            reference_id = kwargs.get('reference_id', '')
             custom_where.append(['session_history.reference_id', reference_id])
         if 'section_id' in kwargs:
-            section_id = kwargs.get('section_id', "")
+            section_id = kwargs.get('section_id', '')
             custom_where.append(['session_history_metadata.section_id', section_id])
         if 'media_type' in kwargs:
-            media_type = kwargs.get('media_type', "")
+            media_type = kwargs.get('media_type', '')
             if media_type != 'all':
                 custom_where.append(['session_history.media_type', media_type])
         if 'transcode_decision' in kwargs:
-            transcode_decision = kwargs.get('transcode_decision', "")
+            transcode_decision = kwargs.get('transcode_decision', '')
             if transcode_decision:
                 custom_where.append(['session_history_media_info.transcode_decision', transcode_decision])
+        if 'live' in kwargs:
+            live = kwargs.get('live', '0')
+            custom_where.append(['session_history_metadata.live', live])
+        if 'full_title' in kwargs:
+            full_title = kwargs.get('full_title', '')
+            custom_where.append(['session_history_metadata.full_title', full_title])
+        if 'year' in kwargs:
+            year = kwargs.get('year', '')
+            custom_where.append(['session_history_metadata.year', year])
 
         data_factory = datafactory.DataFactory()
         history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)