Migliorie contextmenu

platformcode/contextmenu/contextmenu.json

@@ -1,5 +1,4 @@
 [
-    "platformcode.contextmenu.search_on_kod",
-    "platformcode.contextmenu.search_on_channels",
+    "platformcode.contextmenu.search",
     "platformcode.contextmenu.update_tv_show"
 ]

platformcode/contextmenu/search.py

@@ -10,9 +10,11 @@ from core import tmdb
 from core.item import Item
 
 addon_id = config.get_addon_core().getAddonInfo('id')
+global item_is_coming_from_kod
 
 
 def check_condition():
+    global item_is_coming_from_kod
     logger.debug('check item condition')
     mediatype = xbmc.getInfoLabel('ListItem.DBTYPE')
 
@@ -33,17 +35,15 @@ def check_condition():
             item_is_coming_from_kod = pattern.search(filePath)
 
     if item_is_coming_from_kod:
-        logger.debug("item IS already managed by KOD", item_is_coming_from_kod)
+        logger.debug("item IS already managed by KOD")
 
-    # logger.info('container is KOD? {}'.format(we_are_in_kod) )
-
-    return mediatype and item_is_coming_from_kod # and not we_are_in_kod
+    return mediatype
 
 
 def get_menu_items():
     logger.debug('get menu item')
     if check_condition():
-        return config.get_localized_string(90003) , execute
+        return [(config.get_localized_string(90003 if item_is_coming_from_kod else 90005), execute)]
     else:
         return []
 
@@ -69,6 +69,10 @@ def execute():
     year = xbmc.getInfoLabel('ListItem.Year')
     imdb = xbmc.getInfoLabel('ListItem.IMDBNumber')
 
+    if mediatype in ('episode', 'season'):
+        mediatype = 'tvshow'
+        title = xbmc.getInfoLabel('ListItem.TVShowTitle')
+
     logstr = "Selected ListItem is: 'IMDB: {}' - TMDB: {}' - 'Title: {}' - 'Year: {}'' - 'Type: {}'".format(imdb, tmdbid, title, year, mediatype)
     logger.info(logstr)
 
@@ -90,13 +94,10 @@ def execute():
         except:
             logger.info("Cannot find TMDB via title/year")
 
-
     if not tmdbid:
         # We can continue searching by 'title (year)'
         logger.info( "No TMDB found, proceed with title/year:",  title , "(" , year, ")" )
 
-
-
     # User wants to search on other channels
     logger.info("Search on other channels")
 

platformcode/contextmenu/search_on_kod.py

@@ -1,121 +0,0 @@
-import xbmc, sys, xbmcgui, os
-from platformcode import config, logger
-
-# incliuding folder libraries
-librerias = xbmc.translatePath(os.path.join(config.get_runtime_path(), 'lib'))
-sys.path.insert(0, librerias)
-import re
-
-from core import tmdb
-from core.item import Item
-
-addon_id = config.get_addon_core().getAddonInfo('id')
-
-
-def check_condition():
-    logger.debug('[SOK] check item condition')
-    mediatype = xbmc.getInfoLabel('ListItem.DBTYPE')
-
-    folderPath = xbmc.getInfoLabel('Container.FolderPath')
-    filePath = xbmc.getInfoLabel('ListItem.Path')
-    fileNameAndPath = xbmc.getInfoLabel('ListItem.FileNameAndPath')
-
-    logger.debug('Container:',folderPath )
-    logger.debug('listitem mediatype:',mediatype )
-    logger.debug('filenamepath:', fileNameAndPath )
-    logger.info('filepath:', filePath )
-    
-    item_is_coming_from_kod = addon_id in filePath
-    if not item_is_coming_from_kod:
-        videolibpath = config.get_setting("videolibrarypath")
-        if filePath.startswith(videolibpath):
-            pattern = re.compile("\[.*\][\\\/]?$")
-            item_is_coming_from_kod = pattern.search(filePath)
-
-    if item_is_coming_from_kod:
-        logger.debug("item IS already managed by KOD", item_is_coming_from_kod)
-
-    # logger.info('[SOK] container is KOD? {}'.format(we_are_in_kod) )
-
-    return mediatype and not item_is_coming_from_kod # and not we_are_in_kod
-
-def get_menu_items():
-    logger.debug('get menu item')
-    if check_condition():
-        return config.get_localized_string(90005) , execute
-    else:
-        return []
-
-
-def execute():
-    """
-    Gather the selected ListItem's attributes in order to compute the `Item` parameters
-    and perform the KOD's globalsearch.
-    Globalsearch will be executed specifing the content-type of the selected ListItem
-
-    NOTE: this method needs the DBTYPE and TMDB_ID specified as ListItem's properties
-    """
-
-    # These following lines are commented and keep in the code just as reminder.
-    # In future, they could be used to filter the search outcome
-
-    # ADDON: maybe can we know if the current windows is related to a specific addon?
-    # we could skip the ContextMenu if we already are in KOD's window
-
-    tmdbid = xbmc.getInfoLabel('ListItem.Property(tmdb_id)')
-    mediatype = xbmc.getInfoLabel('ListItem.DBTYPE')
-    title = xbmc.getInfoLabel('ListItem.Title')
-    year = xbmc.getInfoLabel('ListItem.Year')
-    imdb = xbmc.getInfoLabel('ListItem.IMDBNumber')
-
-    logstr = "Selected ListItem is: 'IMDB: {}' - TMDB: {}' - 'Title: {}' - 'Year: {}'' - 'Type: {}'".format(imdb, tmdbid, title, year, mediatype)
-    logger.info(logstr)
-
-    if not tmdbid and imdb:
-        logger.info('No TMDBid found. Try to get by IMDB')
-        it = Item(contentType= mediatype, infoLabels={'imdb_id' : imdb})
-        try:
-            tmdb.set_infoLabels(it)
-            tmdbid = it.infoLabels.get('tmdb_id', '')
-        except:
-            logger.info("Cannot find TMDB via imdb")
-
-    if not tmdbid:
-        logger.info('No TMDBid found. Try to get by Title/Year')
-        it = Item(contentTitle= title, contentType= mediatype, infoLabels={'year' : year})
-        try:
-            tmdb.set_infoLabels(it)
-            tmdbid = it.infoLabels.get('tmdb_id', '')
-        except:
-            logger.info("Cannot find TMDB via title/year")
-
-
-    if not tmdbid:
-        # We can continue searching by 'title (year)'
-        logger.info( "No TMDB found, proceed with title/year:",  title , "(" , year, ")" )
-
-
-    logger.info("Search on KOD (gobalsearch)")
-
-    item = Item(
-    action="Search",
-    channel="globalsearch",
-    contentType= mediatype,
-    mode="search",
-    text= title,
-    type= mediatype,
-    infoLabels= {
-        'tmdb_id': tmdbid,
-        'year': year
-    },
-    folder= False
-    )
-
-    logger.info("Invoking Item:", item.tostring() )
-
-    itemurl = item.tourl()
-    xbmc.executebuiltin("RunPlugin(plugin://plugin.video.kod/?" + itemurl + ")")
-
-
-
-

platformcode/contextmenu/update_tv_show.py

@@ -107,8 +107,8 @@ def execute_sql(sql):
 
 def check_condition():
     # support.dbg()
-    dbid = xbmc.getInfoLabel('ListItem.DBID')
-    path = search_paths( dbid )
+    dbid = xbmc.getInfoLabel('ListItem.TvShowDBID')
+    path = search_paths(dbid)
     if path:
         return True
     return False
@@ -117,15 +117,15 @@ def check_condition():
 def get_menu_items():
     logger.debug('get menu item')
     if check_condition():
-        return config.get_localized_string(70269) , execute
+        return [(config.get_localized_string(70269), execute)]
     else:
         return []
 
 
 
 def execute():
-    dbid = xbmc.getInfoLabel('ListItem.DBID')
-    path = search_paths( dbid )
+    dbid = xbmc.getInfoLabel('ListItem.TvShowDBID')
+    path = search_paths(dbid)
     if path:
         item = Item(action="update_tvshow", channel="videolibrary", path=path)
         # Why? I think it is not necessary, just commented