- Fix selezione viste e pop-up disabilitato

- Miglioria sottotitoli StreamingCommunity
 - Piccolo fix in launcher
This commit is contained in:
Alhaziel01
2022-02-05 18:24:22 +01:00
parent 9e06b9acb5
commit 49ad5154cf
4 changed files with 7 additions and 5 deletions

View File

@@ -259,10 +259,11 @@ def play(item):
subs = [] subs = []
urls = [] 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: if info:
for lang, sub, res, url in info: for lang, sub, res, url in info:
if sub: if sub:
if lang == 'auto': lang = 'ita-forced'
s = config.get_temp_file(lang +'.srt') s = config.get_temp_file(lang +'.srt')
subs.append(s) subs.append(s)
filetools.write(s, support.vttToSrt(httptools.downloadpage(support.match(sub, patron=r'(http[^\s\n]+)').match).data)) filetools.write(s, support.vttToSrt(httptools.downloadpage(support.match(sub, patron=r'(http[^\s\n]+)').match).data))

View File

@@ -381,7 +381,7 @@ def actions(item):
else: else:
config.set_setting('install_trakt', True) 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) findvideos(item, itemlist)
else: else:
platformtools.render_items(itemlist, item) platformtools.render_items(itemlist, item)

View File

@@ -442,9 +442,10 @@ def viewmodeMonitor():
currentModeName = xbmc.getInfoLabel('Container.Viewmode') currentModeName = xbmc.getInfoLabel('Container.Viewmode')
currentMode = int(xbmcgui.Window(10025).getFocusId()) currentMode = int(xbmcgui.Window(10025).getFocusId())
# logger.debug('SAVE VIEW 1', currentMode, parent.action, item.action) # 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) content, Type = getCurrentView(item, parent)
view_mode_type = config.get_setting('view_mode_%s' % content) view_mode_type = config.get_setting('view_mode_%s' % content)
# logger.debug('VIEW MODE TYPE')
if view_mode_type: if view_mode_type:
defaultMode = int(view_mode_type.split(',')[-1]) defaultMode = int(view_mode_type.split(',')[-1])
if content and currentMode != defaultMode: if content and currentMode != defaultMode:
@@ -1418,7 +1419,7 @@ def set_player(item, xlistitem, mediaurl, view, strm):
item.options = {'strm':False} item.options = {'strm':False}
if item.subtitle: if item.subtitle:
if type(item.subtitle) != list: item.subtitle = [item.subtitle] if type(item.subtitle) != list: item.subtitle = [item.subtitle]
item.subtitle.reverse() # item.subtitle.reverse()
xlistitem.setSubtitles(item.subtitle) xlistitem.setSubtitles(item.subtitle)
# Moved del conector "torrent" here # Moved del conector "torrent" here

View File

@@ -137,7 +137,7 @@
<setting id="enable_library_menu" label="30131" type="bool" default="true"/> <setting id="enable_library_menu" label="30131" type="bool" default="true"/>
<setting label="30000" type="lsep"/> <setting label="30000" type="lsep"/>
<setting id="touch_view" label='30002' type="bool" default="false"/> <setting id="touch_view" label='30002' type="bool" default="false"/>
<setting id="viewchange_notify" label='70514' type="bool" default="true"/> <setting id="viewchange_notify" label='70514' type="bool" default="false"/>
<!-- View Mode (hidden)--> <!-- View Mode (hidden)-->
<setting id="skin_name" label='Skin Name' type="text" default="skin.estuary" visible="false"/> <setting id="skin_name" label='Skin Name' type="text" default="skin.estuary" visible="false"/>
<setting id="view_mode_home" type="action" label="70009" default= "Default, 0" visible="false"/> <setting id="view_mode_home" type="action" label="70009" default= "Default, 0" visible="false"/>