Detect playback from a Kodi playlist

resources/lib/kodimonitor.py

@@ -346,8 +346,14 @@ class KodiMonitor(xbmc.Monitor):
                 return
         playqueue = PQ.PLAYQUEUES[playerid]
         info = js.get_player_props(playerid)
-        pos = info['position'] if info['position'] != -1 else 0
-        LOG.debug('Detected position %s for %s', pos, playqueue)
+        if playqueue.kodi_playlist_playback:
+            # Kodi will tell us the wrong position - of the playlist, not the
+            # playqueue, when user starts playing from a playlist :-(
+            pos = 0
+            LOG.debug('Detected playback from a Kodi playlist')
+        else:
+            pos = info['position'] if info['position'] != -1 else 0
+            LOG.debug('Detected position %s for %s', pos, playqueue)
         status = state.PLAYER_STATES[playerid]
         kodi_id = data.get('id')
         kodi_type = data.get('type')

resources/lib/playback.py

@@ -66,7 +66,7 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
         pos = js.get_position(playqueue.playlistid)
     except KeyError:
         LOG.info('No position returned from Kodi player! Assuming playlist')
-        _playlist_playback(plex_id, plex_type, playqueue)
+        _playlist_playback(plex_id, plex_type)
     else:
         # Can return -1 (as in "no playlist")
         pos = pos if pos != -1 else 0
@@ -85,19 +85,25 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
             _conclude_playback(playqueue, pos)
 
 
-def _playlist_playback(plex_id, plex_type, playqueue):
+def _playlist_playback(plex_id, plex_type):
     """
     Really annoying Kodi behavior: Kodi will throw the ENTIRE playlist some-
     where, causing Playlist.onAdd to fire for each item like this:
     Playlist.OnAdd Data: {u'item': {u'type': u'episode', u'id': 164},
                           u'playlistid': 0,
                           u'position': 2}
-    This does NOT work for Addon paths, type and id will be unknown
+    This does NOT work for Addon paths, type and id will be unknown:
+        {u'item': {u'type': u'unknown'},
+         u'playlistid': 0,
+         u'position': 7}
     At the end, only the element being played actually shows up in the Kodi
     playqueue.
     Hence: if we fail the first addon paths call, Kodi will start playback
     for the next item in line :-)
+    (by the way: trying to get active Kodi player id will return [])
     """
+    # Kodi bug: playqueue will ALWAYS be audio playqueue
+    playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_AUDIO)
     playqueue.clear(kodi=False)
     xml = GetPlexMetadata(plex_id)
     try:
@@ -109,8 +115,8 @@ def _playlist_playback(plex_id, plex_type, playqueue):
         _ensure_resolve(abort=True)
         return
     playlist_item = PL.playlist_item_from_xml(xml[0])
-    playlist_item.part = 0
     playqueue.items.append(playlist_item)
+    playqueue.kodi_playlist_playback = True
     _conclude_playback(playqueue, pos=0)
 
 

resources/lib/playlist_func.py

@@ -138,6 +138,9 @@ class Playqueue_Object(PlaylistObjectBaseclase):
         self.pkc_edit = False
         # Workaround to avoid endless loops of detecting PL clears
         self._clear_list = []
+        # To keep track if Kodi playback was initiated from a Kodi playlist
+        # There are a couple of pitfalls, unfortunately...
+        self.kodi_playlist_playback = False
         PlaylistObjectBaseclase.__init__(self)
 
     def is_pkc_clear(self):