Merge pull request #4695 from rickeylohia/plugin.video.stalkervod.v1.1.0

basrieter · web-flow · commit 18eb6c1a5794 · 2025-08-03T17:35:26.000+02:00
[plugin.video.stalkervod] v1.1.0
diff --git a/plugin.video.stalkervod/README.md b/plugin.video.stalkervod/README.md
@@ -5,4 +5,7 @@ v1.0.0  (2024-07-13)
 - Major version release with refactor of the menu options. Support for portal with separate menu option for Series.
 If using kodi Add to Favourites option, existing Favourites link would break.
 Ability to use Portal Favorite option for both VOD and TV Channels
-Add support for UpNext addon.
+Add support for UpNext addon.
+
+v1.1.0  (2025-07-26)
+- Add search to directory listing for TV and VOD
diff --git a/plugin.video.stalkervod/addon.xml b/plugin.video.stalkervod/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.stalkervod" name="Stalker VOD Client" version="1.0.0" provider-name="rickey">
+<addon id="plugin.video.stalkervod" name="Stalker VOD Client" version="1.1.0" provider-name="rickey">
 	<requires>
 		<import addon="xbmc.python" version="3.0.1"/>
 		<import addon="script.module.requests" version="2.27.1"/>
@@ -30,6 +30,9 @@ v1.0.0  (2024-07-13)
 If using kodi Add to Favourites option, existing Favourites link would break.
 Ability to use Portal Favorite option for both VOD and TV Channels
 Add support for UpNext addon.
+
+v1.1.0  (2025-07-26)
+- Add search to directory listing for TV and VOD
 		</news>
 	</extension>
 </addon>
diff --git a/plugin.video.stalkervod/lib/addon.py b/plugin.video.stalkervod/lib/addon.py
@@ -9,15 +9,17 @@
 import xbmcgui
 import xbmcplugin
 from .globals import G
-from .utils import ask_for_input, get_int_value
+from .utils import ask_for_input, get_int_value, ask_for_category_selection
 from .api import Api
+from .loggers import Logger
 
 
 class StalkerAddon:
     """Stalker Addon"""
     @staticmethod
     def __toggle_favorites(video_id, add, _type):
         """Remove/add favorites and refresh"""
+        Logger.debug('Toggle Favorites video_id={}, add={}, _type={}'.format(video_id, add, _type))
         if add:
             Api.add_favorites(video_id, _type)
         else:
@@ -27,6 +29,7 @@ def __toggle_favorites(video_id, add, _type):
     @staticmethod
     def __play_video(params):
         """Play video"""
+        Logger.debug('Play video {}'.format(params))
         stream_url = Api.get_vod_stream_url(params['video_id'], params['series'], params.get('cmd', ''), params.get('use_cmd', '0'))
         play_item = xbmcgui.ListItem(path=stream_url)
         video_info = play_item.getVideoInfoTag()
@@ -45,19 +48,27 @@ def __play_video(params):
     @staticmethod
     def __play_tv(cmd):
         """Play TV Channel"""
+        Logger.debug('Play TV {}'.format(cmd))
         stream_url = Api.get_tv_stream_url(cmd)
         play_item = xbmcgui.ListItem(path=stream_url)
         xbmcplugin.setResolvedUrl(G.get_handle(), True, listitem=play_item)
 
     @staticmethod
     def __list_tv_genres():
         """List TV channel genres"""
+        Logger.debug('List TV Genres')
         xbmcplugin.setPluginCategory(G.get_handle(), 'TV CHANNELS')
         xbmcplugin.setContent(G.get_handle(), 'videos')
         list_item = xbmcgui.ListItem(label='TV FAVORITES')
         url = G.get_plugin_url({'action': 'tv_favorites', 'page': 1, 'update_listing': False})
         xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
 
+        # Add search option
+        list_item = xbmcgui.ListItem(label='SEARCH')
+        list_item.setArt({'thumb': G.get_custom_thumb_path('search.png')})
+        url = G.get_plugin_url({'action': 'tv_search', 'fav': 0, 'isContextMenuSearch': False})
+        xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
+
         genres = Api.get_tv_genres()
         for genre in genres:
             list_item = xbmcgui.ListItem(label=genre['title'].upper())
@@ -74,13 +85,20 @@ def __list_tv_genres():
     @staticmethod
     def __list_vod_categories():
         """List vod categories"""
+        Logger.debug('List VOD Categories')
         xbmcplugin.setPluginCategory(G.get_handle(), 'VOD')
         xbmcplugin.setContent(G.get_handle(), 'videos')
 
         list_item = xbmcgui.ListItem(label='VOD FAVORITES')
         url = G.get_plugin_url({'action': 'vod_favorites', 'page': 1, 'update_listing': False})
         xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
 
+        # Add search option
+        list_item = xbmcgui.ListItem(label='SEARCH')
+        list_item.setArt({'thumb': G.get_custom_thumb_path('search.png')})
+        url = G.get_plugin_url({'action': 'vod_search', 'fav': 0, 'isContextMenuSearch': False})
+        xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
+
         categories = Api.get_vod_categories()
         for category in categories:
             list_item = xbmcgui.ListItem(label=category['title'])
@@ -96,13 +114,20 @@ def __list_vod_categories():
     @staticmethod
     def __list_series_categories():
         """List series categories"""
+        Logger.debug('List Series Categories')
         xbmcplugin.setPluginCategory(G.get_handle(), 'SERIES')
         xbmcplugin.setContent(G.get_handle(), 'videos')
 
         list_item = xbmcgui.ListItem(label='SERIES FAVORITES')
         url = G.get_plugin_url({'action': 'series_favorites', 'page': 1, 'update_listing': False})
         xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
 
+        # Add search option
+        list_item = xbmcgui.ListItem(label='SEARCH')
+        list_item.setArt({'thumb': G.get_custom_thumb_path('search.png')})
+        url = G.get_plugin_url({'action': 'series_search', 'fav': 0, 'isContextMenuSearch': False})
+        xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, True)
+
         categories = Api.get_series_categories()
         for category in categories:
             list_item = xbmcgui.ListItem(label=category['title'])
@@ -118,6 +143,7 @@ def __list_series_categories():
     @staticmethod
     def __list_channels(params):
         """List TV Channels"""
+        Logger.debug('List Channels {}'.format(params))
         search_term = params.get('search_term', '')
         page = params['page']
         plugin_category = 'TV - ' + params['category'] if params.get('fav', '0') != '1' else 'TV - ' + params['category'] + ' - FAVORITES'
@@ -159,6 +185,7 @@ def __create_tv_listing(videos, params):
     @staticmethod
     def __list_vod(params):
         """List videos for a category"""
+        Logger.debug('List VOD {}'.format(params))
         search_term = params.get('search_term', '')
         plugin_category = 'VOD - ' + params['category'] if params.get('fav', '0') != '1' else 'VOD - ' + params['category'] + ' - FAVORITES'
         xbmcplugin.setPluginCategory(G.get_handle(), plugin_category)
@@ -169,6 +196,7 @@ def __list_vod(params):
     @staticmethod
     def __list_vod_favorites(params):
         """List Favorites Channels"""
+        Logger.debug('List VOD Favorites {}'.format(params))
         xbmcplugin.setPluginCategory(G.get_handle(), 'VOD FAVORITES')
         xbmcplugin.setContent(G.get_handle(), 'videos')
         videos = Api.get_vod_favorites(params['page'])
@@ -185,14 +213,16 @@ def __list_series_favorites(params):
     @staticmethod
     def __list_tv_favorites(params):
         """List Favorites Channels"""
+        Logger.debug('List TV favorites {}'.format(params))
         xbmcplugin.setPluginCategory(G.get_handle(), 'TV FAVORITES')
         xbmcplugin.setContent(G.get_handle(), 'videos')
         videos = Api.get_tv_favorites(params['page'])
         StalkerAddon.__create_tv_listing(videos, params)
 
     @staticmethod
     def __list_series(params):
-        """List videos for a category"""
+        """List series"""
+        Logger.debug('List TV favorites {}'.format(params))
         search_term = params.get('search_term', '')
         plugin_category = 'SERIES - ' + params['category'] if params.get('fav', '0') != '1' else 'SERIES - ' + params['category'] + ' - FAVORITES'
         xbmcplugin.setPluginCategory(G.get_handle(), plugin_category)
@@ -202,7 +232,7 @@ def __list_series(params):
 
     @staticmethod
     def __list_season(params):
-        """List videos for a category"""
+        """List season"""
         xbmcplugin.setPluginCategory(G.get_handle(), params['name'])
         xbmcplugin.setContent(G.get_handle(), 'videos')
         seasons = Api.get_seasons(params['video_id'])
@@ -412,35 +442,84 @@ def __list_episodes(params):
             xbmcplugin.addDirectoryItem(G.get_handle(), url, list_item, False)
         xbmcplugin.endOfDirectory(G.get_handle(), succeeded=True, updateListing=False, cacheToDisc=False)
 
-    @staticmethod
-    def __search_vod(params):
+    def __search_vod(self, params):
         """Search for videos"""
+        Logger.debug('Search VOD {}'.format(params))
+
+        # If category is missing, show category selection popup
+        if not params.get('category'):
+            categories = Api.get_vod_categories()
+            selected_category = ask_for_category_selection(categories, 'VOD')
+            if not selected_category:
+                # User cancelled category selection - end directory properly
+                xbmcplugin.endOfDirectory(G.get_handle(), succeeded=False, updateListing=False, cacheToDisc=False)
+                return
+            params.update({
+                'category': selected_category['title'],
+                'category_id': selected_category['id']
+            })
+
         search_term = ask_for_input(params['category'])
         if search_term:
             params.update({'action': 'vod_listing', 'update_listing': False, 'search_term': search_term, 'page': 1})
-            url = G.get_plugin_url(params)
-            func_str = f'Container.Update({url})'
-            xbmc.executebuiltin(func_str)
+            is_context = str(params.get('isContextMenuSearch', 'true')).lower() == 'true'
+            if is_context:
+                url = G.get_plugin_url(params)
+                func_str = f'Container.Update({url})'
+                xbmc.executebuiltin(func_str)
+            else:
+                self.__list_vod(params)
 
     @staticmethod
     def __search_series(params):
         """Search for videos"""
+
+        # If category is missing, show category selection popup
+        if not params.get('category'):
+            categories = Api.get_series_categories()
+            selected_category = ask_for_category_selection(categories, 'Series')
+            if not selected_category:
+                # User cancelled category selection - end directory properly
+                xbmcplugin.endOfDirectory(G.get_handle(), succeeded=False, updateListing=False, cacheToDisc=False)
+                return
+            params.update({
+                'category': selected_category['title'],
+                'category_id': selected_category['id']
+            })
+
         search_term = ask_for_input(params['category'])
         if search_term:
             params.update({'action': 'series_listing', 'update_listing': False, 'search_term': search_term, 'page': 1})
             url = G.get_plugin_url(params)
             func_str = f'Container.Update({url})'
             xbmc.executebuiltin(func_str)
 
-    @staticmethod
-    def __search_tv(params):
+    def __search_tv(self, params):
         """Search for videos"""
+
+        # If category is missing, show category selection popup
+        if not params.get('category'):
+            genres = Api.get_tv_genres()
+            selected_genre = ask_for_category_selection(genres, 'TV')
+            if not selected_genre:
+                # User cancelled category selection - end directory properly
+                xbmcplugin.endOfDirectory(G.get_handle(), succeeded=False, updateListing=False, cacheToDisc=False)
+                return
+            params.update({
+                'category': selected_genre['title'],
+                'category_id': selected_genre['id']
+            })
+
         search_term = ask_for_input(params['category'])
         if search_term:
             params.update({'action': 'tv_listing', 'update_listing': False, 'search_term': search_term, 'page': 1})
-            url = G.get_plugin_url(params)
-            func_str = f'Container.Update({url})'
-            xbmc.executebuiltin(func_str)
+            is_context = str(params.get('isContextMenuSearch', 'true')).lower() == 'true'
+            if is_context:
+                url = G.get_plugin_url(params)
+                func_str = f'Container.Update({url})'
+                xbmc.executebuiltin(func_str)
+            else:
+                self.__list_channels(params)
 
     @staticmethod
     def __list_main_menu():
diff --git a/plugin.video.stalkervod/lib/utils.py b/plugin.video.stalkervod/lib/utils.py
@@ -16,6 +16,20 @@ def ask_for_input(category):
         type=xbmcgui.INPUT_ALPHANUM) or None
 
 
+def ask_for_category_selection(categories, content_type):
+    """Category selection dialog box"""
+    if not categories:
+        return None
+
+    category_titles = [category['title'] for category in categories]
+    dialog = xbmcgui.Dialog()
+    selected_index = dialog.select(f'Select {content_type} Category', category_titles)
+
+    if selected_index >= 0:
+        return categories[selected_index]
+    return None
+
+
 def get_int_value(dictionary, key):
     """Helper method to get int value"""
     if key in dictionary:
