diff --git a/core/servertools.py b/core/servertools.py index 66d01c0b..748c0b98 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -254,7 +254,7 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo if isinstance(video_password, list): return video_password, len(video_password) > 0, "
".join(error_messages) logger.info("Server: %s, url is good" % server) - video_urls.append(["%s [%s]" % (urlparse.urlparse(url)[2][-4:], config.get_localized_string(30137)), url]) + video_urls.append(["%s [%s]" % (urlparse.urlparse(url)[2].split('|')[0][-4:], config.get_localized_string(30137)), url]) # Find out the video URL else: diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index d5f17850..cae110e0 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -362,8 +362,8 @@ def render_items(itemlist, parent_item): listitem.addContextMenuItems(context_commands) dirItems.append(('%s?%s' % (sys.argv[0], item_url), listitem, item.folder)) - # from core.support import dbg;dbg() + set_view_mode(itemlist[0], parent_item) xbmcplugin.addDirectoryItems(_handle, dirItems) if parent_item.list_type == '': @@ -384,7 +384,7 @@ def render_items(itemlist, parent_item): # cacheToDisc = False # if (parent_item.action == 'findvideos' and config.get_setting('autoplay')) or parent_item.action == 'search': # cacheToDisc = True - set_view_mode(itemlist[0], parent_item) + xbmcplugin.endOfDirectory(_handle, succeeded=True, updateListing=False, cacheToDisc=True) logger.debug('END render_items') diff --git a/servers/directo.py b/servers/directo.py index 2ad2e56b..8fafb732 100644 --- a/servers/directo.py +++ b/servers/directo.py @@ -10,6 +10,6 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.debug("(page_url='%s')" % page_url) - video_urls = [["%s %s" % (page_url[-4:], config.get_localized_string(30137)), page_url]] + video_urls = [["%s %s" % (page_url.split('|')[0][-4:], config.get_localized_string(30137)), page_url]] return video_urls