From be9a1dcf0687b26621a0e39a4bd1df534734de71 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 19 Aug 2017 20:48:01 -0700 Subject: [PATCH] Temporary fix for incorrect source media info --- plexpy/activity_processor.py | 10 +++++----- plexpy/pmsconnect.py | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index 79ab36af..9605f796 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -220,7 +220,7 @@ class ActivityProcessor(object): if not is_import: logger.debug(u"PlexPy ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key']) pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_metadata_details(rating_key=str(session['rating_key'])) + result = pms_connect.get_metadata_details(rating_key=str(session['rating_key']), get_media_info=True) if result and result['metadata']: metadata = result['metadata'] else: @@ -293,10 +293,10 @@ class ActivityProcessor(object): '(last_insert_rowid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)' args = [session['rating_key'], session['video_decision'], session['audio_decision'], - session['duration'], session['width'], session['height'], session['container'], - session['video_codec'], session['audio_codec'], session['bitrate'], - session['video_resolution'], session['video_framerate'], session['aspect_ratio'], - session['audio_channels'], session['transcode_protocol'], session['transcode_container'], + metadata['duration'], metadata['width'], metadata['height'], metadata['container'], + metadata['video_codec'], metadata['audio_codec'], metadata['bitrate'], + metadata['video_resolution'], metadata['video_framerate'], metadata['aspect_ratio'], + metadata['audio_channels'], session['transcode_protocol'], session['transcode_container'], session['transcode_video_codec'], session['transcode_audio_codec'], session['transcode_audio_channels'], session['transcode_width'], session['transcode_height'], session['transcode_decision']] diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index 71d06ac9..3201c637 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -881,6 +881,9 @@ class PmsConnect(object): 'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'), 'audio_codec': helpers.get_xml_attr(media, 'audioCodec'), 'audio_channels': helpers.get_xml_attr(media, 'audioChannels'), + 'aspect_ratio': helpers.get_xml_attr(media, 'aspectRatio'), + 'width': helpers.get_xml_attr(media, 'width'), + 'height': helpers.get_xml_attr(media, 'height'), 'file': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'file'), 'file_size': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'size'), }