diff --git a/core/support.py b/core/support.py index 31034378..38f7957d 100755 --- a/core/support.py +++ b/core/support.py @@ -1279,6 +1279,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru if videoitem.video_urls or srv_param.get('active', False): vi = item.clone(server=videoitem.server, + extraInfo=videoitem.extraInfo, serverName=videoitem.serverName, url=videoitem.url, videoUrls= videoitem.videoUrlsn, diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 7aea0347..f17fc0f2 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -1724,9 +1724,10 @@ def serverWindow(item, itemlist): for videoitem in self.itemlist: videoitem.thumbnail = config.get_online_server_thumb(videoitem.server) quality = ' [' + videoitem.quality + ']' if videoitem.quality else '' + info = ' [' + videoitem.extraInfo + ']' if videoitem.extraInfo else '' if videoitem.server: color = scrapertools.find_single_match(videoitem.alive, r'(FF[^\]]+)') - it = xbmcgui.ListItem('{}{}'.format(videoitem.serverName, quality)) + it = xbmcgui.ListItem('{}{}{}'.format(videoitem.serverName, quality, info)) # format Title if videoitem.contentSeason and videoitem.contentEpisodeNumber: @@ -1828,11 +1829,13 @@ def serverWindow(item, itemlist): from core.support import typo for videoitem in self.itemlist: if videoitem.server: + logger.debug(videoitem) videoitem.thumbnail = config.get_online_server_thumb(videoitem.server) quality = ' [' + videoitem.quality + ']' if videoitem.quality else '' color = scrapertools.find_single_match(videoitem.alive, r'(FF[^\]]+)') color = typo(' •', 'bold color 0x{}'.format(color)) if color else '' - title = '{}{}{}'.format(videoitem.serverName, quality, color) + info = ' [' + videoitem.extraInfo + ']' if videoitem.extraInfo else '' + title = '{}{}{}{}'.format(videoitem.serverName, quality, info, color) else: title = videoitem.title it = xbmcgui.ListItem(title) diff --git a/servers/torrent.json b/servers/torrent.json index 2124724b..03725573 100644 --- a/servers/torrent.json +++ b/servers/torrent.json @@ -41,7 +41,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "(http:\\/\\/(?:[a-zA-Z0-9]+)\\.torrent)", + "pattern": "(http[s]?:\\/\\/(?:[a-zA-Z0-9]+)\\.torrent)", "url": "\\1" }, { @@ -49,7 +49,7 @@ "url": "\\1" }, { - "pattern": "(http://tumejorjuego.com/descargar/index.php\\?link=[^\"]+)", + "pattern": "(http[s]?://tumejorjuego.com/descargar/index.php\\?link=[^\"]+)", "url": "\\1" } ]