diff --git a/channels/streamingcommunity.py b/channels/streamingcommunity.py index e4fd6c6d..8d9b23aa 100644 --- a/channels/streamingcommunity.py +++ b/channels/streamingcommunity.py @@ -259,10 +259,11 @@ def play(item): subs = [] urls = [] - info = support.scrapertools.find_multiple_matches(httptools.downloadpage(url).data, 'NAME="([^"]+)".*?URI="([^"]+)|RESOLUTION=\d+x(\d+).*?(http[^"\s]+)') + info = support.match(url, patron=r'LANGUAGE="([^"]+)",\s*URI="([^"]+)|RESOLUTION=\d+x(\d+).*?(http[^"\s]+)').matches if info: for lang, sub, res, url in info: if sub: + if lang == 'auto': lang = 'ita-forced' s = config.get_temp_file(lang +'.srt') subs.append(s) filetools.write(s, support.vttToSrt(httptools.downloadpage(support.match(sub, patron=r'(http[^\s\n]+)').match).data)) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 188ea5e3..d9384667 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -381,7 +381,7 @@ def actions(item): else: config.set_setting('install_trakt', True) - if len([s for s in itemlist if s.server]) > 0: + if item.action in ['check'] and len([s for s in itemlist if s.server]) > 0: findvideos(item, itemlist) else: platformtools.render_items(itemlist, item) diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index df7c3fd9..d0dab3d8 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -442,9 +442,10 @@ def viewmodeMonitor(): currentModeName = xbmc.getInfoLabel('Container.Viewmode') currentMode = int(xbmcgui.Window(10025).getFocusId()) # logger.debug('SAVE VIEW 1', currentMode, parent.action, item.action) - if 50 <= currentMode < 600 and parent and parent.action != item.action: + if 50 <= currentMode < 520 and parent and parent.action != item.action: content, Type = getCurrentView(item, parent) view_mode_type = config.get_setting('view_mode_%s' % content) + # logger.debug('VIEW MODE TYPE') if view_mode_type: defaultMode = int(view_mode_type.split(',')[-1]) if content and currentMode != defaultMode: @@ -1418,7 +1419,7 @@ def set_player(item, xlistitem, mediaurl, view, strm): item.options = {'strm':False} if item.subtitle: if type(item.subtitle) != list: item.subtitle = [item.subtitle] - item.subtitle.reverse() + # item.subtitle.reverse() xlistitem.setSubtitles(item.subtitle) # Moved del conector "torrent" here diff --git a/resources/settings.xml b/resources/settings.xml index 0df30286..8ff4ad80 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -137,7 +137,7 @@ - +