diff --git a/plugin.video.alfa/channels/animeflv.json b/plugin.video.alfa/channels/animeflv.json index 81e1416a..01ed328b 100755 --- a/plugin.video.alfa/channels/animeflv.json +++ b/plugin.video.alfa/channels/animeflv.json @@ -37,17 +37,6 @@ "enabled": true, "visible": true }, - { - "id": "filter_languages", - "type": "list", - "label": "Mostrar enlaces en idioma...", - "default": 0, - "enabled": true, - "visible": true, - "lvalues": [ - "No filtrar" - ] - }, { "id": "include_in_newest_anime", "type": "bool", diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py index c7d80f6c..ec68dd95 100644 --- a/plugin.video.alfa/channels/animeflv.py +++ b/plugin.video.alfa/channels/animeflv.py @@ -9,22 +9,6 @@ from core import jsontools from core import scrapertools from core.item import Item from platformcode import logger -from channels import filtertools -from channels import autoplay - -list_language = ['No filtrar'] -logger.debug('lista_language: %s' % list_language) - -list_quality = ['default'] -list_servers = [ - 'izanagi', - 'yourupload', - 'okru', - 'netutv', - 'openload', - 'streamango', - 'mp4upload' -] HOST = "https://animeflv.net/" @@ -32,8 +16,6 @@ HOST = "https://animeflv.net/" def mainlist(item): logger.info() - autoplay.init(item.channel, list_servers, list_quality) - itemlist = list() itemlist.append(Item(channel=item.channel, action="novedades_episodios", title="Últimos episodios", url=HOST)) @@ -53,8 +35,6 @@ def mainlist(item): itemlist = renumbertools.show_option(item.channel, itemlist) - autoplay.show_option(item.channel, itemlist) - return itemlist @@ -151,7 +131,7 @@ def novedades_episodios(item): thumbnail = urlparse.urljoin(HOST, thumbnail) new_item = Item(channel=item.channel, action="findvideos", title=title, url=url, show=show, thumbnail=thumbnail, - fulltitle=title, context = autoplay.context) + fulltitle=title) itemlist.append(new_item) @@ -175,7 +155,7 @@ def novedades_anime(item): thumbnail = urlparse.urljoin(HOST, thumbnail) new_item = Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, - fulltitle=title, plot=plot, context = autoplay.context) + fulltitle=title, plot=plot) if _type != "Película": new_item.show = title new_item.context = renumbertools.context(item) @@ -209,7 +189,7 @@ def listado(item): thumbnail = urlparse.urljoin(HOST, thumbnail) new_item = Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, - fulltitle=title, plot=plot, context = autoplay.context) + fulltitle=title, plot=plot) if _type == "Anime": new_item.show = title @@ -262,7 +242,7 @@ def episodios(item): title = "%s: %sx%s" % (item.title, season, str(episode).zfill(2)) itemlist.append(item.clone(action="findvideos", title=title, url=url, thumbnail=thumb, fulltitle=title, - fanart=item.thumbnail, contentType="episode", context = autoplay.context)) + fanart=item.thumbnail, contentType="episode")) else: # no hay thumbnail matches = re.compile(']+>(.*?)<', re.DOTALL).findall(data) @@ -319,15 +299,11 @@ def findvideos(item): if video_urls: video_urls.sort(key=lambda v: int(v[0])) itemlist.append(item.clone(title="Enlace encontrado en %s" % server, action="play", - video_urls=video_urls, language='No filtrar', quality ='default', - server=server)) + video_urls=video_urls)) else: url = scrapertools.find_single_match(data, '"file":"([^"]+)"') if url: - if server == 'izanagi': - server = 'directo' - itemlist.append(item.clone(title="Enlace encontrado en %s" % server, url=url, action="play", - language='No filtrar', quality ='default', server=server)) + itemlist.append(item.clone(title="Enlace encontrado en %s" % server, url=url, action="play")) else: aux_url.append(e) @@ -339,14 +315,6 @@ def findvideos(item): videoitem.channel = item.channel videoitem.thumbnail = item.thumbnail - # Requerido para FilterTools - - itemlist = filtertools.get_links(itemlist, item, list_language) - - # Requerido para AutoPlay - - autoplay.start(itemlist, item) - return itemlist diff --git a/plugin.video.alfa/channels/animeshd.json b/plugin.video.alfa/channels/animeshd.json index 293ac85a..fdf04e49 100755 --- a/plugin.video.alfa/channels/animeshd.json +++ b/plugin.video.alfa/channels/animeshd.json @@ -21,24 +21,8 @@ "description": "First release" } ], - "categories": [ + "categories": [ "latino", "anime" - ], - "settings": [ - { - "id": "filter_languages", - "type": "list", - "label": "Mostrar enlaces en idioma...", - "default": 0, - "enabled": true, - "visible": true, - "lvalues": [ - "No filtrar", - "LAT", - "CAST", - "SUB" - ] - } ] } diff --git a/plugin.video.alfa/channels/animeshd.py b/plugin.video.alfa/channels/animeshd.py index 99e51916..3fd34f84 100755 --- a/plugin.video.alfa/channels/animeshd.py +++ b/plugin.video.alfa/channels/animeshd.py @@ -8,19 +8,6 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger -from channels import autoplay -from channels import filtertools - -IDIOMAS = {'Latino': 'LAT', 'Castellano':'CAST','Subtitulado': 'VOS'} -list_language = IDIOMAS.values() -logger.debug('lista_language: %s' % list_language) - -list_quality = ['default'] -list_servers = [ - 'rapidvideo', - 'downace', - 'openload' -] tgenero = {"Comedia": "https://s7.postimg.org/ne9g9zgwb/comedia.png", "Drama": "https://s16.postimg.org/94sia332d/drama.png", @@ -48,8 +35,6 @@ headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/ def mainlist(item): logger.info() - - autoplay.init(item.channel, list_servers, list_quality) itemlist = [] itemlist.append(item.clone(title="Ultimas", @@ -80,8 +65,6 @@ def mainlist(item): fanart='https://s30.postimg.org/pei7txpa9/buscar.png' )) - autoplay.show_option(item.channel, itemlist) - return itemlist @@ -178,16 +161,10 @@ def episodios(item): matches = re.compile(patron, re.DOTALL).findall(data) for scrapedurl, scrapedlang, scrapedtitle in matches: - language = IDIOMAS[scrapedlang] - + language = scrapedlang title = scrapedtitle + ' (%s)' % language url = scrapedurl - itemlist.append(item.clone(title=title, - url=url, - action='findvideos', - language=language, - quality ='default' - )) + itemlist.append(item.clone(title=title, url=url, action='findvideos', language=language)) return itemlist @@ -203,13 +180,6 @@ def findvideos(item): videoitem.channel = item.channel videoitem.title = title videoitem.action = 'play' - videoitem.language = item.language - # Requerido para FilterTools - itemlist = filtertools.get_links(itemlist, item, list_language) - - # Requerido para AutoPlay - - autoplay.start(itemlist, item) return itemlist diff --git a/plugin.video.alfa/channels/hdfull.json b/plugin.video.alfa/channels/hdfull.json index f0e4b9f1..c1512fa4 100755 --- a/plugin.video.alfa/channels/hdfull.json +++ b/plugin.video.alfa/channels/hdfull.json @@ -49,21 +49,6 @@ "enabled": "!eq(-1,'')", "visible": true }, - { - "id": "filter_languages", - "type": "list", - "label": "Mostrar enlaces en idioma...", - "default": 0, - "enabled": true, - "visible": true, - "lvalues": [ - "No filtrar", - "Latino", - "Español", - "VOS", - "VOSE" - ] - }, { "id": "include_in_global_search", "type": "bool", @@ -73,4 +58,4 @@ "visible": true } ] -} +} \ No newline at end of file diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index 19d1b90c..5156104b 100755 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -12,20 +12,6 @@ from core import servertools from core.item import Item from platformcode import config, logger from platformcode import platformtools -from channels import filtertools -from channels import autoplay - -IDIOMAS = {'LAT': 'Latino', 'ESP': 'Español', 'ESPSUB': 'VOS', 'ENGSUB' : 'VOSE'} -list_language = IDIOMAS.values() -list_quality = ['RHDTV', 'HD0180M', 'HD720M', 'TS'] -list_servers = [ - 'openload', - 'powvideo', - 'streamplay', - 'streamcloud', - 'nowvideo' - -] host = "http://hdfull.tv" @@ -56,7 +42,7 @@ def login(): def mainlist(item): logger.info() - autoplay.init(item.channel, list_servers, list_quality) + itemlist = [] itemlist.append(Item(channel=item.channel, action="menupeliculas", title="Películas", url=host, folder=True)) @@ -70,7 +56,6 @@ def mainlist(item): login() itemlist.append(Item(channel=item.channel, action="settingCanal", title="Configuración...", url="")) - autoplay.show_option(item.channel, itemlist) return itemlist @@ -480,8 +465,7 @@ def episodios(item): 'id'] + ";3" itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url, - thumbnail=thumbnail, show=item.show, folder=True, contentType="episode", - context =autoplay.context)) + thumbnail=thumbnail, show=item.show, folder=True, contentType="episode")) if config.get_videolibrary_support() and len(itemlist) > 0: itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=url_targets, @@ -712,13 +696,11 @@ def findvideos(item): fanart = scrapertools.find_single_match(data, '
0: return itemlist @@ -291,14 +284,6 @@ def findvideos(item): list_links = filtertools.get_links(list_links, item, list_idiomas, CALIDADES) - # Requerido para FilterTools - - itemlist = filtertools.get_links(list_links, item, list_idiomas) - - # Requerido para AutoPlay - - autoplay.start(list_links, item) - return list_links diff --git a/plugin.video.alfa/servers/mp4upload.py b/plugin.video.alfa/servers/mp4upload.py old mode 100755 new mode 100644 diff --git a/plugin.video.alfa/servers/openload.py b/plugin.video.alfa/servers/openload.py old mode 100755 new mode 100644 index 20726a4a..9baff26c --- a/plugin.video.alfa/servers/openload.py +++ b/plugin.video.alfa/servers/openload.py @@ -52,7 +52,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= numeros = scrapertools.find_multiple_matches(data, '_[A-f0-9]+x[A-f0-9]+\s*(?:=|\^)\s*([0-9]{4,}|0x[A-f0-9]{4,})') op1, op2 = scrapertools.find_single_match(data, '\(0x(\d),0x(\d)\);') - + idparse = scrapertools.find_single_match(data, "\^parseInt\('([0-9]+)'") videourl = "" for encode in var_encodes: text_decode = "" @@ -81,7 +81,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= if value3 < index1: break - value4 = value2 ^ decode1[j % (mult / 8)] + value4 = value2 ^ decode1[j % (mult / 8)] ^ int(idparse,8) for n in numeros: if not n.isdigit(): n = int(n, 16)