From 887f659b2fc1df5d4924fb9e8fcc31416b5a5130 Mon Sep 17 00:00:00 2001 From: croneter Date: Mon, 13 Sep 2021 14:35:58 +0200 Subject: [PATCH] Refactor usage of a media part's id --- resources/lib/playback_decision.py | 13 +++---------- resources/lib/plex_api/base.py | 6 ++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/resources/lib/playback_decision.py b/resources/lib/playback_decision.py index aa8f3ba5..c7164faf 100644 --- a/resources/lib/playback_decision.py +++ b/resources/lib/playback_decision.py @@ -329,19 +329,12 @@ def audio_subtitle_prefs(api, item): Returns None if user cancelled or we need to abort, True otherwise """ # Set media and part where we're at - if (api.mediastream is None and - api.mediastream_number() is None): + if api.mediastream is None and api.mediastream_number() is None: return - try: - mediastreams = api.plex_media_streams() - except (TypeError, IndexError): - LOG.error('Could not get media %s, part %s', - api.mediastream, api.part) - return - part_id = mediastreams.attrib['id'] if item.playmethod != v.PLAYBACK_METHOD_TRANSCODE: return True - return setup_transcoding_audio_subtitle_prefs(mediastreams, part_id) + return setup_transcoding_audio_subtitle_prefs(api.plex_media_streams(), + api.part_id()) def setup_transcoding_audio_subtitle_prefs(mediastreams, part_id): diff --git a/resources/lib/plex_api/base.py b/resources/lib/plex_api/base.py index b1385fed..183166a9 100644 --- a/resources/lib/plex_api/base.py +++ b/resources/lib/plex_api/base.py @@ -256,6 +256,12 @@ class Base(object): """ return self.xml[self.mediastream][self.part] + def part_id(self): + """ + Returns the unique id of the currently active part [int] + """ + return int(self.xml[self.mediastream][self.part].attrib['id']) + def plot(self): """ Returns the plot or None.