Arreglos Varios
This commit is contained in:
committed by
GitHub
parent
eb60c48ed9
commit
4780b08d9f
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"id": "animeflv_me",
|
"id": "animeflv_me",
|
||||||
"name": "Animeflv.ME",
|
"name": "Animeflv.ME",
|
||||||
"active": true,
|
"active": true,
|
||||||
@@ -8,6 +8,10 @@
|
|||||||
"banner": "http://i.imgur.com/dTZwCPq.png",
|
"banner": "http://i.imgur.com/dTZwCPq.png",
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"changes": [
|
"changes": [
|
||||||
|
{
|
||||||
|
"date": "03/09/2017",
|
||||||
|
"description": "Añadidos links de openload (No disponible de momento con la videoteca)"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"date": "15/03/2017",
|
"date": "15/03/2017",
|
||||||
"description": "limpieza código"
|
"description": "limpieza código"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import urlparse
|
import urlparse
|
||||||
@@ -315,7 +315,6 @@ def episodios(item):
|
|||||||
itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios",
|
itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios",
|
||||||
url=item.url, action="download_all_episodes", extra="episodios",
|
url=item.url, action="download_all_episodes", extra="episodios",
|
||||||
show=item.show))
|
show=item.show))
|
||||||
|
|
||||||
return itemlist
|
return itemlist
|
||||||
|
|
||||||
|
|
||||||
@@ -324,23 +323,48 @@ def findvideos(item):
|
|||||||
|
|
||||||
itemlist = []
|
itemlist = []
|
||||||
|
|
||||||
page_html = get_url_contents(item.url)
|
|
||||||
|
|
||||||
regex_api = r'http://player\.animeflv\.me/[^\"]+'
|
|
||||||
iframe_url = scrapertools.find_single_match(page_html, regex_api)
|
|
||||||
|
|
||||||
iframe_html = get_url_contents(iframe_url)
|
|
||||||
|
|
||||||
regex_video_list = r'var part = \[([^\]]+)'
|
|
||||||
|
|
||||||
videos_html = scrapertools.find_single_match(iframe_html, regex_video_list)
|
|
||||||
videos = re.findall('"([^"]+)"', videos_html, re.DOTALL)
|
|
||||||
|
|
||||||
qualities = ["360", "480", "720", "1080"]
|
qualities = ["360", "480", "720", "1080"]
|
||||||
|
if 'player' in item.url:
|
||||||
for quality_id, video_url in enumerate(videos):
|
page_html = get_url_contents(item.url)
|
||||||
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", page_html)
|
||||||
|
patron_open='<!-- Start .+? -->.+?<iframe src="(.+?)"'
|
||||||
|
video_url = scrapertools.find_single_match(data, patron_open)
|
||||||
|
#for server,video_url in videos_url:
|
||||||
|
server="openload"
|
||||||
itemlist.append(Item(channel=item.channel, action="play", url=video_url, show=re.escape(item.show),
|
itemlist.append(Item(channel=item.channel, action="play", url=video_url, show=re.escape(item.show),
|
||||||
title="Ver en calidad [{0}]".format(qualities[quality_id]), plot=item.plot,
|
title="Ver en "+server+" [{0}]".format(qualities[1]), plot=item.plot, server=server,
|
||||||
folder=True, fulltitle=item.title, viewmode="movies_with_plot"))
|
folder=True, fulltitle=item.title, viewmode="movies_with_plot"))
|
||||||
|
|
||||||
|
else:
|
||||||
|
|
||||||
|
page_html = get_url_contents(item.url)
|
||||||
|
|
||||||
|
regex_api = r'http://player\.animeflv\.me/[^\"]+'
|
||||||
|
iframe_url = scrapertools.find_single_match(page_html, regex_api)
|
||||||
|
|
||||||
|
iframe_html = get_url_contents(iframe_url)
|
||||||
|
|
||||||
|
regex_video_list = r'var part = \[([^\]]+)'
|
||||||
|
|
||||||
|
videos_html = scrapertools.find_single_match(iframe_html, regex_video_list)
|
||||||
|
videos = re.findall('"([^"]+)"', videos_html, re.DOTALL)
|
||||||
|
|
||||||
|
|
||||||
|
for quality_id, video_url in enumerate(videos):
|
||||||
|
itemlist.append(Item(channel=item.channel, action="play", url=video_url, show=re.escape(item.show),
|
||||||
|
title="Ver en calidad [{0}]".format(qualities[quality_id]), plot=item.plot,
|
||||||
|
folder=True, fulltitle=item.title, viewmode="movies_with_plot"))
|
||||||
|
patron_open='<div id="player"><iframe src="(.+?)"'
|
||||||
|
data = re.sub(r"\n|\r|\t|\s{2}| ", "", page_html)
|
||||||
|
|
||||||
|
videos_html_other = scrapertools.find_single_match(data, patron_open)
|
||||||
|
#for video_url in videos_html_other:
|
||||||
|
video_url = videos_html_other
|
||||||
|
a=1
|
||||||
|
itemlist.append(Item(channel=item.channel, action="findvideos", url=video_url, show=re.escape(item.show),
|
||||||
|
title="Ver en Otro servidor [{0}]".format(qualities[1]), plot=item.plot,
|
||||||
|
folder=True, fulltitle=item.title, viewmode="movies_with_plot"))
|
||||||
|
|
||||||
|
|
||||||
return __sort_by_quality(itemlist)
|
return __sort_by_quality(itemlist)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"id": "anitoonstv",
|
"id": "anitoonstv",
|
||||||
"name": "AniToons TV",
|
"name": "AniToons TV",
|
||||||
"active": true,
|
"active": true,
|
||||||
@@ -9,8 +9,8 @@
|
|||||||
"version": 1,
|
"version": 1,
|
||||||
"changes": [
|
"changes": [
|
||||||
{
|
{
|
||||||
"date": "13/06/2017",
|
"date": "03/09/2017",
|
||||||
"description": "Arreglado problema en nombre de servidores"
|
"description": "Arreglado problema en nombre de servidores (nuevamente), añadido a anime"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "02/06/2017",
|
"date": "02/06/2017",
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
],
|
],
|
||||||
"categories": [
|
"categories": [
|
||||||
"tvshow",
|
"tvshow",
|
||||||
"latino"
|
"latino",
|
||||||
|
"anime"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,6 +132,7 @@ def findvideos(item):
|
|||||||
data = httptools.downloadpage(item.url).data
|
data = httptools.downloadpage(item.url).data
|
||||||
data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
|
||||||
data_vid = scrapertools.find_single_match(data1, '<div class="videos">(.+?)<\/div><div .+?>')
|
data_vid = scrapertools.find_single_match(data1, '<div class="videos">(.+?)<\/div><div .+?>')
|
||||||
|
|
||||||
# name = scrapertools.find_single_match(data,'<span>Titulo.+?<\/span>([^<]+)<br>')
|
# name = scrapertools.find_single_match(data,'<span>Titulo.+?<\/span>([^<]+)<br>')
|
||||||
scrapedplot = scrapertools.find_single_match(data, '<br><span>Descrip.+?<\/span>([^<]+)<br>')
|
scrapedplot = scrapertools.find_single_match(data, '<br><span>Descrip.+?<\/span>([^<]+)<br>')
|
||||||
scrapedthumbnail = scrapertools.find_single_match(data, '<div class="caracteristicas"><img src="([^<]+)">')
|
scrapedthumbnail = scrapertools.find_single_match(data, '<div class="caracteristicas"><img src="([^<]+)">')
|
||||||
@@ -143,6 +144,9 @@ def findvideos(item):
|
|||||||
server = server.strip()
|
server = server.strip()
|
||||||
if "ok" in server:
|
if "ok" in server:
|
||||||
server = 'okru'
|
server = 'okru'
|
||||||
|
if "netu" in server:
|
||||||
|
server = 'netutv (NO DISPONIBLE)'
|
||||||
|
logger.info(url)
|
||||||
itemlist.append(
|
itemlist.append(
|
||||||
item.clone(url=url, action="play", server=server, contentQuality=quality, thumbnail=scrapedthumbnail,
|
item.clone(url=url, action="play", server=server, contentQuality=quality, thumbnail=scrapedthumbnail,
|
||||||
plot=scrapedplot, title="Enlace encontrado en %s: [%s ]" % (server.capitalize(), quality)))
|
plot=scrapedplot, title="Enlace encontrado en %s: [%s ]" % (server.capitalize(), quality)))
|
||||||
|
|||||||
Reference in New Issue
Block a user