anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix retrieving metadata for info page for Live TV without section_id"

Browse Source 
This reverts commit 6fce31e1b9.
This commit is contained in:
JonnyWong16
2020-02-22 14:08:49 -08:00
parent 60d577f95e
commit 9d13c29bf6
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plexpy/datafactory.py
View File

@@ -21,7 +21,6 @@ import common
import database import database
import datatables import datatables
import helpers import helpers
import libraries
import logger import logger
import pmsconnect import pmsconnect
import session import session
@@ -1037,6 +1036,7 @@ class DataFactory(object):
'session_history_metadata.grandparent_rating_key, session_history_metadata.title, ' \ 'session_history_metadata.grandparent_rating_key, session_history_metadata.title, ' \
'session_history_metadata.parent_title, session_history_metadata.grandparent_title, ' \ 'session_history_metadata.parent_title, session_history_metadata.grandparent_title, ' \
'session_history_metadata.original_title, session_history_metadata.full_title, ' \ 'session_history_metadata.original_title, session_history_metadata.full_title, ' \
'library_sections.section_name, ' \
'session_history_metadata.media_index, session_history_metadata.parent_media_index, ' \ 'session_history_metadata.media_index, session_history_metadata.parent_media_index, ' \
'session_history_metadata.section_id, session_history_metadata.thumb, ' \ 'session_history_metadata.section_id, session_history_metadata.thumb, ' \
'session_history_metadata.parent_thumb, session_history_metadata.grandparent_thumb, ' \ 'session_history_metadata.parent_thumb, session_history_metadata.grandparent_thumb, ' \
@@ -1055,6 +1055,7 @@ class DataFactory(object):
'session_history_metadata.channel_call_sign, session_history_metadata.channel_identifier, ' \ 'session_history_metadata.channel_call_sign, session_history_metadata.channel_identifier, ' \
'session_history_metadata.channel_thumb ' \ 'session_history_metadata.channel_thumb ' \
'FROM session_history_metadata ' \ 'FROM session_history_metadata ' \
'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \
'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \
'WHERE %s ' \ 'WHERE %s ' \
'ORDER BY session_history_metadata.id DESC ' \ 'ORDER BY session_history_metadata.id DESC ' \
@@ -1066,13 +1067,6 @@ class DataFactory(object):
metadata_list = [] metadata_list = []
for item in result: for item in result:
if item['section_id']:
library_data = libraries.Libraries()
library_details = library_data.get_details(section_id=item['section_id'])
section_name = library_details['section_name']
else:
section_name = ''
directors = item['directors'].split(';') if item['directors'] else [] directors = item['directors'].split(';') if item['directors'] else []
writers = item['writers'].split(';') if item['writers'] else [] writers = item['writers'].split(';') if item['writers'] else []
actors = item['actors'].split(';') if item['actors'] else [] actors = item['actors'].split(';') if item['actors'] else []
@@ -1123,7 +1117,7 @@ class DataFactory(object):
'actors': actors, 'actors': actors,
'genres': genres, 'genres': genres,
'labels': labels, 'labels': labels,
'library_name': section_name, 'library_name': item['section_name'],
'section_id': item['section_id'], 'section_id': item['section_id'],
'live': item['live'], 'live': item['live'],
'media_info': media_info 'media_info': media_info