Alcuni fix
This commit is contained in:
+2
-2
@@ -126,7 +126,7 @@ def peliculas(item):
|
|||||||
if 'category' in item.args:
|
if 'category' in item.args:
|
||||||
support.thumb(itemlist,genre=True)
|
support.thumb(itemlist,genre=True)
|
||||||
elif not 'filter' in item.args:
|
elif not 'filter' in item.args:
|
||||||
if item.contentType != 'movie': autorenumber.renumber(itemlist)
|
if item.contentType != 'movie': autorenumber.start(itemlist)
|
||||||
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
|
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
@@ -163,7 +163,7 @@ def episodios(item):
|
|||||||
url= host + show_id + '/season/' + str(key['season_id']) + '/',
|
url= host + show_id + '/season/' + str(key['season_id']) + '/',
|
||||||
action= 'findvideos',
|
action= 'findvideos',
|
||||||
video_id= key['video_id']))
|
video_id= key['video_id']))
|
||||||
autorenumber.renumber(itemlist, item, 'bold')
|
autorenumber.start(itemlist, item)
|
||||||
if autorenumber.check(item) == True \
|
if autorenumber.check(item) == True \
|
||||||
or support.match(itemlist[0].title, patron=r"(\d+x\d+)").match:
|
or support.match(itemlist[0].title, patron=r"(\d+x\d+)").match:
|
||||||
support.videolibrary(itemlist,item)
|
support.videolibrary(itemlist,item)
|
||||||
|
|||||||
@@ -191,7 +191,8 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
|
|||||||
self.getControl(NUMBER).setText(support.typo(config.get_localized_string(70362),'uppercase bold'))
|
self.getControl(NUMBER).setText(support.typo(config.get_localized_string(70362),'uppercase bold'))
|
||||||
else:
|
else:
|
||||||
it = xbmcgui.ListItem(item.infoLabels['title'])
|
it = xbmcgui.ListItem(item.infoLabels['title'])
|
||||||
it.setProperty('channel', channeltools.get_channel_parameters(item.channel).get('title',''))
|
it.setProperty('channelname', channeltools.get_channel_parameters(item.channel).get('title',''))
|
||||||
|
it.setProperty('channel', item.channel)
|
||||||
it.setProperty('action', item.action)
|
it.setProperty('action', item.action)
|
||||||
it.setProperty('server', servertools.get_server_parameters(item.server.lower()).get('name',item.server))
|
it.setProperty('server', servertools.get_server_parameters(item.server.lower()).get('name',item.server))
|
||||||
it.setProperty('url', item.url)
|
it.setProperty('url', item.url)
|
||||||
@@ -213,7 +214,6 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
|
|||||||
self.commands.append(itemlist[0].clone(channel='downloads', action='save_download', from_channel=itemlist[0].channel, from_action=itemlist[0].action, thumbnail=support.thumb('downloads')))
|
self.commands.append(itemlist[0].clone(channel='downloads', action='save_download', from_channel=itemlist[0].channel, from_action=itemlist[0].action, thumbnail=support.thumb('downloads')))
|
||||||
else:
|
else:
|
||||||
self.commands.append(Info.clone(channel='downloads', action='save_download', from_channel=Info.channel, from_action=Info.action, thumbnail=support.thumb('downloads')))
|
self.commands.append(Info.clone(channel='downloads', action='save_download', from_channel=Info.channel, from_action=Info.action, thumbnail=support.thumb('downloads')))
|
||||||
|
|
||||||
if self.commands:
|
if self.commands:
|
||||||
commands = []
|
commands = []
|
||||||
for command in self.commands:
|
for command in self.commands:
|
||||||
@@ -248,7 +248,8 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
|
|||||||
if action == 'play':
|
if action == 'play':
|
||||||
item.server = self.getControl(RECOMANDED).getSelectedItem().getProperty('server')
|
item.server = self.getControl(RECOMANDED).getSelectedItem().getProperty('server')
|
||||||
self.close()
|
self.close()
|
||||||
platformtools.play_video(item)
|
from platformcode.launcher import run
|
||||||
|
run(item)
|
||||||
xbmc.sleep(500)
|
xbmc.sleep(500)
|
||||||
while xbmc.Player().isPlaying():
|
while xbmc.Player().isPlaying():
|
||||||
xbmc.sleep(500)
|
xbmc.sleep(500)
|
||||||
|
|||||||
@@ -973,7 +973,10 @@ def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=No
|
|||||||
xbmc_player.setSubtitles(item.subtitle)
|
xbmc_player.setSubtitles(item.subtitle)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
player_mode = config.get_setting("player_mode")
|
if item.player_mode:
|
||||||
|
player_mode = item.player_mode
|
||||||
|
else:
|
||||||
|
player_mode = config.get_setting("player_mode")
|
||||||
if (player_mode == 3 and mediaurl.startswith("rtmp")) or item.play_from == 'window' or item.nfo: player_mode = 0
|
if (player_mode == 3 and mediaurl.startswith("rtmp")) or item.play_from == 'window' or item.nfo: player_mode = 0
|
||||||
elif "megacrypter.com" in mediaurl: player_mode = 3
|
elif "megacrypter.com" in mediaurl: player_mode = 3
|
||||||
logger.info("mediaurl=" + mediaurl)
|
logger.info("mediaurl=" + mediaurl)
|
||||||
@@ -993,9 +996,10 @@ def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=No
|
|||||||
|
|
||||||
elif player_mode == 1:
|
elif player_mode == 1:
|
||||||
logger.info('Player Mode: setResolvedUrl')
|
logger.info('Player Mode: setResolvedUrl')
|
||||||
xlistitem.setPath(mediaurl)
|
# xlistitem.setPath(mediaurl)
|
||||||
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
|
par = int(sys.argv[1])
|
||||||
xbmc.sleep(2500)
|
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=mediaurl))
|
||||||
|
# xbmc.sleep(2500)
|
||||||
|
|
||||||
elif player_mode == 2:
|
elif player_mode == 2:
|
||||||
logger.info('Player Mode: Built-In')
|
logger.info('Player Mode: Built-In')
|
||||||
|
|||||||
@@ -33,5 +33,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
|
|||||||
url = url.split(',')
|
url = url.split(',')
|
||||||
video_url = url[0]
|
video_url = url[0]
|
||||||
quality = url[1].replace('label:','')
|
quality = url[1].replace('label:','')
|
||||||
video_urls.append(['VUP Player [%s]' % quality, video_url])
|
video_urls.append(['VUP Player [%s]' % quality, video_url.replace(',','')])
|
||||||
return video_urls
|
return video_urls
|
||||||
|
|||||||
Reference in New Issue
Block a user