diff --git a/platformcode/launcher.py b/platformcode/launcher.py index c4dbccda..ab295570 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -478,6 +478,7 @@ def play_from_library(item): else: # Pop-up window from specials import videolibrary + from core.channeltools import get_channel_parameters p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(60683)) p_dialog.update(0, '') item.play_from = 'window' @@ -508,9 +509,10 @@ def play_from_library(item): quality = '[B][' + item.quality + '][/B]' if item.quality else '' if item.server: path = filetools.join(config.get_runtime_path(), 'servers', item.server.lower() + '.json') - name = jsontools.load(open(path, "r").read())['name'] + name = jsontools.load(open(path, "rb").read())['name'] if name.startswith('@'): name = config.get_localized_string(int(name.replace('@',''))) - it = xbmcgui.ListItem('\n[B]%s[/B] %s - %s' % (name, quality, item.contentTitle)) + logger.debug(item) + it = xbmcgui.ListItem('\n[B]%s[/B] %s - %s [%s]' % (name, quality, item.contentTitle, get_channel_parameters(item.contentChannel)['title'])) it.setArt({'thumb':item.thumbnail}) options.append(it) else: