Merge pull request #1628 from croneter/py3-stream

Refactor usage of a media part's id

resources/lib/playback_decision.py

@@ -328,19 +328,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):

resources/lib/plex_api/base.py

@@ -262,6 +262,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.

resources/lib/variables.py

@@ -88,17 +88,14 @@ MIN_DB_VERSION = '3.2.1'
 
 # Supported databases - version numbers in tuples should decrease
 SUPPORTED_VIDEO_DB = {
-    # Kodi 19 - EXTREMLY EXPERIMENTAL!
     19: (119, ),
     20: (119, ),
 }
 SUPPORTED_MUSIC_DB = {
-    # Kodi 19 - EXTREMLY EXPERIMENTAL!
     19: (82, ),
     20: (82, ),
 }
 SUPPORTED_TEXTURE_DB = {
-    # Kodi 19 - EXTREMLY EXPERIMENTAL!
     19: (13, ),
     20: (13, ),
 }