Matrix SF Version 2.2.1

Author: jmooremcc

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.super.favourites" name="Super Favourites" version="2.1.0" provider-name="jmooremcc, spoyser">
+<addon id="plugin.program.super.favourites" name="Super Favourites" version="2.2.1" provider-name="jmooremcc, spoyser">
   <requires>
     <import addon="xbmc.python" version="3.0.0" />
     <import addon="script.module.metahandler" optional="true" />
@@ -34,6 +34,9 @@
     </assets>
 
     <news>
+2.2.1 February 2022
+      - Minor Bug Fix
+
 2.2.0 December 2021
       - Fixed Play From Here functionality
       - Fixed handling of local folders so that back button now works correctly

changelog.txt

@@ -1,6 +1,9 @@
 [B][COLOR chartreuse]This file contains ALOT of useful information regarding the functionality of Super Favourites[CR]
 PLEASE READ IT!![/COLOR][/B]
 
+[COLOR chartreuse]2.2.1 February 2022[/COLOR]
+      - Minor Bug Fix
+
 [COLOR chartreuse]2.2.0 December 2021[/COLOR]
       - Fixed Play From Here functionality
       - Fixed handling of local folders so that back button now works correctly

default.py

@@ -804,9 +804,9 @@ def iExplore(path=None):
         label, index = utils.addPrefixToLabel(index, label)
 
         menu = []
-            
+
         if isFile:
-            menu.append((GETTEXT(30230), 'RunPlugin(%s?mode=%d&path=%s)' % (sys.argv[0], _PLAY_FOLDER, quote_plus(url))))
+            menu.append((GETTEXT(30230), 'RunPlugin(%s?mode=%d&path=%s)' % (sys.argv[0], _PLAY_FOLDER_FROM_HERE, quote_plus(url))))
             menu.append((GETTEXT(30047), 'RunPlugin(%s?mode=%d&path=%s&label=%s&thumb=%s)' % (sys.argv[0], _COPY_PLAY_TO_SF_ITEM, quote_plus(url), quote_plus(title), quote_plus(file))))
             addDir(label, _PLAY_FILE, path=url, thumbnail=file, isFolder=False, menu=menu, infolabels={'plot':GETTEXT(30229) % title})
         else:

player.py

@@ -171,8 +171,6 @@ def activateWindowCommand(cmd):
             elif 'mode=' in plugin.lower():
                 utils.log("xbmc.executebuiltin(cmd)")
                 xbmc.executebuiltin(cmd)
-            # elif pluginArgs:
-            #     xbmc.executebuiltin(cmd)
             else:
                 utils.log("xbmc.executebuiltin('RunPlugin(%s)' % plugin)")
                 xbmc.executebuiltin('RunPlugin(%s)' % plugin)
@@ -184,37 +182,22 @@ def activateWindowCommand(cmd):
         folderpath = xbmc.getInfoLabel('Container.FolderPath')
         utils.log(f"***folder path: {folderpath}")
         prop = xbmcgui.Window(10000).getProperty(property)
-        # import web_pdb; web_pdb.set_trace()
 
         if plugin:
             utils.log("Plugin Without Args Called...")
-            # utils.log("Calling RungPlugin...")
-            # xbmc.executebuiltin('RunPlugin(%s)' % plugin)
             path = plugin.split(',', 1)[0]
 
             if not prop:
-                import web_pdb; web_pdb.set_trace()
-                # xbmc.executebuiltin('Dialog.Close(busydialog)')
                 xbmcgui.Window(10000).setProperty(property, folderpath)
-                # xbmcgui.executebuiltin(f"ActivateWindow(10025, {path}, return)")
                 xbmcplugin.endOfDirectory(int(sys.argv[1]), cacheToDisc=True)
                 xbmc.executebuiltin('Container.Update(%s)' % path)
             else:
-                import web_pdb; web_pdb.set_trace()
                 xbmcgui.Window(10000).clearProperty(property)
-                # path = prop.split(',', 1)[0]
-                # xbmc.executebuiltin('Container.Update(%s)' % path)
-                # xbmcplugin.endOfDirectory(int(sys.argv[1]), cacheToDisc=False)
-
-                # xbmcgui.Action(ACTION_PARENT_DIR)
-                # xbmcplugin.endOfDirectory(int(sys.argv[1]), cacheToDisc=False)
         else: # Folder or Directory Resource
-            # import web_pdb; web_pdb.set_trace()
             path = os.path.normpath(cmd.split(',', 2)[1])
             utils.log("Directory Resource Called...")
 
             if not prop:
-                utils.resetTotal_time()
                 xbmcgui.Window(10000).setProperty(property, path)
                 xbmc.executebuiltin(f"Container.Update({path})")
                 xbmcplugin.endOfDirectory(int(sys.argv[1]), cacheToDisc=True)

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

@@ -1256,3 +1256,6 @@ msgctxt "#35046"
 msgid "          Show on Super Favourites context menu"
 msgstr ""
 
+msgctxt "#35047"
+msgid "          Download Cancelled"
+msgstr ""