From df59288735bacd6d9d6ff0ff55724448a854401d Mon Sep 17 00:00:00 2001 From: Kristopher Ruzic Date: Tue, 22 Aug 2023 17:45:16 -0600 Subject: [PATCH 1/5] support directory and any item --- addon.py | 2 +- addon.xml | 10 +++++++--- capture.py | 3 +++ shortlistitem.py | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/addon.py b/addon.py index 15ec479..111d3e9 100644 --- a/addon.py +++ b/addon.py @@ -204,7 +204,7 @@ def build_url(query): li.addContextMenuItems( commands ) # Add listitem to directory - xbmcplugin.addDirectoryItem(handle=addon_handle, url=filename, listitem=li) + xbmcplugin.addDirectoryItem(handle=addon_handle, url=filename, listitem=li, isFolder=item.is_folder) count = count + 1 xbmcplugin.endOfDirectory(addon_handle) diff --git a/addon.xml b/addon.xml index 6ad08e0..acd0fb7 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -26,9 +26,13 @@ - + - [!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)] | String.IsEqual(Container.Content,files) + !ListItem.IsFolder + + + + ListItem.IsFolder diff --git a/capture.py b/capture.py index 3ed28b9..c1a8a8d 100644 --- a/capture.py +++ b/capture.py @@ -64,6 +64,9 @@ def main(): item.landscape = sys.listitem.getArt( 'landscape' ) item.icon = sys.listitem.getArt( 'icon' ) + if sys.argv[1] == "folder": + item.is_folder = True + result = addItemToDatabase( dbName, item ) if result: diff --git a/shortlistitem.py b/shortlistitem.py index 90a9004..d8df3d8 100644 --- a/shortlistitem.py +++ b/shortlistitem.py @@ -16,4 +16,4 @@ class ShortlistItem: clearlogo = "" landscape = "" icon = "" - \ No newline at end of file + is_folder = False \ No newline at end of file From ecb27d0a65a38303c02e0fb7adf0af23fc4cbf0b Mon Sep 17 00:00:00 2001 From: Kristopher Ruzic Date: Tue, 22 Aug 2023 17:49:17 -0600 Subject: [PATCH 2/5] update version and add missing strings --- addon.xml | 2 +- resources/language/resource.language.en_gb/strings.po | 6 +++++- resources/language/resource.language.en_us/strings.po | 6 +++++- resources/language/resource.language.fr_fr/strings.po | 6 +++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addon.xml b/addon.xml index acd0fb7..08d74b4 100644 --- a/addon.xml +++ b/addon.xml @@ -31,7 +31,7 @@ !ListItem.IsFolder - + ListItem.IsFolder diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 554db02..9e6401c 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -66,4 +66,8 @@ msgstr "Add to Shortlist" msgctxt "#30013" msgid "Rename Shortlist" -msgstr "Rename Shortlist" \ No newline at end of file +msgstr "Rename Shortlist" + +msgctxt "#30014" +msgid "Add to Shortlist (directory)" +msgstr "Add to Shortlist (directory)" \ No newline at end of file diff --git a/resources/language/resource.language.en_us/strings.po b/resources/language/resource.language.en_us/strings.po index 554db02..9e6401c 100644 --- a/resources/language/resource.language.en_us/strings.po +++ b/resources/language/resource.language.en_us/strings.po @@ -66,4 +66,8 @@ msgstr "Add to Shortlist" msgctxt "#30013" msgid "Rename Shortlist" -msgstr "Rename Shortlist" \ No newline at end of file +msgstr "Rename Shortlist" + +msgctxt "#30014" +msgid "Add to Shortlist (directory)" +msgstr "Add to Shortlist (directory)" \ No newline at end of file diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po index 07df0ec..8f838e5 100644 --- a/resources/language/resource.language.fr_fr/strings.po +++ b/resources/language/resource.language.fr_fr/strings.po @@ -66,4 +66,8 @@ msgstr "Ajouter à la Shortlist" msgctxt "#30013" msgid "Rename Shortlist" -msgstr "Renommer la Shortlist" \ No newline at end of file +msgstr "Renommer la Shortlist" + +msgctxt "#30012" +msgid "Add to Shortlist" +msgstr "Ajouter à la Shortlist (Répertoire)" \ No newline at end of file From 23cf96b15b09b22c3343e6e08be58263c27b51c7 Mon Sep 17 00:00:00 2001 From: Kristopher Ruzic Date: Tue, 22 Aug 2023 17:59:16 -0600 Subject: [PATCH 3/5] fix indentation and add french translation --- addon.xml | 4 ++-- resources/language/resource.language.fr_fr/strings.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addon.xml b/addon.xml index 08d74b4..fc80657 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -35,5 +35,5 @@ ListItem.IsFolder - + diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po index 8f838e5..16ab288 100644 --- a/resources/language/resource.language.fr_fr/strings.po +++ b/resources/language/resource.language.fr_fr/strings.po @@ -68,6 +68,6 @@ msgctxt "#30013" msgid "Rename Shortlist" msgstr "Renommer la Shortlist" -msgctxt "#30012" +msgctxt "#30014" msgid "Add to Shortlist" msgstr "Ajouter à la Shortlist (Répertoire)" \ No newline at end of file From 7f8423ad8daf58ea54440ebd67bc076f4356019d Mon Sep 17 00:00:00 2001 From: Kristopher Ruzic Date: Tue, 22 Aug 2023 22:58:01 -0600 Subject: [PATCH 4/5] move to program group --- addon.xml | 4 ++-- capture.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addon.xml b/addon.xml index fc80657..f650199 100644 --- a/addon.xml +++ b/addon.xml @@ -1,10 +1,10 @@ - + - video + executable Shortlist movies to watch diff --git a/capture.py b/capture.py index c1a8a8d..2c9bf55 100644 --- a/capture.py +++ b/capture.py @@ -66,7 +66,7 @@ def main(): if sys.argv[1] == "folder": item.is_folder = True - + result = addItemToDatabase( dbName, item ) if result: From e59fd37ea0321e6b73d8c6efdf09400dd51b4469 Mon Sep 17 00:00:00 2001 From: Kristopher Ruzic Date: Thu, 24 Aug 2023 00:03:31 -0600 Subject: [PATCH 5/5] fix showing context menu items within the plugin itself --- addon.xml | 4 ++-- capture.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addon.xml b/addon.xml index f650199..80594e2 100644 --- a/addon.xml +++ b/addon.xml @@ -28,11 +28,11 @@ - !ListItem.IsFolder + !ListItem.IsFolder + !String.IsEqual(Container.PluginName,plugin.program.shortlist) - ListItem.IsFolder + ListItem.IsFolder + !String.IsEqual(Container.PluginName,plugin.program.shortlist) diff --git a/capture.py b/capture.py index 2c9bf55..0f4ffe2 100644 --- a/capture.py +++ b/capture.py @@ -31,9 +31,7 @@ # if __name__ == '__main__': def main(): - lst = listDatabases() - # xbmc.log( "; ".join(lst), xbmc.LOGNOTICE); dialog = xbmcgui.Dialog() ret = dialog.contextmenu(lst)