arreglos de archivos

This commit is contained in:
alfa-addon
2017-08-19 20:50:14 -04:00
parent 56fbb033e1
commit b3ca96783b
9 changed files with 18 additions and 158 deletions

View File

@@ -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",

View File

@@ -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('<a href="(/ver/[^"]+)"[^>]+>(.*?)<', 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

View File

@@ -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"
]
}
]
}

View File

@@ -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

View File

@@ -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
}
]
}
}

View File

@@ -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, '<div style="background-image.url. ([^\s]+)')
if account:
url += "###" + id + ";" + type
logger.debug('idioma: %s'%idioma)
logger.debug('IDIOMAS[idioma]: %s' % IDIOMAS[idioma])
enlaces.append(
Item(channel=item.channel, action="play", title=title, fulltitle=title, url=url, thumbnail=thumbnail,
plot=plot, fanart=fanart, show=item.show, folder=True, server=servername, infoLabels=infolabels,
contentTitle=item.contentTitle, contentType=item.contentType, tipo=option, language =
IDIOMAS[idioma], quality=calidad, context= autoplay.context))
contentTitle=item.contentTitle, contentType=item.contentType, tipo=option))
enlaces.sort(key=lambda it: it.tipo, reverse=True)
itemlist.extend(enlaces)
@@ -731,9 +713,6 @@ def findvideos(item):
except:
pass
itemlist = filtertools.get_links(itemlist, item, list_language)
autoplay.start(itemlist, item)
return itemlist

View File

@@ -10,21 +10,16 @@ from core import scrapertoolsV2
from core import servertools
from core.item import Item
from platformcode import config, logger
from channels import autoplay
HOST = "http://seriesblanco.com/"
IDIOMAS = {'es': 'Español', 'en': 'Inglés', 'la': 'Latino', 'vo': 'VO', 'vos': 'VOS', 'vosi': 'VOSI', 'otro': 'OVOS'}
list_idiomas = IDIOMAS.values()
CALIDADES = ['SD', 'HDiTunes', 'Micro-HD-720p', 'Micro-HD-1080p', '1080p', '720p']
list_servers =['youwatch','powvideo', 'openload', 'streamplay', 'streaminto', 'flashx', 'gamovideo', 'nowvideo',
'rockfile']
def mainlist(item):
logger.info()
autoplay.init(item.channel, list_servers, CALIDADES)
thumb_series = get_thumb("channels_tvshow.png")
thumb_series_az = get_thumb("channels_tvshow_az.png")
thumb_buscar = get_thumb("search.png")
@@ -49,7 +44,6 @@ def mainlist(item):
thumbnail=thumb_buscar))
itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES)
autoplay.show_option(item.channel, itemlist)
return itemlist
@@ -205,8 +199,7 @@ def episodios(item):
display_title = "%s - %s %s" % (item.show, title, idiomas)
# logger.debug("Episode found %s: %s" % (display_title, urlparse.urljoin(HOST, url)))
itemlist.append(item.clone(title=display_title, url=urlparse.urljoin(HOST, url),
action="findvideos", plot=plot, fanart=fanart, language=filter_lang,
context = autoplay.context))
action="findvideos", plot=plot, fanart=fanart, language=filter_lang))
itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES)
@@ -255,7 +248,7 @@ def parse_videos(item, type_str, data):
itemlist.append(
item.clone(title=title, fulltitle=item.title, url=urlparse.urljoin(HOST, v_fields.get("link")),
action="play", language=IDIOMAS.get(v_fields.get("language"), "OVOS"),
quality=quality, server= v_fields.get("server")))
quality=quality))
if len(itemlist) > 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

0
plugin.video.alfa/servers/mp4upload.py Executable file → Normal file
View File

4
plugin.video.alfa/servers/openload.py Executable file → Normal file
View File

@@ -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)