fix missing context menu for cached zone - Remove cached categories

- remove cached categories. enable removing of conversion from listitem to dict.
- fix play single video by removing native_plugin.play_video which rely on dict instead of listitem.
- remove unused native_plugin.set_content
- fix pylint: indentation, snake case, etc...

Author: thomas-ernest

plugin.video.arteplussept/resources/lib/logger.py

@@ -6,7 +6,6 @@
 import xbmcgui
 import xbmcvfs
 
-from resources.lib import utils
 from resources.lib.native_plugin import Plugin
 from . import settings
 
@@ -64,7 +63,7 @@ def to_jsonable(payload):
     if isinstance(payload, dict):
         return {str(key): to_jsonable(value) for key, value in payload.items()}
     if isinstance(payload, xbmcgui.ListItem):
-        return utils.getDictFromListItem(payload)
+        return get_dict_from_list_item(payload)
     if isinstance(payload, bytes):
         return payload.decode('utf-8', 'replace')
 
@@ -87,3 +86,74 @@ def to_jsonable(payload):
 def format_headers(headers):
     """Map headers into a readable string to be logged."""
     return '\n'.join(f'{k}: {v}' for k, v in headers.items())
+
+
+def get_dict_from_info_tag_video(li):
+    """Extract common video InfoTag fields from a ListItem's VideoInfoTag into a dict.
+
+    This probes the tag for known getters and only calls them when present,
+    avoiding broad exception handling.
+    """
+    if not hasattr(li, 'getVideoInfoTag'):
+        return None
+
+    tag = li.getVideoInfoTag()
+    if not tag:
+        return None
+
+    info = {}
+    info['title'] = tag.getTitle()
+    info['plot'] = tag.getPlot()
+    info['plotoutline'] = tag.getPlotOutline()
+    # No mpaa exposed, but Nexus and earlier does
+    if hasattr(tag, 'getMpaa'):
+        info['mpaa'] = tag.getMpaa()
+    info['duration'] = tag.getDuration()
+    info['firstairedasw3c'] = tag.getFirstAiredAsW3C()
+    genres = tag.getGenres()
+    info['genres'] = list(genres) if genres is not None else None
+    directors = tag.getDirectors()
+    info['directors'] = list(directors) if directors is not None else None
+    writers = tag.getWriters()
+    info['writers'] = list(writers) if writers is not None else None
+    # No countries exposed, but Nexus and earlier does
+    if hasattr(tag, 'getCountries'):
+        countries = tag.getCountries()
+        info['countries'] = list(countries) if countries is not None else None
+    info['year'] = tag.getYear()
+
+    return info
+
+
+def get_dict_from_list_item(li):
+    """
+    Serialize an xbmcgui.ListItem into a plain dict so it can be
+    JSON-serialized / persisted. Be defensive: not all ListItem
+    implementations expose the same getter methods, so wrap calls.
+    """
+    result = {}
+    result['label'] = li.getLabel()
+    result['path'] = li.getPath()
+    result['art'] = {}
+    for art_key in ['thumb', 'fanart']:
+        result['art'][art_key] = li.getArt(art_key)
+    props = {}
+    if hasattr(li, 'getProperties'):
+        props = li.getProperties()
+    else:
+        # fall back to probing a set of commonly used property keys
+        if hasattr(li, 'getProperty'):
+            for key in ('is_playable', 'StartOffset', 'StartPercent'):
+                val = li.getProperty(key)
+                if val is not None and val != '':
+                    props[key] = val
+    result['properties'] = props
+
+    # info labels (metadata)
+    if hasattr(li, 'getInfoLabels') and li.getInfoLabels():
+        result['info'] = li.getInfoLabels()
+
+    # video InfoTag (detailed metadata) when available
+    result['video_info_tag'] = get_dict_from_info_tag_video(li)
+
+    return result

plugin.video.arteplussept/resources/lib/mapper/arteitem.py

@@ -255,7 +255,6 @@ def _parse_date_artetv(self, datestr):
             date = None
         return date
 
-
     def _get_image_url(self, wished_res, wished_text):
         item = self.json_dict
         image_url = None

plugin.video.arteplussept/resources/lib/mapper/artezone.py

@@ -2,10 +2,10 @@
 Module for Arte Zone
 """
 
+import xbmc
 import xbmcgui
 from resources.lib import api
 from resources.lib.mapper.artecollection import ArteCollection
-from resources.lib import utils
 
 
 class ArteZone(ArteCollection):
@@ -14,33 +14,38 @@ class ArteZone(ArteCollection):
     ArteSearch is a special type of zone.
     """
 
-    def __init__(self, plugin, settings, cached_categories=None):
-        super().__init__(plugin, settings)
-        self.cached_categories = cached_categories
-
     def build_item(self, zone):
         """
         Return a menu entry to access content of cached category item i.e.
         a zone in the HOME page or SEARH page result.
         """
-        zone_id = zone.get('id')
-        cached_category = self._build_menu(
-            zone.get('content'), 'category_page', zone_id=zone_id, page_id='HOME')
-        if self._is_valid_menu(cached_category):
-            self.cached_categories[zone_id] = utils.getDictFromListItemInList(cached_category)
+
+        if self._is_valid_zone(zone):
+            zone_id = zone.get('id')
             li = xbmcgui.ListItem(label=zone.get('title'))
-            li.setPath(self.plugin.url_for('cached_category', zone_id=zone_id))
+            li.setPath(self.plugin.url_for(
+                'category_page', zone_id=zone_id, page_id='HOME', page='1'))
             li.setProperty('is_playable', 'False')
             return li
+        xbmc.log(f"Ignore zone {zone.get('label')}, no valid content", xbmc.LOGINFO)
         return None
 
-    def _is_valid_menu(self, cached_category):
+    def _is_valid_zone(self, zone):
         """
-        Menu is valid, if it is a list with at least one element is not None.
-        It is not valid if the list contains only None elements
+        Zone is valid, if it contains content data which empty
+        or which contains not only EXTERNAL items
         """
-        return isinstance(cached_category, list) and \
-            any(elem is not None for elem in cached_category)
+        data = (zone or {}).get("content", {}).get("data")
+        if isinstance(data, list) and len(data) >= 1:
+            valid_count = 0
+            for item in data:
+                item_kind = (item or {}).get("kind", {}).get("code")
+                if item_kind != 'EXTERNAL':
+                    valid_count = valid_count + 1
+            # if there is not at least one valid item, them zone is not valid
+            return valid_count >= 1
+        # we cannot be sure it is valid or not, we don't know what it contains
+        return True
 
     def build_menu(self, zone_id, page, page_id):
         """

plugin.video.arteplussept/resources/lib/mapper/mapper.py

@@ -185,17 +185,17 @@ def map_stream(video_item, stream):
     return [map_stream(video_item, stream) for stream in sorted_filtered_streams]
 
 
-def map_zone_to_item(plugin, settings, zone, cached_categories):
+def map_zone_to_item(plugin, settings, zone):
     """Arte TV API page is split into zones. Map a 'zone' to menu item(s).
-    Populate cached_categories for zones with videos available in child 'content'"""
+    Never use cache, because we cannot store ListItem in it"""
     menu_item = None
     title = zone.get('title')
     if get_authenticated_content_type(zone) == 'sso-favorites':
         menu_item = ArteFavorites(plugin, settings).build_item(title)
     elif get_authenticated_content_type(zone) == 'sso-personalzone':
         menu_item = ArteHistory(plugin, settings).build_item(title)
     elif zone.get('content') and zone.get('content').get('data'):
-        menu_item = ArteZone(plugin, settings, cached_categories).build_item(zone)
+        menu_item = ArteZone(plugin, settings).build_item(zone)
     elif zone.get('link'):
         menu_item = map_api_categories_item(plugin, zone)
     else:

plugin.video.arteplussept/resources/lib/native_plugin.py

@@ -61,25 +61,6 @@ def map_collection_to_playlist(self, collection):
             pl.add(item.getPath(), item)
         return pl
 
-    def play_video(self, item):
-        """Play a dictionary-based playable item with metadata."""
-        if not isinstance(item, dict):
-            return False
-        path = item.getPath()
-        if not path:
-            return False
-        try:
-            xbmc.Player().play(str(path), item)
-            return True
-        # pylint: disable=broad-exception-caught
-        except Exception:
-            return False
-
-    def set_content(self, content):
-        """Set the content type for the current directory (e.g., 'movies', 'tvshows')."""
-        if self.handle is not None and content:
-            xbmcplugin.setContent(self.handle, content)
-
     def run(self):
         """Dispatch to a registered route based on the 'route' query parameter."""
         self.handle = int(sys.argv[1]) if len(sys.argv) > 1 else None

plugin.video.arteplussept/resources/lib/plugin.py

@@ -40,8 +40,7 @@ def display_index():
         )
         addon.setSetting("last_info_version", current_version)
 
-    lst_itms = view.build_home_page(
-        plugin, settings, plugin.get_storage('cached_categories', ttl=60))
+    lst_itms = view.build_home_page(plugin, settings)
     logger.log_xbmc(lst_itms, 'index')
     return lst_itms
 
@@ -54,20 +53,10 @@ def display_api_category(category_code):
     return lst_itms
 
 
-@plugin.route('/category/cached/<zone_id>', name='cached_category')
-def display_cached_category(zone_id):
-    """Display the menu for a category that is stored
-    in cache from previous api call like home page"""
-    lst_itms = view.get_cached_category(
-        zone_id, plugin.get_storage('cached_categories', ttl=60))
-    logger.log_xbmc(lst_itms, 'cached_category')
-    return lst_itms
-
-
 @plugin.route('/category/page/<zone_id>/<page>/<page_id>', name='category_page')
 def display_category_page(zone_id, page, page_id):
     """Display the menu for a category that needs an api call"""
-    lst_itms = ArteZone(plugin, settings, plugin.get_storage('cached_categories', ttl=60)) \
+    lst_itms = ArteZone(plugin, settings) \
         .build_menu(zone_id, page, page_id)
     logger.log_xbmc(lst_itms, 'category_page')
     return lst_itms
@@ -199,12 +188,15 @@ def play(kind, program_id, mpaa, play_from=PlayFrom.ITM, audio_slot='1'):
     else:
         played_item = None
         try:
-            played_item = view.build_stream_url(plugin, settings, kind, program_id, int(audio_slot))
+            played_item = view.build_stream_url(
+                plugin, settings, kind, program_id, int(audio_slot))
+        # pylint: disable=broad-exception-caught
         except Exception as exp:
-            xbmc.log(f"Exception during stream resolution {traceback.format_tb(exp.__traceback__)}", xbmc.LOGERROR)
+            stack_trace = traceback.format_tb(exp.__traceback__)
+            xbmc.log(f"Exception during stream resolution {stack_trace}", xbmc.LOGERROR)
         if played_item is not None:
             logger.log_xbmc(played_item, 'play')
-            plugin.play_video(played_item)
+            xbmc.Player().play(played_item.getPath(), played_item)
         else:
             xbmc.log("Could not resolve stream...", xbmc.LOGERROR)
             addon = xbmcaddon.Addon()