mirror of
https://github.com/jellyfin/jellycon.git
synced 2025-02-21 14:21:30 +00:00
fix a bug when no gui item is created (None)
This commit is contained in:
parent
f16a16226e
commit
f04d79d315
@ -9,7 +9,7 @@ import sys
|
||||
import xbmc
|
||||
import xbmcaddon
|
||||
|
||||
from resources.lib.functions import showMenu
|
||||
from resources.lib.functions import show_menu
|
||||
from resources.lib.simple_logging import SimpleLogging
|
||||
|
||||
log = SimpleLogging('contextmenu')
|
||||
@ -19,4 +19,4 @@ log.debug("Context Menu Item ID: {0}", item_id)
|
||||
|
||||
params = {}
|
||||
params["item_id"] = item_id
|
||||
showMenu(params)
|
||||
show_menu(params)
|
||||
|
@ -128,7 +128,7 @@ def mainEntryPoint():
|
||||
elif mode == "WIDGETS":
|
||||
showWidgets()
|
||||
elif mode == "SHOW_MENU":
|
||||
showMenu(params)
|
||||
show_menu(params)
|
||||
elif mode == "SHOW_SETTINGS":
|
||||
__addon__.openSettings()
|
||||
WINDOW = xbmcgui.getCurrentWindowId()
|
||||
@ -574,7 +574,9 @@ def processDirectory(results, progress, params):
|
||||
'&format=json')
|
||||
|
||||
if show_empty_folders or item["RecursiveItemCount"] != 0:
|
||||
dirItems.append(add_gui_item(u, item_details, display_options))
|
||||
gui_item = add_gui_item(u, item_details, display_options)
|
||||
if gui_item:
|
||||
dirItems.append(gui_item)
|
||||
|
||||
elif item_details.item_type == "MusicArtist":
|
||||
u = ('{server}/emby/Users/{userid}/items' +
|
||||
@ -583,11 +585,15 @@ def processDirectory(results, progress, params):
|
||||
'&CollapseBoxSetItems=false' +
|
||||
'&Recursive=true' +
|
||||
'&format=json')
|
||||
dirItems.append(add_gui_item(u, item_details, display_options))
|
||||
gui_item = add_gui_item(u, item_details, display_options)
|
||||
if gui_item:
|
||||
dirItems.append(gui_item)
|
||||
|
||||
else:
|
||||
u = item_details.id
|
||||
dirItems.append(add_gui_item(u, item_details, display_options, folder=False))
|
||||
gui_item = add_gui_item(u, item_details, display_options, folder=False)
|
||||
if gui_item:
|
||||
dirItems.append(gui_item)
|
||||
|
||||
# add the all episodes item
|
||||
show_all_episodes = settings.getSetting('show_all_episodes') == 'true'
|
||||
@ -624,12 +630,14 @@ def processDirectory(results, progress, params):
|
||||
item_details.watched_episodes = total_watched
|
||||
item_details.mode = "GET_CONTENT"
|
||||
|
||||
dirItems.append(add_gui_item(series_url, item_details, display_options, folder=True))
|
||||
gui_item = add_gui_item(series_url, item_details, display_options, folder=True)
|
||||
if gui_item:
|
||||
dirItems.append(gui_item)
|
||||
|
||||
return dirItems, detected_type
|
||||
|
||||
|
||||
def showMenu(params):
|
||||
def show_menu(params):
|
||||
log.debug("showMenu(): {0}", params)
|
||||
|
||||
item_id = params["item_id"]
|
||||
|
@ -285,12 +285,13 @@ def extract_item_info(item, gui_options):
|
||||
|
||||
return item_details
|
||||
|
||||
|
||||
def add_gui_item(url, item_details, display_options, folder=True):
|
||||
|
||||
log.debug("Passed item_details: {0}", item_details.__dict__)
|
||||
|
||||
if not item_details.name:
|
||||
return
|
||||
return None
|
||||
|
||||
if item_details.mode:
|
||||
mode = "&mode=%s" % item_details.mode
|
||||
|
Loading…
x
Reference in New Issue
Block a user