diff --git a/plugin.video.alfa/channels/inkapelis.py b/plugin.video.alfa/channels/inkapelis.py index f967d593..1172655f 100644 --- a/plugin.video.alfa/channels/inkapelis.py +++ b/plugin.video.alfa/channels/inkapelis.py @@ -28,6 +28,8 @@ list_language = IDIOMAS.values() list_quality = ['Cam', 'TSHQ', 'Dvdrip', 'Blurayrip', 'HD Rip 320p', 'hd rip 320p', 'HD Real 720p', 'Full HD 1080p'] list_servers = ['openload', 'gamovideo', 'streamplay', 'streamango', 'vidoza'] +host = 'https://www.inkapelis.to/' + def mainlist(item): logger.info() @@ -35,28 +37,28 @@ def mainlist(item): autoplay.init(item.channel, list_servers, list_quality) itemlist = [] - itemlist.append(Item(channel=item.channel, title="Novedades", action="entradas", url="http://www.inkapelis.com/", + itemlist.append(Item(channel=item.channel, title="Novedades", action="entradas", url=host, extra="Novedades", text_color=color1, thumbnail=get_thumb('newest', auto=True))) #itemlist.append(Item(channel=item.channel, title="Estrenos", action="entradas", url="http://www.inkapelis.com/genero/estrenos/", # text_color=color1, thumbnail=get_thumb('premieres', auto=True))) itemlist.append(Item(channel=item.channel, title="Castellano", action="entradas", - url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Castellano&s=", + url=host+"?anio=&genero=&calidad=&idioma=Castellano&s=", extra="Buscar", text_color=color1, thumbnail=get_thumb('espanolas', auto=True))) itemlist.append(Item(channel=item.channel, title="Latino", action="entradas", - url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Latino&s=", + url=host+"?anio=&genero=&calidad=&idioma=Latino&s=", extra="Buscar", text_color=color1, thumbnail=get_thumb('latino', auto=True))) itemlist.append(Item(channel=item.channel, title="VOSE", action="entradas", - url="https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Subtitulada&s=", + url=host+"?anio=&genero=&calidad=&idioma=Subtitulada&s=", extra="Buscar", text_color=color1, thumbnail=get_thumb('newest', auto=True))) - itemlist.append(Item(channel=item.channel, title="Géneros", action="generos", url="http://www.inkapelis.com/", text_color=color1, + itemlist.append(Item(channel=item.channel, title="Géneros", action="generos", url=host, text_color=color1, thumbnail=get_thumb('genres', auto=True),)) - itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url="http://www.inkapelis.com/?s=", text_color=color1)) + itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=host+"?s=", text_color=color1)) itemlist.append(Item(channel=item.channel, action="", title="")) itemlist.append( - Item(channel=item.channel, action="filtro", title="Filtrar películas", url="http://www.inkapelis.com/?s=", text_color=color1)) + Item(channel=item.channel, action="filtro", title="Filtrar películas", url=host+"?s=", text_color=color1)) # Filtros personalizados para peliculas for i in range(1, 4): filtros = config.get_setting("pers_peliculas" + str(i), item.channel) @@ -65,7 +67,7 @@ def mainlist(item): new_item = item.clone() new_item.values = filtros itemlist.append( - new_item.clone(action="filtro", title=title, url="http://www.inkapelis.com/?s=", text_color=color2)) + new_item.clone(action="filtro", title=title, url=host+"?s=", text_color=color2)) itemlist.append(Item(channel=item.channel, action="configuracion", title="Configurar canal...", text_color="gold", folder=False)) autoplay.show_option(item.channel, itemlist) @@ -86,21 +88,21 @@ def newest(categoria): item = Item() try: if categoria == "peliculas": - item.url = "http://www.inkapelis.com/" + item.url = host item.action = "entradas" item.extra = "Novedades" if categoria == "terror": - item.url = "https://www.inkapelis.com/genero/terror/" + item.url = host+"genero/terror/" item.action = "entradas" if categoria == "castellano": - item.url = "https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Castellano&s=" + item.url = host+"?anio=&genero=&calidad=&idioma=Castellano&s=" item.extra = "Buscar" item.action = "entradas" if categoria == "latino": - item.url = "https://www.inkapelis.com/?anio=&genero=&calidad=&idioma=Latino&s=" + item.url = host+"?anio=&genero=&calidad=&idioma=Latino&s=" item.extra = "Buscar" item.action = "entradas" itemlist = entradas(item) @@ -122,7 +124,7 @@ def search(item, texto): logger.info() itemlist = [] item.extra = "Buscar" - item.url = "http://www.inkapelis.com/?s=%s" % texto + item.url = host+"?s=%s" % texto try: return entradas(item) @@ -254,7 +256,7 @@ def filtrado(item, values): item.valores = "Filtro: " + ", ".join(sorted(strings)) item.strings = "" - item.url = "http://www.inkapelis.com/?anio=%s&genero=%s&calidad=%s&idioma=%s&s=%s" % \ + item.url = host+"?anio=%s&genero=%s&calidad=%s&idioma=%s&s=%s" % \ (year, genero, calidad, idioma, texto) item.extra = "Buscar" @@ -292,7 +294,7 @@ def entradas(item): else: # Extrae las entradas if item.extra == "Novedades": - data2 = data.split("

Últimas Películas Agregadas y Actualizadas

", 1)[1] + data2 = data.split("

Últimas Películas Agregadas y Actualizadas

", 1)[1] entradas = scrapertools.find_multiple_matches(data2, '
(.*?)
') else: diff --git a/plugin.video.alfa/channels/tvmoviedb.json b/plugin.video.alfa/channels/tvmoviedb.json index e82411cb..4f07d4dc 100755 --- a/plugin.video.alfa/channels/tvmoviedb.json +++ b/plugin.video.alfa/channels/tvmoviedb.json @@ -15,7 +15,7 @@ "id": "tmdb", "type": "list", "label": "@70418", - "default": 3, + "default": 4, "enabled": true, "visible": true, "lvalues": [ @@ -52,7 +52,7 @@ "type": "list", "label": "@70427", "color": "0xFFE0F04B", - "default": 3, + "default": 4, "enabled": true, "visible": true, "lvalues": [ diff --git a/plugin.video.alfa/resources/media/servers/server_movshare.png b/plugin.video.alfa/resources/media/servers/server_movshare.png deleted file mode 100755 index 4838828a..00000000 Binary files a/plugin.video.alfa/resources/media/servers/server_movshare.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/servers/server_nowvideo.png b/plugin.video.alfa/resources/media/servers/server_nowvideo.png deleted file mode 100755 index d994b971..00000000 Binary files a/plugin.video.alfa/resources/media/servers/server_nowvideo.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/servers/server_vidspot.png b/plugin.video.alfa/resources/media/servers/server_vidspot.png deleted file mode 100755 index ec598b87..00000000 Binary files a/plugin.video.alfa/resources/media/servers/server_vidspot.png and /dev/null differ diff --git a/plugin.video.alfa/servers/mp4upload.py b/plugin.video.alfa/servers/mp4upload.py index 83134cb1..a99f864a 100644 --- a/plugin.video.alfa/servers/mp4upload.py +++ b/plugin.video.alfa/servers/mp4upload.py @@ -7,25 +7,24 @@ from core import scrapertools from lib import jsunpack from platformcode import logger +def test_video_exists(page_url): + data = httptools.downloadpage(page_url).data + if data == "File was deleted" or data == '': + return False, "[mp4upload] El video ha sido borrado" + def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - data = re.sub(r"\n|\r|\t|\s{2}", "", httptools.downloadpage(page_url).data) - match = scrapertools.find_single_match(data, "") data = jsunpack.unpack(match) data = data.replace("\\'", "'") - media_url = scrapertools.find_single_match(data, '{type:"video/mp4",src:"([^"]+)"}') if not media_url: media_url = scrapertools.find_single_match(data, '"file":"([^"]+)') logger.info("media_url=" + media_url) - video_urls = list() video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [mp4upload]", media_url]) - for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) - return video_urls diff --git a/plugin.video.alfa/servers/powvideo.json b/plugin.video.alfa/servers/powvideo.json index b7670faf..901bd15f 100755 --- a/plugin.video.alfa/servers/powvideo.json +++ b/plugin.video.alfa/servers/powvideo.json @@ -4,8 +4,8 @@ "ignore_urls": [], "patterns": [ { - "pattern": "powvideo.(?:net|xyz|cc)/(?:embed-|iframe-|preview-|)([a-z0-9]+)", - "url": "http://powvideo.net/iframe-\\1-954x562.html" + "pattern": "(?:powvideo|povw1deo).(?:net|xyz|com)/(?:embed-|iframe-|preview-|)([a-z0-9]+)", + "url": "http://powvideo.net/iframe-\\1-1536x701.html" } ] }, diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index 7d32954b..6375f4d3 100644 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -14,6 +14,9 @@ headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/2 def test_video_exists(page_url): referer = page_url.replace('iframe', 'preview') + + httptools.downloadpage(referer) + data = httptools.downloadpage(page_url, headers={'referer': referer}).data if data == "File was deleted" or data == '': return False, "[powvideo] El video ha sido borrado"