Significant efactor

Add Context Menu items
Add support for Addons & PVR (PVR not fully working yet)
Tidy-ups
Use direct xbmc.whatever rather than JSON-RPC where possible
Use updated scipt.module.bossanova808 (yet to submit)
Playback/PlaybackList move to scipt.module.bossanova808

Author: bossanova808

addon.xml

@@ -11,21 +11,34 @@
     <extension point="xbmc.python.pluginsource" library="plugin.py">
 		<provides>video audio</provides>
 	</extension>
+    <!-- ...and a context menu extension point -->
+    <extension point="kodi.context.item">
+        <menu id="kodi.core.main">
+            <item library="context_menu.py" args="switchback">
+                <label>Switchback: $INFO[Window(Home).Property(Switchback_Item)]</label>
+                <visible>Integer.IsGreater(Window(Home).Property(Switchback_List_Length),1)</visible>
+            </item>
+            <item library="context_menu.py" args="switchback_list">
+                <label>32008</label>
+                <visible>Integer.IsGreater(Window(Home).Property(Switchback_List_Length),0)</visible>
+            </item>
+        </menu>
+    </extension>
     <extension point="xbmc.addon.metadata">
         <summary lang="en_GB">Utility for fast switching between recently played media.</summary>
         <description lang="en_GB">
 Kodi utility for fast switching between recently played media.
 
 Keeps a list of recently played media - supports Kodi library episodes, movies, PVR channels, songs and non-library files.  Does not (yet?) support add-ons or PVR recordings.
 
-The primary intended use is to make for super easy Switchback between two in progress videos (by binding a remote key to Switchback, see Wiki/Forum thread for info).
+The primary intended use is to make for super easy Switchback between two in-progress videos (by binding a remote key to Switchback, see Wiki/Forum thread for info).
 
 Consider this scenario:
-- You are watching 'video A' with your partner.  You are interrupted and your partner needs to tend to the kids/howl at the moon.
-- You navigate to 'video B' and watch some of that.
-- Your partner comes back.
-- You hit your one button 'Switchback' and 'video A' starts playing again, no need for tedious navigation etc.
-- You are interrupted again - the moon is so very bright tonight - hit your 'Switchback' to resume 'video B' immediately, again with one magic button and no tedious navigation.
+— You are watching 'video A' with your partner.  You're interrupted, and your partner needs to tend to the kids/howl at the moon.
+— You navigate to 'video B' and watch some of that.
+— Your partner comes back.
+— You hit your one button 'Switchback' and 'video A' starts playing again, no need for tedious navigation etc.
+— You're interrupted - again - (the moon is so very bright tonight!) hit your 'Switchback' to resume 'video B' immediately, again with one magic button and no tedious navigation.
         </description>
         <platform>all</platform>
         <license>GPL-3.0-only</license>

context_menu.py

@@ -0,0 +1,9 @@
+from bossanova808 import exception_logger
+from resources.lib import switchback_context_menu
+import sys
+
+if __name__ == "__main__":
+    with exception_logger.log_exception():
+        # args would be passed through, if there were any...
+        # <itemlibrary = "context_menu.py" args="something">
+        switchback_context_menu.run(sys.argv[1:])

plugin.py

@@ -5,5 +5,3 @@
 if __name__ == "__main__":
     with exception_logger.log_exception():
         switchback_plugin.run(sys.argv[1:])
-
-

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

@@ -1,17 +1,17 @@
 # Kodi Media Center language file
 msgid ""
 msgstr ""
-"Project-Id-Version: XBMC-Addons\n"
-"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
-"POT-Creation-Date: 2020-04-26 11:43+0000\n"
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: English (https://kodi.weblate.cloud/languages/en_gb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#32000"
 msgid "General"
@@ -25,14 +25,18 @@ msgctxt "#32002"
 msgid "Maximum Switchback list length"
 msgstr ""
 
-msgctxt "#32003"
-msgid "Include Music Playbacks?"
+msgctxt "#32004"
+msgid "Delete from Switchback list"
 msgstr ""
 
-msgctxt "#32004"
-msgid "Delete playback from Switchback list"
+msgctxt "#32006"
+msgid "Save Switchback list across Kodi sessions?"
 msgstr ""
 
-msgctxt "#32005"
-msgid "Filter watched items out of the Switchback list?"
-msgstr ""
+msgctxt "#32007"
+msgid "No Switchback found to play"
+msgstr ""
+
+msgctxt "#32008"
+msgid "Switchback: List"
+msgstr ""

resources/lib/monitor.py

@@ -1,25 +1,15 @@
 from bossanova808.logger import Logger
 from resources.lib.store import Store
 import xbmc
-import json
 
 
 class KodiEventMonitor(xbmc.Monitor):
 
+    # noinspection PyUnusedLocal
     def __init__(self, *args, **kwargs):
         xbmc.Monitor.__init__(self)
         Logger.debug('KodiEventMonitor __init__')
 
     def onSettingsChanged(self):
         Logger.info('onSettingsChanged - reload them.')
         Store.load_config_from_settings()
-
-    # noinspection PyMethodMayBeStatic
-    def onAbortRequested(self):
-        Logger.debug('onAbortRequested')
-
-    def onNotification(self, sender, method, data):
-        if method == 'Player.OnStop':
-            data = json.loads(data)
-            Logger.debug("Notification:")
-            Logger.debug(data)