Add PKC setting in "Appearance Tweaks" for dedicated context menu entry "Extras" for movies and TV shows

Author: Croneter

addon.xml

@@ -12,12 +12,22 @@
   </extension>
   <extension point="xbmc.service" library="service.py" start="login">
   </extension>
-  <extension point="kodi.context.item" library="contextmenu.py">
-      <item>
+  <extension point="kodi.context.item">
+    <menu id="kodi.core.main">
+      <item library="context_extras.py">
+        <!-- Extras -->
+        <label>30235</label>
+        <visible>[String.IsEqual(Window(10000).Property(plex_context_show_extras),true) + [[[String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,tvshow)] + !String.IsEmpty(ListItem.DBID)] | !String.IsEmpty(ListItem.Property(plexid))]]</visible>
+        <!-- [String.IsEqual(Window(10000).Property(plex_context_show_extras)) -->
+      </item>
+      <item library="context_menu.py">
+        <!-- Plex options --> 
         <label>30401</label>
-              <description>30416</description>
-              <visible>[!IsEmpty(ListItem.DBID) + !StringCompare(ListItem.DBID,-1) | !IsEmpty(ListItem.Property(plexid))]</visible>
+        <!-- Settings for the Plex Server -->
+        <description>30416</description>
+        <visible>[[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1)] | !String.IsEmpty(ListItem.Property(plexid))]</visible>
       </item>
+    </menu>
   </extension>
   <extension point="xbmc.addon.metadata">
     <!-- see e.g. https://github.com/xbmc/xbmc/pull/14136 -->

context_extras.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+"""
+Grabs the Plex id for the Kodi item the context menu was called for
+and displays a menu displaying extras like trailers.
+"""
+from xbmc import executebuiltin
+
+from resources.lib.contextmenu.common import plex_id_from_listitem
+
+
+def main():
+    plex_id = plex_id_from_listitem()
+    if plex_id is None:
+        return
+    handle = ('plugin://plugin.video.plexkodiconnect?mode=extras&plex_id=%s'
+              % plex_id)
+    executebuiltin('ActivateWindow(videos,\"%s\",return)' % handle)
+
+
+if __name__ == "__main__":
+    main()

context_menu.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+"""
+Grabs kodi_id and kodi_type for the Kodi item the context menu was called for
+and sends a request to our main Python instance that the PKC context menu needs
+to be displayed
+"""
+from urllib.parse import urlencode
+
+from xbmc import sleep
+from xbmcgui import Window
+
+from resources.lib.contextmenu.common import kodi_item_from_listitem
+
+
+def main():
+    kodi_id, kodi_type = kodi_item_from_listitem()
+    args = {
+        'kodi_id': kodi_id,
+        'kodi_type': kodi_type
+    }
+    window = Window(10000)
+    while window.getProperty('plexkodiconnect.command'):
+        sleep(20)
+    window.setProperty('plexkodiconnect.command',
+                       'CONTEXT_menu?%s' % urlencode(args))
+
+
+if __name__ == "__main__":
+    main()

contextmenu.py

@@ -1018,6 +1018,11 @@ msgctxt "#39057"
 msgid "Customize Paths"
 msgstr ""
 
+# PKC Settings - Appearance Tweaks
+msgctxt "#39058"
+msgid "Show 'Extras' in Kodi context menu (reboot Kodi)"
+msgstr ""
+
 # PKC Settings - Appearance Tweaks
 msgctxt "#39059"
 msgid "Recently Added: Append show title to episode"

resources/language/resource.language.en_gb/strings.po

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from xbmc import getInfoLabel
+
+from ..plex_db import PlexDB
+
+
+def kodi_item_from_listitem():
+    kodi_id = getInfoLabel('ListItem.DBID') or None
+    kodi_type = getInfoLabel('ListItem.DBTYPE') or None
+    return int(kodi_id) if kodi_id else None, kodi_type
+
+
+def plex_id_from_listitem():
+    plex_id = getInfoLabel('ListItem.Property(plexid)')
+    plex_id = int(plex_id) if plex_id else None
+    if plex_id is None:
+        kodi_id, kodi_type = kodi_item_from_listitem()
+        if kodi_id is None or kodi_type is None:
+            return
+        with PlexDB(lock=False) as plexdb:
+            item = plexdb.item_by_kodi_id(kodi_id, kodi_type)
+        if item:
+            plex_id = item['plex_id']
+    return plex_id

resources/lib/contextmenu/__init__.py

@@ -3,17 +3,19 @@
 from logging import getLogger
 import xbmc
 
-from .plex_api import API
-from .plex_db import PlexDB
-from . import context
-from . import plex_functions as PF
-from . import utils
-from . import variables as v
-from . import app
+from .common import plex_id_from_listitem
+
+from ..windows import contextmenu as dialog
+
+from ..plex_api import API
+from .. import plex_functions as PF
+from .. import utils
+from .. import variables as v
+from .. import app
 
 ###############################################################################
 
-LOG = getLogger('PLEX.context_entry')
+LOG = getLogger('PLEX.context.menu')
 
 OPTIONS = {
     'Refresh': utils.lang(30410),
@@ -43,7 +45,7 @@ def __init__(self, kodi_id=None, kodi_type=None):
         """
         self.kodi_id = kodi_id
         self.kodi_type = kodi_type
-        self.plex_id = self._get_plex_id(self.kodi_id, self.kodi_type)
+        self.plex_id = plex_id_from_listitem()
         if self.kodi_type:
             self.plex_type = v.PLEX_TYPE_FROM_KODI_TYPE[self.kodi_type]
         else:
@@ -62,23 +64,15 @@ def __init__(self, kodi_id=None, kodi_type=None):
         if self._select_menu():
             self._action_menu()
 
-    @staticmethod
-    def _get_plex_id(kodi_id, kodi_type):
-        plex_id = xbmc.getInfoLabel('ListItem.Property(plexid)') or None
-        if not plex_id and kodi_id and kodi_type:
-            with PlexDB() as plexdb:
-                item = plexdb.item_by_kodi_id(kodi_id, kodi_type)
-            if item:
-                plex_id = item['plex_id']
-        return plex_id
-
     def _select_menu(self):
         """
         Display select dialog
         """
         options = []
         # if user uses direct paths, give option to initiate playback via PMS
-        if self.api and self.api.extras():
+        if (utils.window('plex_context_show_extras') != 'true'
+                and self.api
+                and self.api.extras()):
             options.append(OPTIONS['Extras'])
         if app.SYNC.direct_paths and self.kodi_type in v.KODI_VIDEOTYPES:
             options.append(OPTIONS['PMS_Play'])
@@ -91,7 +85,7 @@ def _select_menu(self):
             options.append(OPTIONS['Delete'])
         # Addon settings
         options.append(OPTIONS['Addon'])
-        context_menu = context.ContextMenu(
+        context_menu = dialog.ContextMenuDialog(
             "script-plex-context.xml",
             v.ADDON_PATH,
             "default",

resources/lib/contextmenu/common.py

@@ -2,7 +2,8 @@
 # -*- coding: utf-8 -*-
 from logging import getLogger
 
-from . import utils, playback, context_entry, transfer, backgroundthread
+from . import utils, playback, transfer, backgroundthread
+from .contextmenu import menu
 
 ###############################################################################
 
@@ -50,6 +51,6 @@ def run(self):
                                       params['offset'],
                                       resolve=resolve)
         elif mode == 'context_menu':
-            context_entry.ContextMenu(kodi_id=params.get('kodi_id'),
-                                      kodi_type=params.get('kodi_type'))
+            menu.ContextMenu(kodi_id=params.get('kodi_id'),
+                             kodi_type=params.get('kodi_type'))
         LOG.debug('Finished PlaybackTask')

resources/lib/context_entry.py resources/lib/contextmenu/menu.py

@@ -90,6 +90,10 @@ def __init__(self):
         for prop in WINDOW_PROPERTIES:
             utils.window(prop, clear=True)
 
+        # Show a dedicated context menu entry for "Extras"?
+        utils.window('plex_context_show_extras',
+                     value=utils.settings('plex_context_show_extras'))
+
         clientinfo.getDeviceId()
 
         self.startup_completed = False

resources/lib/playback_starter.py

@@ -1,15 +1,12 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from logging import getLogger
 import xbmcgui
 
-from . import utils
-from . import path_ops
-from . import variables as v
+from .. import utils
+from .. import path_ops
+from .. import variables as v
 
-###############################################################################
-
-LOG = getLogger('PLEX.context')
+log = getLogger('PLEX.context.dialog')
 
 ACTION_PARENT_DIR = 9
 ACTION_PREVIOUS_MENU = 10
@@ -19,10 +16,8 @@
 LIST = 155
 USER_IMAGE = 150
 
-###############################################################################
-
 
-class ContextMenu(xbmcgui.WindowXMLDialog):
+class ContextMenuDialog(xbmcgui.WindowXMLDialog):
     def __init__(self, *args, **kwargs):
         self._options = []
         self.selected_option = None
@@ -45,7 +40,7 @@ def onInit(self):
         if utils.window('plexAvatar'):
             self.getControl(USER_IMAGE).setImage(utils.window('plexAvatar'))
         height = 479 + (len(self._options) * 55)
-        LOG.debug("options: %s", self._options)
+        log.debug("options: %s", self._options)
         self.list_ = self.getControl(LIST)
         for option in self._options:
             self.list_.addItem(self._add_listitem(option))
@@ -60,7 +55,7 @@ def onAction(self, action):
             if self.getFocusId() == LIST:
                 option = self.list_.getSelectedItem()
                 self.selected_option = option.getLabel()
-                LOG.info('option selected: %s', self.selected_option)
+                log.info('option selected: %s', self.selected_option)
                 self.close()
 
     def _add_editcontrol(self, x, y, height, width, password=None):

resources/lib/service_entry.py

@@ -167,6 +167,7 @@
 	-->
 
 	<category label="39073"><!-- Appearance Tweaks -->
+        <setting id="plex_context_show_extras" type="bool" label="39058" default="true" /><!-- Show 'Extras' in Kodi context menu (reboot Kodi) -->
         <setting label="[COLOR yellow]$ADDON[plugin.video.plexkodiconnect 39085][/COLOR]" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect?mode=refreshplaylist)" option="close" /><!-- Reload Kodi node files to apply all the settings below -->
         <setting id="widgetLimit" type="slider" label="39077" default="30" range="10,10,100" option="int" /><!-- Maximum number of videos to show in widgets -->
         <setting type="lsep" />