github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Users recently watched should also use the history db for metadata.

Browse source
This commit is contained in:
Tim 2015-07-25 12:48:15 +02:00
parent 7d9934e4b6
commit 41d09066fe
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ data[array_index] :: Usable parameters
== Global keys ==
rating_key Returns the unique identifier for the media item.
row_id Returns the unique row id for the media item in the database.
type Returns the type of media. Either 'movie' or 'episode'.
thumb Returns the location of the item's thumbnail. Use with pms_image_proxy.
time Returns the last watched time of the media.
@ -34,7 +35,7 @@ DOCUMENTATION :: END
<li>
<div class="poster">
<div class="poster-face">
<a href="info?item_id=${item['rating_key']}">
<a href="info?source=history&item_id=${item['row_id']}">
<img src="pms_image_proxy?img=${item['thumb']}&width=153&height=225&fallback=poster" class="poster-face">
</a>
</div>

35
plexpy/datafactory.py
View file

@ -593,22 +593,22 @@ class DataFactory(object):
try:
if user_id:
query = 'SELECT session_history.media_type, session_history.rating_key, title, thumb, parent_thumb, ' \
'media_index, parent_media_index, year, started, user ' \
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 ' \
'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user_id = ? ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user_id, limit])
elif user:
query = 'SELECT session_history.media_type, session_history.rating_key, title, thumb, parent_thumb, ' \
'media_index, parent_media_index, year, started, user ' \
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 ' \
'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'WHERE user = ? ORDER BY started DESC LIMIT ?'
result = monitor_db.select(query, args=[user, limit])
else:
query = 'SELECT session_history.media_type, session_history.rating_key, title, thumb, parent_thumb, ' \
'media_index, parent_media_index, year, started, user ' \
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 ' \
'FROM session_history_metadata ' \
'JOIN session_history ON session_history_metadata.id = session_history.id ' \
'ORDER BY started DESC LIMIT ?'
@ -618,20 +618,21 @@ class DataFactory(object):
return None
for row in result:
if row[0] == 'episode':
thumb = row[4]
if row[1] == 'episode':
thumb = row[5]
else:
thumb = row[3]
thumb = row[4]
recent_output = {'type': row[0],
'rating_key': row[1],
'title': row[2],
recent_output = {'row_id': row[0],
'type': row[1],
'rating_key': row[2],
'title': row[3],
'thumb': thumb,
'index': row[5],
'parentIndex': row[6],
'year': row[7],
'time': row[8],
'user': row[9]
'index': row[6],
'parentIndex': row[7],
'year': row[8],
'time': row[9],
'user': row[10]
}
recently_watched.append(recent_output)