stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #54 from Intel11/ultimo

Browse Source 
Actualizaciones
This commit is contained in:
Alfa
2017-08-29 15:56:07 -04:00
committed by GitHub
parent 5565a3d81b 3a7337b805
commit d9b41dfc5c
6 changed files with 88 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.video.alfa/channels/news.py
+29 -41
View File
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# ------------------------------------------------------------ # ------------------------------------------------------------
# Channel for recent videos on several channels # Channel for recent videos on several channels
# ------------------------------------------------------------ # ------------------------------------------------------------
@@ -41,63 +41,51 @@ def mainlist(item):
if list_canales['peliculas']: if list_canales['peliculas']:
thumbnail = get_thumb("channels_movie.png") thumbnail = get_thumb("channels_movie.png")
new_item = Item(channel=item.channel, action="novedades", extra="peliculas", title="Películas", new_item = Item(channel=item.channel, action="novedades", extra="peliculas", title="Películas",
thumbnail=thumbnail) thumbnail=thumbnail)
new_item.context = [{"title": "Canales incluidos en: %s" % new_item.title, set_category_context(new_item)
"extra": new_item.extra, itemlist.append(new_item)
"action": "setting_channel",
"channel": new_item.channel}]
new_item.category = "Novedades en %s" % new_item.extra
itemlist.append(new_item)
if list_canales['infantiles']: if list_canales['infantiles']:
thumbnail = get_thumb("channels_children.png") thumbnail = get_thumb("channels_children.png")
new_item = Item(channel=item.channel, action="novedades", extra="infantiles", title="Para niños", new_item = Item(channel=item.channel, action="novedades", extra="infantiles", title="Para niños",
thumbnail=thumbnail) thumbnail=thumbnail)
new_item.context = [{"title": "Canales incluidos en: %s" % new_item.title, set_category_context(new_item)
"extra": new_item.extra, itemlist.append(new_item)
"action": "setting_channel",
"channel": new_item.channel}]
new_item.category = "Novedades en %s" % new_item.extra
itemlist.append(new_item)
if list_canales['series']: if list_canales['series']:
thumbnail = get_thumb("channels_tvshow.png") thumbnail = get_thumb("channels_tvshow.png")
new_item = Item(channel=item.channel, action="novedades", extra="series", title="Episodios de series", new_item = Item(channel=item.channel, action="novedades", extra="series", title="Episodios de series",
thumbnail=thumbnail) thumbnail=thumbnail)
new_item.context = [{"title": "Canales incluidos en: %s" % new_item.title, set_category_context(new_item)
"extra": new_item.extra, itemlist.append(new_item)
"action": "setting_channel",
"channel": new_item.channel}]
new_item.category = "Novedades en %s" % new_item.extra
itemlist.append(new_item)
if list_canales['anime']: if list_canales['anime']:
thumbnail = get_thumb("channels_anime.png") thumbnail = get_thumb("channels_anime.png")
new_item = Item(channel=item.channel, action="novedades", extra="anime", title="Episodios de anime", new_item = Item(channel=item.channel, action="novedades", extra="anime", title="Episodios de anime",
thumbnail=thumbnail) thumbnail=thumbnail)
new_item.context = [{"title": "Canales incluidos en: %s" % new_item.title, set_category_context(new_item)
"extra": new_item.extra, itemlist.append(new_item)
"action": "setting_channel",
"channel": new_item.channel}]
new_item.category = "Novedades en %s" % new_item.extra
itemlist.append(new_item)
if list_canales['documentales']: if list_canales['documentales']:
thumbnail = get_thumb("channels_documentary.png") thumbnail = get_thumb("channels_documentary.png")
new_item = Item(channel=item.channel, action="novedades", extra="documentales", title="Documentales", new_item = Item(channel=item.channel, action="novedades", extra="documentales", title="Documentales",
thumbnail=thumbnail) thumbnail=thumbnail)
new_item.context = [{"title": "Canales incluidos en: %s" % new_item.title, set_category_context(new_item)
"extra": new_item.extra, itemlist.append(new_item)
"action": "setting_channel",
"channel": new_item.channel}]
new_item.category = "Novedades en %s" % new_item.extra
itemlist.append(new_item)
return itemlist return itemlist
def set_category_context(item):
item.context = [{"title": "Canales incluidos en: %s" % item.title,
"extra": item.extra,
"action": "setting_channel",
"channel": item.channel}]
item.category = "Novedades en %s" % item.extra
def get_channels_list(): def get_channels_list():
logger.info() logger.info()
plugin.video.alfa/channels/peliculasrey.py
+42 -50
View File
@@ -9,18 +9,18 @@ from core import servertools
from core.item import Item from core.item import Item
from platformcode import logger, config from platformcode import logger, config
host = "http://www.peliculasrey.com/"
def mainlist(item): def mainlist(item):
logger.info() logger.info()
itemlist = [] itemlist = []
itemlist.append( itemlist.append(Item(channel=item.channel, action="peliculas", title="Recientes", url=host))
Item(channel=item.channel, action="PorFecha", title="Año de Lanzamiento", url="http://www.peliculasrey.com")) itemlist.append(Item(channel=item.channel, action="PorFecha", title="Año de Lanzamiento", url=host))
itemlist.append(Item(channel=item.channel, action="Idiomas", title="Idiomas", url="http://www.peliculasrey.com")) itemlist.append(Item(channel=item.channel, action="Idiomas", title="Idiomas", url=host))
itemlist.append( itemlist.append(Item(channel=item.channel, action="calidades", title="Por calidad", url=host))
Item(channel=item.channel, action="calidades", title="Por calidad", url="http://www.peliculasrey.com")) itemlist.append(Item(channel=item.channel, action="generos", title="Por género", url=host))
itemlist.append(Item(channel=item.channel, action="generos", title="Por género", url="http://www.peliculasrey.com")) itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url=host))
itemlist.append(Item(channel=item.channel, action="search", title="Buscar...", url="http://www.peliculasrey.com"))
return itemlist return itemlist
@@ -31,7 +31,6 @@ def PorFecha(item):
# Descarga la pagina # Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
data = scrapertools.find_single_match(data, '<section class="lanzamiento">(.*?)</section>') data = scrapertools.find_single_match(data, '<section class="lanzamiento">(.*?)</section>')
logger.info("data=" + data)
# Extrae las entradas (carpetas) # Extrae las entradas (carpetas)
patron = '<a href="([^"]+).*?title="([^"]+)' patron = '<a href="([^"]+).*?title="([^"]+)'
@@ -43,7 +42,6 @@ def PorFecha(item):
thumbnail = "" thumbnail = ""
plot = "" plot = ""
url = urlparse.urljoin(item.url, scrapedurl) url = urlparse.urljoin(item.url, scrapedurl)
logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
itemlist.append( itemlist.append(
Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot, Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot,
fulltitle=title, viewmode="movie")) fulltitle=title, viewmode="movie"))
@@ -57,7 +55,6 @@ def Idiomas(item):
# Descarga la pagina # Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
data = scrapertools.find_single_match(data, '<section class="idioma">(.*?)</section>') data = scrapertools.find_single_match(data, '<section class="idioma">(.*?)</section>')
logger.info("data=" + data)
# Extrae las entradas (carpetas) # Extrae las entradas (carpetas)
patron = '<a href="([^"]+).*?title="([^"]+)' patron = '<a href="([^"]+).*?title="([^"]+)'
@@ -69,7 +66,6 @@ def Idiomas(item):
thumbnail = "" thumbnail = ""
plot = "" plot = ""
url = urlparse.urljoin(item.url, scrapedurl) url = urlparse.urljoin(item.url, scrapedurl)
logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
itemlist.append( itemlist.append(
Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot, Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot,
fulltitle=title, viewmode="movie")) fulltitle=title, viewmode="movie"))
@@ -83,7 +79,6 @@ def calidades(item):
# Descarga la pagina # Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
data = scrapertools.find_single_match(data, '<section class="calidades">(.*?)</section>') data = scrapertools.find_single_match(data, '<section class="calidades">(.*?)</section>')
logger.info("data=" + data)
# Extrae las entradas (carpetas) # Extrae las entradas (carpetas)
patron = '<a href="([^"]+).*?title="([^"]+)' patron = '<a href="([^"]+).*?title="([^"]+)'
@@ -95,7 +90,6 @@ def calidades(item):
thumbnail = "" thumbnail = ""
plot = "" plot = ""
url = urlparse.urljoin(item.url, scrapedurl) url = urlparse.urljoin(item.url, scrapedurl)
logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
itemlist.append( itemlist.append(
Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot, Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot,
fulltitle=title, viewmode="movie")) fulltitle=title, viewmode="movie"))
@@ -106,12 +100,8 @@ def calidades(item):
def generos(item): def generos(item):
logger.info() logger.info()
# Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
data = scrapertools.find_single_match(data, '<section class="generos">(.*?)</section>') data = scrapertools.find_single_match(data, '<section class="generos">(.*?)</section>')
logger.info("data=" + data)
# Extrae las entradas (carpetas)
patron = '<a href="([^"]+).*?title="([^"]+)' patron = '<a href="([^"]+).*?title="([^"]+)'
matches = re.compile(patron, re.DOTALL).findall(data) matches = re.compile(patron, re.DOTALL).findall(data)
itemlist = [] itemlist = []
@@ -121,7 +111,6 @@ def generos(item):
thumbnail = "" thumbnail = ""
plot = "" plot = ""
url = urlparse.urljoin(item.url, scrapedurl) url = urlparse.urljoin(item.url, scrapedurl)
logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
if "Adulto" in title and config.get_setting("adult_mode") == 0: if "Adulto" in title and config.get_setting("adult_mode") == 0:
continue continue
itemlist.append( itemlist.append(
@@ -134,7 +123,7 @@ def generos(item):
def search(item, texto): def search(item, texto):
logger.info() logger.info()
texto = texto.replace(" ", "+") texto = texto.replace(" ", "+")
item.url = "http://www.peliculasrey.com/?s=" + texto item.url = host + "?s=" + texto
try: try:
# return buscar(item) # return buscar(item)
@@ -152,7 +141,6 @@ def peliculas(item):
# Descarga la pagina # Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
logger.info("data=" + data)
data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data) data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
tabla_pelis = scrapertools.find_single_match(data, tabla_pelis = scrapertools.find_single_match(data,
@@ -163,13 +151,11 @@ def peliculas(item):
itemlist = [] itemlist = []
for scrapedthumbnail, scrapedtitle, scrapedurl in matches: for scrapedthumbnail, scrapedtitle, scrapedurl in matches:
logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl, itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, url=scrapedurl,
thumbnail=scrapedthumbnail, plot="", fulltitle=scrapedtitle)) thumbnail=scrapedthumbnail, plot="", fulltitle=scrapedtitle))
next_page = scrapertools.find_single_match(data, 'rel="next" href="([^"]+)') next_page = scrapertools.find_single_match(data, 'rel="next" href="([^"]+)')
if next_page != "": if next_page != "":
# itemlist.append( Item(channel=item.channel, action="peliculas" , title=">> Página siguiente" , url=item.url+next_page, folder=True, viewmode="movie"))
itemlist.append( itemlist.append(
Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=next_page, folder=True, Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=next_page, folder=True,
viewmode="movie")) viewmode="movie"))
@@ -180,40 +166,46 @@ def peliculas(item):
def findvideos(item): def findvideos(item):
logger.info() logger.info()
# Descarga la pagina
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
# logger.info("data="+data)
# Extrae las entradas (carpetas)
patron = 'hand" rel="([^"]+).*?title="(.*?)".*?<span>([^<]+)</span>.*?</span><span class="q">(.*?)<' patron = 'hand" rel="([^"]+).*?title="(.*?)".*?<span>([^<]+)</span>.*?</span><span class="q">(.*?)<'
matches = re.compile(patron, re.DOTALL).findall(data) matches = re.compile(patron, re.DOTALL).findall(data)
itemlist = [] itemlist = []
itemtemp = []
for scrapedurl, nombre_servidor, idioma, calidad in matches: for scrapedurl, nombre_servidor, idioma, calidad in matches:
idioma = idioma.strip() idioma = idioma.strip()
calidad = calidad.strip() calidad = calidad.strip()
if "youapihd" in nombre_servidor.lower():
title = "Ver en " + nombre_servidor + " (" + idioma + ") (Calidad " + calidad + ")" nombre_servidor = "gvideo"
url = scrapedurl if "pelismundo" in scrapedurl:
thumbnail = "" data = httptools.downloadpage(scrapedurl, add_referer = True).data
plot = "" patron = 'sources.*?}],'
logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") bloque = scrapertools.find_single_match(data, patron)
itemlist.append(Item(channel=item.channel, action="play", title=title, url=url, thumbnail=thumbnail, plot=plot, patron = 'file.*?"([^"]+)".*?label:"([^"]+)"'
folder=False)) match = scrapertools.find_multiple_matches(bloque, patron)
for scrapedurl1, scrapedlabel1 in match:
return itemlist itemtemp.append([scrapedlabel1, scrapedurl1])
itemtemp.sort(key=lambda it: int(it[0].replace("p", "")))
for videoitem in itemtemp:
def play(item): itemlist.append(Item(channel = item.channel,
logger.info("url=" + item.url) action = "play",
extra = "hdvids",
itemlist = servertools.find_video_items(data=item.url) fulltitle = item.title,
server = "directo",
for videoitem in itemlist: thumbnail = item.thumbnail,
videoitem.title = item.title title = "Ver en " + nombre_servidor + " (" + idioma + ") (Calidad " + videoitem[0] + ")",
videoitem.fulltitle = item.fulltitle url = videoitem[1]
videoitem.thumbnail = item.thumbnail ))
videoitem.channel = item.channel else:
itemlist.append(Item(channel=item.channel,
action = "play",
extra = "",
fulltitle = item.title,
server = "",
title = "Ver en " + nombre_servidor + " (" + idioma + ") (Calidad " + calidad + ")",
thumbnail = item.thumbnail,
url = scrapedurl,
folder = False
))
itemlist = servertools.get_servers_itemlist(itemlist)
return itemlist return itemlist
plugin.video.alfa/channels/trailertools.py
+1 -1
View File
@@ -542,7 +542,7 @@ try:
elif item.action == "play" and not self.item.windowed: elif item.action == "play" and not self.item.windowed:
for window in window_select: for window in window_select:
window.close() window.close()
retorna = platformtools.play_video(item) retorna = platformtools.play_video(item, force_direct=True)
if not retorna: if not retorna:
while True: while True:
xbmc.sleep(1000) xbmc.sleep(1000)
plugin.video.alfa/platformcode/platformtools.py
+12 -2
View File
@@ -452,7 +452,7 @@ def is_playing():
return xbmc.Player().isPlaying() return xbmc.Player().isPlaying()
def play_video(item, strm=False): def play_video(item, strm=False, force_direct=False):
logger.info() logger.info()
# logger.debug(item.tostring('\n')) # logger.debug(item.tostring('\n'))
@@ -503,7 +503,17 @@ def play_video(item, strm=False):
xlistitem.setProperty('inputstream.adaptive.manifest_type', 'mpd') xlistitem.setProperty('inputstream.adaptive.manifest_type', 'mpd')
# se lanza el reproductor # se lanza el reproductor
set_player(item, xlistitem, mediaurl, view, strm) if force_direct: # cuando viene de una ventana y no directamente de la base del addon
# Añadimos el listitem a una lista de reproducción (playlist)
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
playlist.clear()
playlist.add(mediaurl, xlistitem)
# Reproduce
xbmc_player = xbmc.Player()
xbmc_player.play(playlist, xlistitem)
else:
set_player(item, xlistitem, mediaurl, view, strm)
def stop_video(): def stop_video():
plugin.video.alfa/servers/gvideo.json
+2 -1
View File
@@ -48,5 +48,6 @@
"visible": false "visible": false
} }
], ],
"thumbnail": "https://s11.postimg.org/giobzkprz/logo-google1.png",
"version": 1 "version": 1
} }
plugin.video.alfa/servers/kingvid.py
+2 -2
View File
@@ -11,7 +11,7 @@ def test_video_exists(page_url):
data = httptools.downloadpage(page_url).data data = httptools.downloadpage(page_url).data
if "<title>watch </title>" in data.lower(): if "<title>watch </title>" in data.lower():
return False, "[kingvid] El archivo no existe o ha sido borrado" return False, "[kingvid] El archivo no existe o ha sido borrado"
return True, "" return True, ""
@@ -19,7 +19,7 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""): def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url) logger.info("(page_url='%s')" % page_url)
data = httptools.downloadpage(page_url).data data = httptools.downloadpage(page_url, add_referer = True).data
match = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>") match = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
data = jsunpack.unpack(match) data = jsunpack.unpack(match)