Allow info pages to be pulled from the db instead of the Plex Server, useful for media that has been deleted.

Fix home stats user link if user has no id.
Fix bug in PlexWatch import script which switched around the episode and show titles.
This commit is contained in:
Tim 2015-07-25 12:40:38 +02:00
parent 187f9d7cd4
commit 7d9934e4b6
11 changed files with 137 additions and 64 deletions

View file

@ -107,9 +107,9 @@ DOCUMENTATION :: END
</div>
<div class="dashboard-activity-metadata-title">
% if a['type'] == 'episode':
<a href="info?rating_key=${a['rating_key']}">${a['grandparent_title']} - ${a['title']}</a>
<a href="info?item_id=${a['rating_key']}">${a['grandparent_title']} - ${a['title']}</a>
% elif a['type'] == 'movie':
<a href="info?rating_key=${a['rating_key']}">${a['title']}</a>
<a href="info?item_id=${a['rating_key']}">${a['title']}</a>
% elif a['type'] == 'clip':
${a['title']}
% elif a['type'] == 'track':

View file

@ -14,6 +14,8 @@ data['rows'] Returns an array containing stat data
data[array_index]['rows'] :: Usable parameters
row_id Return the db row id for a metadata item if one exists
== Only if 'stat_id' is 'top_tv' or 'popular_tv' ==
grandparent_thumb Returns location of the item's thumbnail. Use with pms_image_proxy.
rating_key Returns the unique identifier for the media item.
@ -46,7 +48,7 @@ DOCUMENTATION :: END
<div class="home-platforms-instance">
<li>
<span>
<a href="info?rating_key=${a['rows'][0]['rating_key']}">
<a href="info?item_id=${a['rows'][0]['rating_key']}">
% if a['rows'][0]['grandparent_thumb']:
<img class="home-platforms-instance-poster"
src="pms_image_proxy?img=${a['rows'][0]['grandparent_thumb']}&width=162&height=240&fallback=poster">
@ -58,7 +60,7 @@ DOCUMENTATION :: END
<div class="home-platforms-instance-name">
<h4>Most Watched TV</h4>
<a href="info?rating_key=${a['rows'][0]['rating_key']}">
<a href="info?item_id=${a['rows'][0]['rating_key']}">
<h5>${a['rows'][0]['title']}</h5>
</a>
</div>
@ -73,7 +75,7 @@ DOCUMENTATION :: END
<div class="home-platforms-instance">
<li>
<span>
<a href="info?rating_key=${a['rows'][0]['rating_key']}">
<a href="info?item_id=${a['rows'][0]['rating_key']}">
% if a['rows'][0]['grandparent_thumb'] != '':
<img class="home-platforms-instance-poster"
src="pms_image_proxy?img=${a['rows'][0]['grandparent_thumb']}&width=162&height=240&fallback=poster">
@ -85,7 +87,7 @@ DOCUMENTATION :: END
<div class="home-platforms-instance-name">
<h4>Most Popular TV</h4>
<a href="info?rating_key=${a['rows'][0]['rating_key']}">
<a href="info?item_id=${a['rows'][0]['rating_key']}">
<h5>${a['rows'][0]['title']}</h5>
</a>
</div>
@ -100,7 +102,11 @@ DOCUMENTATION :: END
<div class="home-platforms-instance">
<li>
<span>
% if a['rows'][0]['user_id']:
<a href="user?user_id=${a['rows'][0]['user_id']}">
% else:
<a href="user?user=${a['rows'][0]['user']}">
% endif
% if a['rows'][0]['thumb'] != '':
<img class="home-platforms-instance-oval" src="${a['rows'][0]['thumb']}"
class="poster-face">
@ -113,7 +119,11 @@ DOCUMENTATION :: END
<div class="home-platforms-instance-name">
<h4>Most Active User</h4>
% if a['rows'][0]['user_id']:
<a href="user?user_id=${a['rows'][0]['user_id']}">
% else:
<a href="user?user=${a['rows'][0]['user']}">
% endif
<h5>${a['rows'][0]['friendly_name']}</h5>
</a>
</div>

View file

@ -58,9 +58,9 @@ from plexpy import helpers
<div class="span9">
<div class="summary-content-poster hidden-phone hidden-tablet">
% if data['type'] == 'episode':
<img src="pms_image_proxy?img=${data['parent_thumb']}&width=256&height=352">
<img src="pms_image_proxy?img=${data['parent_thumb']}&width=256&height=352&fallback=poster">
% else:
<img src="pms_image_proxy?img=${data['thumb']}&width=256&height=352">
<img src="pms_image_proxy?img=${data['thumb']}&width=256&height=352&fallback=poster">
% endif
</div>
<div class="summary-content">

View file

@ -32,7 +32,7 @@ DOCUMENTATION :: END
<li>
<div class="season-episodes-poster">
<div class="season-episodes-poster-face">
<a href="info?rating_key=${a['rating_key']}">
<a href="info?item_id=${a['rating_key']}">
<img src="pms_image_proxy?img=${a['thumb']}&width=205&height=115"
class="season-episodes-poster-face">
</a>
@ -45,7 +45,7 @@ DOCUMENTATION :: END
</div>
<div class="season-episodes-instance-text-wrapper">
<div class="season-episodes-title">
<a href="info?rating_key=${a['rating_key']}">
<a href="info?item_id=${a['rating_key']}">
"${a['title']}"
</a>
</div>

View file

@ -87,11 +87,11 @@ history_table_options = {
if (rowData['video_decision'] === 'transcode') {
transcode_dec = '<i class="fa fa-server"></i>&nbsp';
}
$(td).html('<div><div style="float: left;"><a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a></div><div style="float: right; text-align: right; padding-right: 5px;">' + transcode_dec + '<i class="fa fa-video-camera"></i></div></div>');
$(td).html('<div><div style="float: left;"><a href="info?source=history&item_id=' + rowData['id'] + '">' + cellData + '</a></div><div style="float: right; text-align: right; padding-right: 5px;">' + transcode_dec + '<i class="fa fa-video-camera"></i></div></div>');
} else if (rowData['media_type'] === 'track') {
$(td).html('<div><div style="float: left;">' + cellData + '</div><div style="float: right; text-align: right; padding-right: 5px;"><i class="fa fa-music"></i></div></div>');
} else {
$(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
$(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
}
}
}

View file

@ -44,7 +44,7 @@ sync_table_options = {
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
if (rowData['metadata_type'] !== 'track') {
$(td).html('<a href="info?rating_key=' + rowData['rating_key'] + '">' + cellData + '</a>');
$(td).html('<a href="info?item_id=' + rowData['rating_key'] + '">' + cellData + '</a>');
} else {
$(td).html(cellData);
}

View file

@ -31,7 +31,7 @@ DOCUMENTATION :: END
<div class="poster">
% if item['type'] == 'season' or item['type'] == 'movie':
<div class="poster-face">
<a href="info?rating_key=${item['rating_key']}">
<a href="info?item_id=${item['rating_key']}">
<img src="pms_image_proxy?img=${item['thumb']}&width=153&height=225&fallback=poster" class="poster-face">
</a>
</div>

View file

@ -34,7 +34,7 @@ DOCUMENTATION :: END
<li>
<div class="poster">
<div class="poster-face">
<a href="info?rating_key=${item['rating_key']}">
<a href="info?item_id=${item['rating_key']}">
<img src="pms_image_proxy?img=${item['thumb']}&width=153&height=225&fallback=poster" class="poster-face">
</a>
</div>