diff --git a/plugin.video.alfa/channels/xtheatre.json b/plugin.video.alfa/channels/xms.json similarity index 75% rename from plugin.video.alfa/channels/xtheatre.json rename to plugin.video.alfa/channels/xms.json index 9e2184fa..64e505cd 100644 --- a/plugin.video.alfa/channels/xtheatre.json +++ b/plugin.video.alfa/channels/xms.json @@ -1,12 +1,12 @@ { - "id": "xtheatre", - "name": "xTheatre", + "id": "xms", + "name": "XMS", "active": true, "adult": true, "language": ["*"], "fanart": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebg.jpg", - "thumbnail": "https://xtheatre.net/wp-content/uploads/xtlogo.jpg", - "banner": "https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/xthearebm.png", + "thumbnail": "https://i.postimg.cc/wB0NsMTX/xms.png", + "banner": "https://i.postimg.cc/c6yh5C3K/xmsbn.png", "categories": [ "adult" ], diff --git a/plugin.video.alfa/channels/xtheatre.py b/plugin.video.alfa/channels/xms.py similarity index 64% rename from plugin.video.alfa/channels/xtheatre.py rename to plugin.video.alfa/channels/xms.py index e669d7f6..da7336d8 100644 --- a/plugin.video.alfa/channels/xtheatre.py +++ b/plugin.video.alfa/channels/xms.py @@ -10,9 +10,9 @@ from core import servertools from core.item import Item from platformcode import config, logger -__channel__ = "xtheatre" +__channel__ = "xms" -host = 'https://xtheatre.net/' +host = 'https://xxxmoviestream.com/' try: __modo_grafico__ = config.get_setting('modo_grafico', __channel__) __perfil__ = int(config.get_setting('perfil', __channel__)) @@ -43,7 +43,6 @@ def mainlist(item): logger.info() itemlist = [] - # thumbnail = 'https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/adults/%s.png' itemlist.append(Item(channel=__channel__, title="Ăšltimas", url=host + '?filtre=date&cat=0', action="peliculas", viewmode="movie_with_plot", viewcontent='movies', @@ -75,37 +74,26 @@ def peliculas(item): # logger.info(data) patron_todos = '
(.*?)
' - data = scrapertools.find_single_match(data, patron_todos) - patron = 'data-lazy-src="([^"]+)".*?' # img - patron += 'title="([^"]+)"/>.*?' # title - patron += '\d+") if paginacion: - itemlist.append(Item(channel=item.channel, action="sub_search", - title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion)) + itemlist.append(item.clone(channel=__channel__, action="sub_search", + title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion)) return itemlist @@ -186,21 +167,15 @@ def findvideos(item): itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|amp;|\s{2}| ", "", data) - logger.info(data) - patron_todos = '
(.*?)
' - data = scrapertools.find_single_match(data, patron_todos) - patron = '' matches = scrapertools.find_multiple_matches(data, patron) for url in matches: - title = item.title server = servertools.get_server_from_url(url) + title = "Ver en: [COLOR yellow](%s)[/COLOR]" % server - itemlist.append(item.clone(action='play', title=title, server=server, mediatype='movie', url=url)) + itemlist.append(item.clone(action='play', title=title, server=server, url=url)) - for videoitem in itemlist: - videoitem.infoLabels = item.infoLabels - videoitem.channel = item.channel - videoitem.title = "%s [COLOR yellow](%s)[/COLOR]" % (item.title, videoitem.server) return itemlist diff --git a/plugin.video.alfa/servers/netutv.py b/plugin.video.alfa/servers/netutv.py index cf31058c..35c1cf42 100755 --- a/plugin.video.alfa/servers/netutv.py +++ b/plugin.video.alfa/servers/netutv.py @@ -66,7 +66,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data = httptools.downloadpage("http://hqq.watch/player/get_md5.php?" + params, headers=head).data media_urls = [] url_data = jsontools.load(data) - media_url = "https:" + tb(url_data["obf_link"].replace("#", "")) + ".mp4.m3u8" + media_url = tb(url_data["obf_link"].replace("#", "")) + ".mp4.m3u8" + if not media_url.startswith("http"): + media_url = "https:" + media_url video_urls = [] media = media_url + "|User-Agent=Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X)" video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [netu.tv]", media, 0, subtitle])