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

Another update to recently added and recently watched.

Browse source 
Recently added albums now include artist name.
Recently watched episodes now include show name.
This commit is contained in:
JonnyWong16 2015-08-18 02:26:52 -07:00
parent 22cc06dec3
commit 6cb1c057cf
4 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/interfaces/default/css/plexpy.css
View file

@ -264,6 +264,9 @@ fieldset[disabled] .btn-bright.active {
.modal-body i { .modal-body i {
color: #F9AA03; color: #F9AA03;
} }
.modal-body i.fa {
color: #fff;
}
.modal-body strong { .modal-body strong {
color: #F9AA03; color: #F9AA03;
} }
@ -641,13 +644,14 @@ input[type="color"],
font-size: 13px; font-size: 13px;
margin: 0; margin: 0;
line-height: 15px; line-height: 15px;
font-weight: bold; font-weight: normal;
width: 153px; width: 153px;
white-space: nowrap; white-space: nowrap;
text-align: center; text-align: center;
clear: both; clear: both;
} }
.dashboard-recent-media-metacontainer text-muted { .dashboard-recent-media-metacontainer .text-muted {
padding-top: 5px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
@ -1151,7 +1155,7 @@ input[type="color"],
position: relative; position: relative;
font-size: 13px; font-size: 13px;
line-height: 15px; line-height: 15px;
font-weight: bold; font-weight: normal;
width: 140px; width: 140px;
margin-left: 10px; margin-left: 10px;
} }

1
data/interfaces/default/recently_added.html
View file

@ -50,6 +50,7 @@ DOCUMENTATION :: END
<div class="cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);"></div> <div class="cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);"></div>
</div> </div>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
<h3>${item['parent_title']}</h3>
<h3>${item['title']}</h3> <h3>${item['title']}</h3>
<div class="text-muted" id="added_at-${item['rating_key']}">${item['added_at']}</div> <div class="text-muted" id="added_at-${item['rating_key']}">${item['added_at']}</div>
</div> </div>

4
data/interfaces/default/user_recently_watched.html
View file

@ -18,6 +18,7 @@ time Returns the last watched time of the media.
title Returns the name of the movie or episode. title Returns the name of the movie or episode.
== Only if 'type' is 'episode == == Only if 'type' is 'episode ==
parent_title Returns the name of the TV Show a season belongs too.
parent_index Returns the season number. parent_index Returns the season number.
index Returns the episode number. index Returns the episode number.
@ -39,8 +40,9 @@ DOCUMENTATION :: END
</div> </div>
<div class="dashboard-recent-media-metacontainer"> <div class="dashboard-recent-media-metacontainer">
% if item['type'] == 'episode': % if item['type'] == 'episode':
<h3>${item['parent_title']}</h3>
<h3>${item['title']}</h3> <h3>${item['title']}</h3>
<h3>(Season ${item['parentIndex']}, Episode ${item['index']})</h3> <h3>(Season ${item['parent_index']}, Episode ${item['index']})</h3>
% elif item['type'] == 'movie': % elif item['type'] == 'movie':
<h3>${item['title']}</h3> <h3>${item['title']}</h3>
<h3>(${item['year']})</h3> <h3>(${item['year']})</h3>

21
plexpy/datafactory.py
View file

@ -381,21 +381,21 @@ class DataFactory(object):
try: try:
if user_id: if user_id:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \ query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata ' \ 'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \ 'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user_id = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?' 'WHERE user_id = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user_id, limit]) result = monitor_db.select(query, args=[user_id, limit])
elif user: elif user:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \ query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata ' \ 'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \ 'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?' 'WHERE user = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user, limit]) result = monitor_db.select(query, args=[user, limit])
else: else:
query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \ query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \ 'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
'FROM session_history_metadata WHERE session_history.media_type != "track"' \ 'FROM session_history_metadata WHERE session_history.media_type != "track"' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \ 'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'ORDER BY started DESC LIMIT ?' 'ORDER BY started DESC LIMIT ?'
@ -406,20 +406,21 @@ class DataFactory(object):
for row in result: for row in result:
if row[1] == 'episode': if row[1] == 'episode':
thumb = row[5] thumb = row[6]
else: else:
thumb = row[4] thumb = row[5]
recent_output = {'row_id': row[0], recent_output = {'row_id': row[0],
'type': row[1], 'type': row[1],
'rating_key': row[2], 'rating_key': row[2],
'title': row[3], 'title': row[3],
'parent_title': row[4],
'thumb': thumb, 'thumb': thumb,
'index': row[6], 'index': row[7],
'parentIndex': row[7], 'parent_index': row[8],
'year': row[8], 'year': row[9],
'time': row[9], 'time': row[10],
'user': row[10] 'user': row[11]
} }
recently_watched.append(recent_output) recently_watched.append(recent_output)