-
-
- patron = '(.*?)<' % item.infoLabels['season']
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ infoLabels = item.infoLabels
+
+ for scrapedepisode, scrapedurl, scrapedtitle in matches:
+
+ infoLabels['episode'] = scrapedepisode
+ url = scrapedurl
+ title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle)
+
+ itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', infoLabels=infoLabels))
+
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+ return itemlist
+
+
+def findvideos(item):
+ logger.info()
+
+ itemlist = []
+ data = get_source(item.url)
+
+ selector_url = scrapertools.find_multiple_matches(data, 'class=metaframe rptss src=(.*?) frameborder=0 ')
+
+ for lang in selector_url:
+ data = get_source('https:'+lang)
+ urls = scrapertools.find_multiple_matches(data, 'data-playerid=(.*?)>')
+ subs = ''
+ lang = scrapertools.find_single_match(lang, 'lang=([^+]+)')
+ language = IDIOMAS[lang]
+
+ if item.contentType == 'episode':
+ quality = 'SD'
+ else:
+ quality = item.quality
+
+ for url in urls:
+ final_url = httptools.downloadpage('https:'+url).data
+ if 'vip' in url:
+ file_id = scrapertools.find_single_match(url, 'file=(.*?)&')
+ if language=='VOSE':
+ sub = scrapertools.find_single_match(url, 'sub=(.*?)&')
+ subs = 'https:%s' % sub
+ post = {'link':file_id}
+ post = urllib.urlencode(post)
+ hidden_url = 'https://streamango.poseidonhd.com/repro//plugins/gkpluginsphp.php'
+ data_url = httptools.downloadpage(hidden_url, post=post).data
+ dict_vip_url = jsontools.load(data_url)
+ url = dict_vip_url['link']
+ else:
+ url = 'https:%s' % url
+ new_url = url.replace('embed','stream')
+ url = httptools.downloadpage(new_url, follow_redirects=False).headers.get('location')
+ #title = '%s [%s]' % (item.title, language)
+ itemlist.append(item.clone(title='[%s] [%s]', url=url, action='play', subtitle=subs,
+ language=language, quality=quality, infoLabels = item.infoLabels))
+ itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % (x.server.capitalize(), x.language))
+
+ # Requerido para Filtrar enlaces
+
+ if __comprueba_enlaces__:
+ itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+
+ # Requerido para FilterTools
+
+ itemlist = filtertools.get_links(itemlist, item, list_language)
+
+ # Requerido para AutoPlay
+
+ autoplay.start(itemlist, item)
+
+ if item.contentType != 'episode':
+ if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+ itemlist.append(
+ Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url,
+ action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+
+ return itemlist
+
+def search(item, texto):
+ logger.info()
+ texto = texto.replace(" ", "+")
+ item.url = item.url + texto
+
+ if texto != '':
+ return search_results(item)
+ else:
+ return []
+
+def search_results(item):
+ logger.info()
+
+ itemlist=[]
+
+ data=get_source(item.url)
+ patron = '.*?)
.*?meta.*?year>(.*?)<(.*?)([^<]+)<\/a>'
+ logger.debug(data)
+ patron = '([^<]+)<\/a>'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedtitle in matches:
@@ -342,7 +342,6 @@ def findvideos(item):
langs = dict()
data = httptools.downloadpage(item.url).data
- logger.debug('data: %s' % data)
patron = ' (.*?) <\/a>'
matches = re.compile(patron, re.DOTALL).findall(data)
@@ -365,26 +364,28 @@ def findvideos(item):
url = dec(encurl)
title = ''
server = ''
- servers = {'/opl': 'openload', '/your': 'yourupload', '/sen': 'senvid', '/face': 'netutv', '/vk': 'vk'}
+ servers = {'/opl': 'openload', '/your': 'yourupload', '/sen': 'senvid', '/face': 'netutv', '/vk': 'vk',
+ '/jk':'streamcherry'}
server_id = re.sub(r'.*?embed|\.php.*', '', url)
if server_id and server_id in servers:
server = servers[server_id]
- logger.debug('server_id: %s' % server_id)
- if langs[scrapedlang] in list_language:
+
+ if (scrapedlang in langs) and langs[scrapedlang] in list_language:
language = IDIOMAS[langs[scrapedlang]]
else:
language = 'Latino'
- if langs[scrapedlang] == 'Latino':
- idioma = '[COLOR limegreen]LATINO[/COLOR]'
- elif langs[scrapedlang] == 'Sub Español':
- idioma = '[COLOR red]SUB[/COLOR]'
+ #
+ # if langs[scrapedlang] == 'Latino':
+ # idioma = '[COLOR limegreen]LATINO[/COLOR]'
+ # elif langs[scrapedlang] == 'Sub Español':
+ # idioma = '[COLOR red]SUB[/COLOR]'
if item.extra == 'peliculas':
- title = item.contentTitle + ' (' + server + ') ' + idioma
+ title = item.contentTitle + ' (' + server + ') ' + language
plot = scrapertools.find_single_match(data, '.*?(.*?)'
+ host_dom = host.replace("https://", "").replace("http://", "").replace("www.", "")
+ patron = '.*?(.*?)'
if "pelisyseries.com" in host and item.extra == "varios": #compatibilidad con mispelisy.series.com
- data = ' Documentales'
+ data = ' Documentales'
else:
- data = scrapertools.get_match(data, patron)
+ if data:
+ data = scrapertools.get_match(data, patron)
+ else:
+ return itemlist
patron = '<.*?href="([^"]+)".*?>([^>]+) '
matches = re.compile(patron, re.DOTALL).findall(data)
@@ -55,14 +66,14 @@ def submenu(item):
title = scrapedtitle.strip()
url = scrapedurl
- itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url, extra="pelilist"))
+ itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url, extra=item.extra))
itemlist.append(
- Item(channel=item.channel, action="alfabeto", title=title + " [A-Z]", url=url, extra="pelilist"))
+ Item(channel=item.channel, action="alfabeto", title=title + " [A-Z]", url=url, extra=item.extra))
if item.extra == "peliculas":
- itemlist.append(Item(channel=item.channel, action="listado", title="Películas 4K", url=host + "peliculas-hd/4kultrahd/", extra="pelilist"))
+ itemlist.append(Item(channel=item.channel, action="listado", title="Películas 4K", url=host + "peliculas-hd/4kultrahd/", extra=item.extra))
itemlist.append(
- Item(channel=item.channel, action="alfabeto", title="Películas 4K" + " [A-Z]", url=host + "peliculas-hd/4kultrahd/", extra="pelilist"))
+ Item(channel=item.channel, action="alfabeto", title="Películas 4K" + " [A-Z]", url=host + "peliculas-hd/4kultrahd/", extra=item.extra))
return itemlist
@@ -75,9 +86,13 @@ def alfabeto(item):
data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
patron = '
(.*?)
' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumb, scrapedtitle, year, lang_data, scrapedplot in matches: + + title = scrapedtitle + url = scrapedurl + thumbnail = scrapedthumb + plot = scrapedplot + language = get_language(lang_data) + if language: + action = 'findvideos' + else: + action = 'seasons' + + new_item=Item(channel=item.channel, title=title, url=url, thumbnail=thumbnail, plot=plot, + action=action, + language=language, infoLabels={'year':year}) + if new_item.action == 'findvideos': + new_item.contentTitle = new_item.title + else: + new_item.contentSerieName = new_item.title + + itemlist.append(new_item) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria in ['peliculas']: + item.url = host + 'movies' + elif categoria == 'infantiles': + item.url = host + 'genre/animacion/' + elif categoria == 'terror': + item.url = host + 'genre/terror/' + item.type='movies' + itemlist = list_all(item) + if itemlist[-1].title == 'Siguiente >>': + itemlist.pop() + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + + return itemlist From 38e27aa01469285c597b1e4b80d79d1d8345e550 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 15 May 2018 14:53:12 -0500 Subject: [PATCH 10/37] estadepelis: fix From 8b2c0adbf4218378ac7f2945b60134d39a859441 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 15 May 2018 14:53:59 -0500 Subject: [PATCH 11/37] estadepelis: fix --- plugin.video.alfa/channels/estadepelis.json | 3 +- plugin.video.alfa/channels/estadepelis.py | 40 ++++++++------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/plugin.video.alfa/channels/estadepelis.json b/plugin.video.alfa/channels/estadepelis.json index 1bc265be..ff8f2a95 100755 --- a/plugin.video.alfa/channels/estadepelis.json +++ b/plugin.video.alfa/channels/estadepelis.json @@ -28,7 +28,8 @@ "lvalues": [ "No filtrar", "Latino", - "VOS" + "VOS", + "Castellano" ] }, { diff --git a/plugin.video.alfa/channels/estadepelis.py b/plugin.video.alfa/channels/estadepelis.py index 07989ada..325ae879 100755 --- a/plugin.video.alfa/channels/estadepelis.py +++ b/plugin.video.alfa/channels/estadepelis.py @@ -22,7 +22,7 @@ list_quality = [] list_servers = ['yourupload', 'openload', 'sendvid'] vars = { - 'ef5ca18f089cf01316bbc967fa10f72950790c39ef5ca18f089cf01316bbc967fa10f72950790c39': 'http://www.estadepelis.com/', + 'ef5ca18f089cf01316bbc967fa10f72950790c39ef5ca18f089cf01316bbc967fa10f72950790c39': 'http://tawnestdplsnetps.pw/', 'b48699bb49d4550f27879deeb948d4f7d9c5949a8': 'embed', 'JzewJkLlrvcFnLelj2ikbA': 'php?url=', 'p889c6853a117aca83ef9d6523335dc065213ae86': 'player', @@ -194,8 +194,8 @@ def generos(item): itemlist = [] norep = [] data = httptools.downloadpage(item.url).data - - patron = '([^<]+)<\/p>') else: - title = item.contentSerieName + ' (' + server + ') ' + idioma + title = item.contentSerieName + ' (' + server + ') ' + language plot = item.plot thumbnail = servertools.guess_server_thumbnail(title) @@ -399,7 +400,6 @@ def findvideos(item): quality='', language=language )) - logger.debug('url: %s' % url) # Requerido para FilterTools itemlist = filtertools.get_links(itemlist, item, list_language) @@ -423,23 +423,13 @@ def findvideos(item): def play(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url, add_referer=True).data + data = httptools.downloadpage(item.url).data if 'your' in item.url: item.url = 'http://www.yourupload.com/embed/' + scrapertools.find_single_match(data, 'src=".*?code=(.*?)"') itemlist.append(item) else: - itemlist = servertools.find_video_items(data=data) - if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, - title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', - url=item.url, - action="add_pelicula_to_library", - extra="findvideos", - contentTitle=item.contentTitle - )) - return itemlist From 64a16a0c1faaf8bb3b45c6a254496c823a1f800f Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Wed, 16 May 2018 20:07:00 +0200 Subject: [PATCH 12/37] =?UTF-8?q?Clones=20de=20Newpct1:=20Nuevo=20Redise?= =?UTF-8?q?=C3=B1o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Normalización de títulos de todos las funciones, tanto con “títulos inteligentes” como sin ellos. Cada tipo de título tiene la misma apariencia en todo el canal, eliminando palabras innecesarias - Normalización de calidades, con títulos más cortos y significativos - Normalización de info adicional, tipo “Saga, Colección, V. Extendida, etc.” - Se agregan idioma y tamaño del vídeo al título - Función de Buscar nueva, con paginación dinámica: ahora se comprimen los episodios de una serie en un solo título (por calidad de vídeo). Se cargan varias páginas web en una página Alfa, hasta llenarla - Información de página actual y total al pie - Página de Servidores simplificada, pero con más información práctica - Info de número total de capítulos de la última temporada - Uso extensivo de información de ThemovieDB.org - Mejoras internas --- plugin.video.alfa/channels/descargas2020.py | 1297 ++++++++++++----- plugin.video.alfa/channels/mispelisyseries.py | 1297 ++++++++++++----- plugin.video.alfa/channels/torrentlocura.py | 1297 ++++++++++++----- plugin.video.alfa/channels/torrentrapid.py | 1297 ++++++++++++----- plugin.video.alfa/channels/tumejortorrent.py | 1297 ++++++++++++----- plugin.video.alfa/channels/tvsinpagar.py | 1297 ++++++++++++----- 6 files changed, 5730 insertions(+), 2052 deletions(-) diff --git a/plugin.video.alfa/channels/descargas2020.py b/plugin.video.alfa/channels/descargas2020.py index 32d8e713..7d0af962 100644 --- a/plugin.video.alfa/channels/descargas2020.py +++ b/plugin.video.alfa/channels/descargas2020.py @@ -1,6 +1,9 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re +import sys +import urllib +import urlparse from channelselector import get_thumb from core import httptools @@ -17,9 +20,13 @@ def mainlist(item): itemlist = [] - thumb_pelis=get_thumb("channels_movie.png") - thumb_series=get_thumb("channels_tvshow.png") - thumb_search = get_thumb("search.png") + thumb_pelis = get_thumb("channels_movie.png") + thumb_pelis_hd = get_thumb("channels_movie_hd.png") + thumb_series = get_thumb("channels_tvshow.png") + thumb_series_hd = get_thumb("channels_tvshow_hd.png") + thumb_series_az = get_thumb("channels_tvshow_az.png") + thumb_docus = get_thumb("channels_documentary.png") + thumb_buscar = get_thumb("search.png") itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url=host, extra="peliculas", thumbnail=thumb_pelis )) @@ -28,9 +35,9 @@ def mainlist(item): thumbnail=thumb_series)) itemlist.append(Item(channel=item.channel, action="submenu", title="Documentales", url=host, extra="varios", - thumbnail=thumb_series)) + thumbnail=thumb_docus)) itemlist.append( - Item(channel=item.channel, action="search", title="Buscar", url=host + "buscar", thumbnail=thumb_search)) + Item(channel=item.channel, action="search", title="Buscar", url=host + "buscar", thumbnail=thumb_buscar)) return itemlist @@ -40,13 +47,17 @@ def submenu(item): data = re.sub(r"\n|\r|\t|\s{2}|()", "", httptools.downloadpage(item.url).data) data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8") - data = data.replace("'", "\"").replace("/series\"", "/series/\"") #Compatibilidad con mispelisy.series.com + data = data.replace("'", '"').replace('/series"', '/series/"') #Compatibilidad con mispelisy.series.com - patron = '
- (.*?)
- (.*?)
- (.*?)
- .*?.*?
- (.*?)