From 9d13c29bf62bab849d9eb5aa7f3eb805a6bc6662 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 22 Feb 2020 14:08:49 -0800 Subject: [PATCH] Revert "Fix retrieving metadata for info page for Live TV without section_id" This reverts commit 6fce31e1b9f79a85d05c390acac02b643a82812b. --- plexpy/datafactory.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 70cf8264..006664c4 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -21,7 +21,6 @@ import common import database import datatables import helpers -import libraries import logger import pmsconnect import session @@ -1037,6 +1036,7 @@ class DataFactory(object): 'session_history_metadata.grandparent_rating_key, session_history_metadata.title, ' \ 'session_history_metadata.parent_title, session_history_metadata.grandparent_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.section_id, session_history_metadata.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_thumb ' \ '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 ' \ 'WHERE %s ' \ 'ORDER BY session_history_metadata.id DESC ' \ @@ -1066,13 +1067,6 @@ class DataFactory(object): metadata_list = [] 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 [] writers = item['writers'].split(';') if item['writers'] else [] actors = item['actors'].split(';') if item['actors'] else [] @@ -1123,7 +1117,7 @@ class DataFactory(object): 'actors': actors, 'genres': genres, 'labels': labels, - 'library_name': section_name, + 'library_name': item['section_name'], 'section_id': item['section_id'], 'live': item['live'], 'media_info': media_info