Switch from add-on playback to new playback method using a webservice

default.py

@@ -39,7 +39,21 @@ def __init__(self):
         mode = params.get('mode', '')
         itemid = params.get('id', '')
 
-        if mode == 'play':
+        if mode == 'playstrm':
+            while not utils.window('plex.playlist.play'):
+                xbmc.sleep(25)
+                if utils.window('plex.playlist.aborted'):
+                    LOG.info("playback aborted")
+                    break
+            else:
+                LOG.info("Playback started")
+                xbmcplugin.setResolvedUrl(int(argv[1]),
+                                          False,
+                                          xbmcgui.ListItem())
+            utils.window('plex.playlist.play', clear=True)
+            utils.window('plex.playlist.aborted', clear=True)
+
+        elif mode == 'play':
             self.play()
 
         elif mode == 'plex_node':

resources/lib/app/playstate.py

@@ -53,12 +53,25 @@ def __init__(self):
         }
         self.played_info = {}
 
-        # Set by SpecialMonitor - did user choose to resume playback or start from the
-        # beginning?
-        self.resume_playback = False
+        # Set by SpecialMonitor - did user choose to resume playback or start
+        # from the beginning?
+        # Do set to None if NO resume dialog is displayed! True/False otherwise
+        self.resume_playback = None
+        # Don't ask user whether to resume but immediatly resume
+        self.autoplay = False
         # Was the playback initiated by the user using the Kodi context menu?
         self.context_menu_play = False
-        # Set by context menu - shall we force-transcode the next playing item?
-        self.force_transcode = False
-        # Which Kodi player is/has been active? (either int 1, 2 or 3)
+        # Which Kodi player is/has been active? (either int 0, 1, 2)
         self.active_players = set()
+        # Have we initiated playback via Plex Companion or Alexa - so from the
+        # Plex side of things?
+        self.initiated_by_plex = False
+        # PKC adds/replaces items in the playqueue. We need to use
+        # xbmcplugin.setResolvedUrl() AFTER an item has successfully been added
+        # This flag is set by Kodimonitor/xbmc.Monitor() and the Playlist.OnAdd
+        # signal only when the currently playing item that called the
+        # webservice has successfully been processed
+        self.playlist_ready = False
+        # Flag for Kodimonitor to check when the correct item has been
+        # processed and the Playlist.OnAdd signal has been received
+        self.playlist_start_pos = None

resources/lib/context_entry.py

@@ -7,7 +7,7 @@
 
 from .plex_api import API
 from .plex_db import PlexDB
-from . import context, plex_functions as PF, playqueue as PQ
+from . import context, plex_functions as PF
 from . import utils, variables as v, app
 
 ###############################################################################
@@ -112,8 +112,7 @@ def _action_menu(self):
         """
         selected = self._selected_option
         if selected == OPTIONS['Transcode']:
-            app.PLAYSTATE.force_transcode = True
-            self._PMS_play()
+            self._PMS_play(transcode=True)
         elif selected == OPTIONS['PMS_Play']:
             self._PMS_play()
         elif selected == OPTIONS['Extras']:
@@ -139,17 +138,21 @@ def _delete_item(self):
             if PF.delete_item_from_pms(self.plex_id) is False:
                 utils.dialog("ok", heading="{plex}", line1=utils.lang(30414))
 
-    def _PMS_play(self):
+    def _PMS_play(self, transcode=False):
         """
         For using direct paths: Initiates playback using the PMS
         """
-        playqueue = PQ.get_playqueue_from_type(
-            v.KODI_PLAYLIST_TYPE_FROM_KODI_TYPE[self.kodi_type])
-        playqueue.clear()
-        app.PLAYSTATE.context_menu_play = True
-        handle = self.api.path(force_first_media=False, force_addon=True)
-        handle = 'RunPlugin(%s)' % handle
-        xbmc.executebuiltin(handle.encode('utf-8'))
+        path = ('http://127.0.0.1:%s/plex/play/file.strm?plex_id=%s'
+                % (v.WEBSERVICE_PORT, self.plex_id))
+        if self.plex_type:
+            path += '&plex_type=%s' % self.plex_type
+        if self.kodi_id:
+            path += '&kodi_id=%s' % self.kodi_id
+        if self.kodi_type:
+            path += '&kodi_type=%s' % self.kodi_type
+        if transcode:
+            path += '&transcode=true'
+        xbmc.executebuiltin(('PlayMedia(%s)' % path).encode('utf-8'))
 
     def _extras(self):
         """

resources/lib/entrypoint.py

@@ -217,7 +217,8 @@ def show_listing(xml, plex_type=None, section_id=None, synched=True, key=None,
         # Need to chain keys for navigation
         widgets.KEY = key
     # Process all items to show
-    widgets.attach_kodi_ids(xml)
+    if synched:
+        widgets.attach_kodi_ids(xml)
     all_items = widgets.process_method_on_list(widgets.generate_item, xml)
     all_items = widgets.process_method_on_list(widgets.prepare_listitem,
                                                all_items)

resources/lib/itemtypes/movies.py

@@ -72,10 +72,12 @@ def add_update(self, xml, section, children=None):
                                                    scraper='metadata.local')
         if do_indirect:
             # Set plugin path and media flags using real filename
-            filename = api.file_name(force_first_media=True)
-            path = 'plugin://%s.movies/' % v.ADDON_ID
-            filename = ('%s?plex_id=%s&plex_type=%s&mode=play&filename=%s'
-                        % (path, plex_id, v.PLEX_TYPE_MOVIE, filename))
+            path = 'http://127.0.0.1:%s/plex/kodi/movies/' % v.WEBSERVICE_PORT
+            filename = '{0}/file.strm?kodi_id={1}&kodi_type={2}&plex_id={0}&plex_type={3}'
+            filename = filename.format(plex_id,
+                                       kodi_id,
+                                       v.KODI_TYPE_MOVIE,
+                                       v.PLEX_TYPE_MOVIE)
             playurl = filename
             kodi_pathid = self.kodidb.get_path(path)
 

resources/lib/itemtypes/tvshows.py

@@ -180,7 +180,8 @@ def add_update(self, xml, section, children=None):
                                              scraper='metadata.local')
         else:
             # Set plugin path
-            toplevelpath = "plugin://%s.tvshows/" % v.ADDON_ID
+            toplevelpath = ('http://127.0.0.1:%s/plex/kodi/shows/'
+                            % v.WEBSERVICE_PORT)
             path = "%s%s/" % (toplevelpath, plex_id)
             # Do NOT set a parent id because addon-path cannot be "stacked"
             toppathid = None
@@ -448,22 +449,25 @@ def add_update(self, xml, section, children=None):
         if do_indirect:
             # Set plugin path - do NOT use "intermediate" paths for the show
             # as with direct paths!
-            filename = api.file_name(force_first_media=True)
-            path = 'plugin://%s.tvshows/%s/' % (v.ADDON_ID, show_id)
-            filename = ('%s?plex_id=%s&plex_type=%s&mode=play&filename=%s'
-                        % (path, plex_id, v.PLEX_TYPE_EPISODE, filename))
+            # Set plugin path and media flags using real filename
+            path = ('http://127.0.0.1:%s/plex/kodi/shows/%s/'
+                    % (v.WEBSERVICE_PORT, show_id))
+            filename = '{0}/file.strm?kodi_id={1}&kodi_type={2}&plex_id={0}&plex_type={3}'
+            filename = filename.format(plex_id,
+                                       kodi_id,
+                                       v.KODI_TYPE_EPISODE,
+                                       v.PLEX_TYPE_EPISODE)
             playurl = filename
             # Root path tvshows/ already saved in Kodi DB
-            kodi_pathid = self.kodidb.add_path(path)
-            if not app.SYNC.direct_paths:
-                # need to set a 2nd file entry for a path without plex show id
-                # This fixes e.g. context menu and widgets working as they
-                # should
-                # A dirty hack, really
-                path_2 = 'plugin://%s.tvshows/' % v.ADDON_ID
-                # filename_2 is exactly the same as filename
-                # so WITH plex show id!
-                kodi_pathid_2 = self.kodidb.add_path(path_2)
+            kodi_pathid = self.kodidb.get_path(path)
+            # HACK
+            # need to set a 2nd file entry for a path without plex show id
+            # This fixes e.g. context menu and widgets working as they
+            # should
+            path_2 = 'http://127.0.0.1:%s/plex/kodi/shows/' % v.WEBSERVICE_PORT
+            # filename_2 is exactly the same as filename
+            # so WITH plex show id!
+            kodi_pathid_2 = self.kodidb.add_path(path_2)
 
         # UPDATE THE EPISODE #####
         if update_item:

resources/lib/kodi_db/video.py

@@ -5,12 +5,12 @@
 from sqlite3 import IntegrityError
 
 from . import common
-from .. import path_ops, timing, variables as v, app
+from .. import path_ops, timing, variables as v
 
 LOG = getLogger('PLEX.kodi_db.video')
 
-MOVIE_PATH = 'plugin://%s.movies/' % v.ADDON_ID
-SHOW_PATH = 'plugin://%s.tvshows/' % v.ADDON_ID
+MOVIE_PATH = 'http://127.0.0.1:%s/plex/kodi/movies/' % v.WEBSERVICE_PORT
+SHOW_PATH = 'http://127.0.0.1:%s/plex/kodi/shows/' % v.WEBSERVICE_PORT
 
 
 class KodiVideoDB(common.KodiDBBase):
@@ -174,15 +174,17 @@ def modify_file(self, filename, path_id, date_added):
     def obsolete_file_ids(self):
         """
         Returns a generator for idFile of all Kodi file ids that do not have a
-        dateAdded set (dateAdded NULL) and the filename start with
-        'plugin://plugin.video.plexkodiconnect'
-        These entries should be deleted as they're created falsely by Kodi.
-        """
-        return (x[0] for x in self.cursor.execute('''
-            SELECT idFile FROM files
-            WHERE dateAdded IS NULL
-            AND strFilename LIKE \'plugin://plugin.video.plexkodiconnect%\'
-            '''))
+        dateAdded set (dateAdded NULL) and the associated path entry has
+        a field noUpdate of NULL as well as dateAdded of NULL
+        """
+        return (x[0] for x in self.cursor.execute("""
+            SELECT files.idFile
+            FROM files
+            LEFT JOIN path ON path.idPath = files.idPath
+            WHERE files.dateAdded IS NULL
+            AND path.noUpdate IS NULL
+            AND path.dateAdded IS NULL
+            """))
 
     def show_id_from_path(self, path):
         """