github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 15:32:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get history using title and year for Live TV info page

Browse source
This commit is contained in:
JonnyWong16 2020-02-17 17:32:52 -08:00
parent f8b6a9f1e8
commit 1699fc09cf
3 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
data/interfaces/default/info.html
View file

@ -617,7 +617,25 @@ DOCUMENTATION :: END
data = defaultdict(None, **metadata) data = defaultdict(None, **metadata)
%> %>
<script src="${http_root}js/tables/history_table.js${cache_param}"></script> <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> <script>
function get_history() { function get_history() {
history_table_options.ajax = { history_table_options.ajax = {

1
plexpy/datafactory.py
View file

@ -1093,6 +1093,7 @@ class DataFactory(object):
'media_index': item['media_index'], 'media_index': item['media_index'],
'studio': item['studio'], 'studio': item['studio'],
'title': item['title'], 'title': item['title'],
'full_title': item['full_title'],
'content_rating': item['content_rating'], 'content_rating': item['content_rating'],
'summary': item['summary'], 'summary': item['summary'],
'tagline': item['tagline'], 'tagline': item['tagline'],

25
plexpy/webserve.py
View file

@ -1683,31 +1683,40 @@ class WebInterface(object):
elif user: elif user:
custom_where.append(['session_history.user', user]) custom_where.append(['session_history.user', user])
if 'rating_key' in kwargs: 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]) custom_where.append(['session_history.rating_key', rating_key])
if 'parent_rating_key' in kwargs: 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]) custom_where.append(['session_history.parent_rating_key', rating_key])
if 'grandparent_rating_key' in kwargs: 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]) custom_where.append(['session_history.grandparent_rating_key', rating_key])
if 'start_date' in kwargs: 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]) custom_where.append(['strftime("%Y-%m-%d", datetime(started, "unixepoch", "localtime"))', start_date])
if 'reference_id' in kwargs: 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]) custom_where.append(['session_history.reference_id', reference_id])
if 'section_id' in kwargs: 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]) custom_where.append(['session_history_metadata.section_id', section_id])
if 'media_type' in kwargs: if 'media_type' in kwargs:
media_type = kwargs.get('media_type', "") media_type = kwargs.get('media_type', '')
if media_type != 'all': if media_type != 'all':
custom_where.append(['session_history.media_type', media_type]) custom_where.append(['session_history.media_type', media_type])
if 'transcode_decision' in kwargs: if 'transcode_decision' in kwargs:
transcode_decision = kwargs.get('transcode_decision', "") transcode_decision = kwargs.get('transcode_decision', '')
if transcode_decision: if transcode_decision:
custom_where.append(['session_history_media_info.transcode_decision', 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() data_factory = datafactory.DataFactory()
history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping) history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)