[^<]+<[iframe|IFRAME].*?[src|SRC]="([^"]+)"'
+
+ patron = '<(?:iframe)?(?:IFRAME)?\s*(?:src)?(?:SRC)?="([^"]+)"'
matches = re.compile(patron, re.DOTALL).findall(data)
for url in matches:
diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py
index e4ba57cc..fc770bf6 100644
--- a/plugin.video.alfa/channels/seriesblanco.py
+++ b/plugin.video.alfa/channels/seriesblanco.py
@@ -10,16 +10,21 @@ 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")
@@ -44,6 +49,7 @@ def mainlist(item):
thumbnail=thumb_buscar))
itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES)
+ autoplay.show_option(item.channel, itemlist)
return itemlist
@@ -199,7 +205,8 @@ 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))
+ action="findvideos", plot=plot, fanart=fanart, language=filter_lang,
+ context = autoplay.context))
itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES)
@@ -248,7 +255,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))
+ quality=quality, server= v_fields.get("server")))
if len(itemlist) > 0:
return itemlist
@@ -284,6 +291,14 @@ 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/channels/x18hentai.py b/plugin.video.alfa/channels/x18hentai.py
index 5ed87510..b76e8605 100755
--- a/plugin.video.alfa/channels/x18hentai.py
+++ b/plugin.video.alfa/channels/x18hentai.py
@@ -6,8 +6,9 @@ from core import httptools
from core import scrapertools
from core.item import Item
from platformcode import logger
+from core import servertools
-host = 'http://www.18hentaionline.eu/'
+host = 'http://www.18hentaionline.net/'
headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
['Referer', host]]
@@ -92,17 +93,58 @@ def episodios(item):
logger.info()
itemlist = []
data = httptools.downloadpage(item.url, headers=headers).data
- patron = '
([^<]+)<\/td>. | ([^<]+)<\/td>. | ([^<]+)<\/td>. | ([^<]+)<\/td>. | Ver Capitulo<\/a><\/td>'
+ old_mode = scrapertools.find_single_match(data, ' | Censura<\/th>')
+ if old_mode:
+ patron = ' | (\d+)<\/td> | (.*?)<\/td> | (.*?)<\/td> | (.*?)<\/td> | Ver Capitulo<\/a><\/td>'
- matches = re.compile(patron, re.DOTALL).findall(data)
+ matches = re.compile(patron, re.DOTALL).findall(data)
- for scrapedcap, scrapedaud, scrapedsub, scrapedcen, scrapedurl in matches:
- url = scrapedurl
- title = 'CAPITULO ' + scrapedcap + ' AUDIO: ' + scrapedaud + ' SUB:' + scrapedsub + ' ' + censura[scrapedcen]
- thumbnail = ''
- plot = ''
- fanart = ''
- itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=item.fulltitle, url=url,
- thumbnail=item.thumbnail, plot=plot))
+ for scrapedcap, scrapedaud, scrapedsub, scrapedcen, scrapedurl in matches:
+ url = scrapedurl
+ title = 'CAPITULO ' + scrapedcap + ' AUDIO: ' + scrapedaud + ' SUB:' + scrapedsub + ' ' + censura[scrapedcen]
+ thumbnail = ''
+ plot = ''
+ fanart = ''
+ itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=item.fulltitle, url=url,
+ thumbnail=item.thumbnail, plot=plot))
+ else:
+ patron = '<\/i>.*?(.\d+)<\/td> | MP4<\/td> | (.*?)<\/td>.*?'
+ patron +=''
+
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ for scrapedcap, scrapedsub, scrapedurl in matches:
+ url = scrapedurl
+ if scrapedsub !='':
+ subs= scrapedsub
+ else:
+ sub = 'No'
+ title = 'CAPITULO %s SUB %s'%(scrapedcap, subs)
+ thumbnail = ''
+ plot = ''
+ fanart = ''
+ itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=item.fulltitle, url=url,
+ thumbnail=item.thumbnail, plot=plot))
return itemlist
+
+def findvideos(item):
+ logger.info()
+
+ itemlist = []
+ data = httptools.downloadpage(item.url).data
+ gvideo = scrapertools.find_single_match(data,'')
+ headers = {'Host':'www.18hentaionline.net', 'Referer':item.url}
+ gvideo_data = httptools.downloadpage(gvideo, headers = headers).data
+ gvideo_url = scrapertools.find_single_match(gvideo_data, 'file: "(.*?)"')
+ server = 'directo'
+ new_item = (item.clone(url=gvideo_url, server=server))
+ itemlist.append(new_item)
+ itemlist.extend(servertools.find_video_items(data=data))
+ for videoitem in itemlist:
+ videoitem.channel = item.channel
+ videoitem.title = item.title+' (%s)'%videoitem.server
+ videoitem.action = 'play'
+ return itemlist
+
+
diff --git a/plugin.video.alfa/servers/mp4upload.py b/plugin.video.alfa/servers/mp4upload.py
index 39b27a56..2efbcf56 100755
--- a/plugin.video.alfa/servers/mp4upload.py
+++ b/plugin.video.alfa/servers/mp4upload.py
@@ -1,17 +1,23 @@
# -*- coding: utf-8 -*-
+import re
+
+from core import httptools
from core import scrapertools
+from lib import jsunpack
from platformcode import logger
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url)
- data = scrapertools.cache_page(page_url)
- logger.info("data=" + data)
- media_url = scrapertools.find_single_match(data, '"file": "(.+?)"')
- logger.info("media_url=" + media_url)
- media_url = media_url.replace("?start=0", "")
+ 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:"([^"]+)"}')
logger.info("media_url=" + media_url)
video_urls = list()
|