diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 577e9bf4..0ca720af 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -12,19 +12,18 @@ icon.png fanart.jpg - resources/media/general/ss/1.jpg - resources/media/general/ss/2.jpg - resources/media/general/ss/3.jpg - resources/media/general/ss/4.jpg + resources/media/themes/ss/1.jpg + resources/media/themes/ss/2.jpg + resources/media/themes/ss/3.jpg + resources/media/themes/ss/4.jpg [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » repelis » allcalidad - » cinetux » allpeliculas - » hdfull » zonatorrent - ¤ arreglos internos - - [COLOR green]Gracias a [COLOR yellow]prpeaprendiz[/COLOR] por su colaboración en esta versión[/COLOR] + » playmax » allcalidad + » cinetux » allpeliculas + » pedropolis » pelisplanet + » flashx » gvideo + ¤ selector de temas ¤ arreglos internos Navega con Kodi por páginas web para ver sus videos de manera fácil. Browse web pages using Kodi diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index ada9a02e..9d5f6a7e 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -94,8 +94,9 @@ def peliculas(item): idioma = scrapertools.find_single_match(varios, '(?s)Idioma.*?kinopoisk">([^<]+)') year = scrapertools.find_single_match(varios, 'Año.*?kinopoisk">([^<]+)') year = scrapertools.find_single_match(year, '[0-9]{4}') - mtitulo = titulo + " (" + idioma + ") (" + year + ")" + mtitulo = titulo + " (" + idioma + ")" if year: + mtitulo += " (" + year + ")" item.infoLabels['year'] = int(year) itemlist.append(item.clone(channel = item.channel, action = "findvideos", @@ -107,9 +108,8 @@ def peliculas(item): contentType="movie", language = idioma )) - tmdb.set_infoLabels(itemlist, True) - url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) + url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') if url_pagina != "": pagina = "Pagina: " + scrapertools.find_single_match(url_pagina, "page/([0-9]+)") itemlist.append(Item(channel = item.channel, action = "peliculas", title = pagina, url = url_pagina)) @@ -138,7 +138,7 @@ def findvideos(item): title = titulo, url = url )) - tmdb.set_infoLabels(itemlist, True) + tmdb.set_infoLabels(itemlist, __modo_grafico__) itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) if itemlist: itemlist.append(Item(channel = item.channel)) @@ -148,7 +148,8 @@ def findvideos(item): if item.extra != "library": if config.get_videolibrary_support(): itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green", - action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail + action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail, + fulltitle = item.fulltitle )) return itemlist diff --git a/plugin.video.alfa/channels/allpeliculas.py b/plugin.video.alfa/channels/allpeliculas.py index c67fca77..e1ea6e57 100644 --- a/plugin.video.alfa/channels/allpeliculas.py +++ b/plugin.video.alfa/channels/allpeliculas.py @@ -82,6 +82,7 @@ def findvideos(item): if config.get_videolibrary_support(): itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green", action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail, + fulltitle = item.fulltitle )) return itemlist diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py index 116895a5..fcf41397 100644 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -7,7 +7,7 @@ from core import tmdb from core.item import Item from platformcode import config, logger -CHANNEL_HOST = "http://www.cinetux.net/" +CHANNEL_HOST = "http://www.cinetux.io/" # Configuracion del canal __modo_grafico__ = config.get_setting('modo_grafico', 'cinetux') @@ -36,7 +36,7 @@ def mainlist(item): thumbnail="https://raw.githubusercontent.com/master-1970/resources/master/images/genres" "/0/Directors%20Chair.png", text_color=color1)) - itemlist.append(item.clone(action="destacadas", title=" Destacadas", url="http://www.cinetux.net/mas-vistos/", + itemlist.append(item.clone(action="destacadas", title=" Destacadas", url=CHANNEL_HOST + "mas-vistos/", thumbnail="https://raw.githubusercontent.com/master-1970/resources/master/images/genres" "/0/Favorites.png", text_color=color1)) @@ -69,7 +69,7 @@ def configuracion(item): def search(item, texto): logger.info() - item.url = "http://www.cinetux.net/?s=" + item.url = CHANNEL_HOST + "?s=" texto = texto.replace(" ", "+") item.url = item.url + texto try: @@ -147,7 +147,7 @@ def peliculas(item): scrapedtitle += " [%s]" % quality new_item = item.clone(action="findvideos", title=scrapedtitle, fulltitle=fulltitle, url=scrapedurl, thumbnail=scrapedthumbnail, - contentTitle=fulltitle, contentType="movie", quality=quality) + contentType="movie", quality=quality) if year: new_item.infoLabels['year'] = int(year) itemlist.append(new_item) @@ -177,11 +177,11 @@ def destacadas(item): patron += '.*?src="([^"]+)' matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedtitle, scrapedurl, scrapedthumbnail in matches: - scrapedurl = "http://www.cinetux.net" + scrapedurl + scrapedurl = CHANNEL_HOST + scrapedurl scrapedtitle = scrapedtitle.replace("Ver ", "") new_item = item.clone(action="findvideos", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, - contentTitle=scrapedtitle, contentType="movie") + contentType="movie") itemlist.append(new_item) # Extrae el paginador @@ -241,14 +241,7 @@ def findvideos(item): data = httptools.downloadpage(item.url).data year = scrapertools.find_single_match(item.title, "\(([0-9]+)") - if year and item.extra != "library": - item.infoLabels['year'] = int(year) - # Ampliamos datos en tmdb - if not item.infoLabels['plot']: - try: - tmdb.set_infoLabels(item, __modo_grafico__) - except: - pass + tmdb.set_infoLabels(item, __modo_grafico__) if not item.infoLabels.get('plot'): plot = scrapertools.find_single_match(data, '

(.*?)

') @@ -274,7 +267,7 @@ def findvideos(item): if item.extra != "library": if config.get_videolibrary_support(): itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green", - action="add_pelicula_to_library", url=item.url + action="add_pelicula_to_library", url=item.url, fulltitle = item.fulltitle )) else: diff --git a/plugin.video.alfa/channels/pedropolis.py b/plugin.video.alfa/channels/pedropolis.py index 6baa5edc..45cc0b15 100644 --- a/plugin.video.alfa/channels/pedropolis.py +++ b/plugin.video.alfa/channels/pedropolis.py @@ -203,7 +203,7 @@ def sub_search(item): action=action, infoLabels={"year": year}, contentType=contentType, thumbnail=scrapedthumbnail, text_color=color1, contentSerieName=scrapedtitle)) - tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) + tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) paginacion = scrapertools.find_single_match(data, '') if paginacion: diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py index bca441ec..0795cc6b 100644 --- a/plugin.video.alfa/channels/pelisplanet.py +++ b/plugin.video.alfa/channels/pelisplanet.py @@ -37,6 +37,7 @@ if __perfil__ < 3: else: color1 = color2 = color3 = color4 = color5 = "" + def mainlist(item): logger.info() itemlist = [] @@ -178,22 +179,21 @@ def peliculas(item): for scrapedurl, calidad, year, scrapedtitle, scrapedthumbnail in matches: datas = httptools.downloadpage(scrapedurl).data datas = re.sub(r"\n|\r|\t|\s{2}| ", "", datas) - #logger.info(datas) + # logger.info(datas) if '/ ' in scrapedtitle: scrapedtitle = scrapedtitle.partition('/ ')[2] contentTitle = scrapertools.find_single_match(datas, 'Titulo original: ([^<]+)

') contentTitle = scrapertools.decodeHtmlentities(contentTitle.strip()) rating = scrapertools.find_single_match(datas, 'alt="Puntaje MPA IMDb" />([^<]+)') - director = scrapertools.find_single_match(datas, '
') + director = scrapertools.find_single_match( + datas, '
') title = "%s [COLOR yellow][%s][/COLOR]" % (scrapedtitle.strip(), calidad.upper()) new_item = Item(channel=item.channel, action="findvideos", title=title, plot='', contentType='movie', - url=scrapedurl, contentQuality=calidad, thumbnail=scrapedthumbnail, - contentTitle=contentTitle, infoLabels={"year": year, 'rating': rating, 'director': director}, - text_color=color3) + url=scrapedurl, contentQuality=calidad, thumbnail=scrapedthumbnail, + contentTitle=contentTitle, infoLabels={"year": year, 'rating': rating, 'director': director}, + text_color=color3) - # tmdb.set_infoLabels(itemlist, __modo_grafico__) - # tmdb.set_infoLabels(itemlist, __modo_grafico__) if year: tmdb.set_infoLabels_item(new_item, __modo_grafico__) itemlist.append(new_item) @@ -202,8 +202,8 @@ def peliculas(item): if paginacion: itemlist.append(Item(channel=item.channel, action="peliculas", - title="» Siguiente »", url=paginacion, plot="Página Siguiente", - thumbnail='https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/next.png')) + title="» Siguiente »", url=paginacion, plot="Página Siguiente", + thumbnail='https://raw.githubusercontent.com/Inter95/tvguia/master/thumbnails/next.png')) for item in itemlist: if item.infoLabels['plot'] == '': @@ -250,80 +250,32 @@ def findvideos(item): matches = re.compile(patron, re.DOTALL).findall(datas) for scrapedurl, lang, servidores in matches: - # doc_url = '' - doc_id = '' - video_urls = [] - if 'drive' in scrapedurl: - doc_id = httptools.downloadpage(scrapedurl).data - doc_id = scrapertools.find_single_match(doc_id, "docid=(\w+)") - elif 'youtube' in scrapedurl: - doc_id = scrapertools.find_single_match(scrapedurl, "docid=(\w+)") - doc_url = "http://docs.google.com/get_video_info?docid=%s" % doc_id - response = httptools.downloadpage(doc_url, cookies=False) - cookies = "" - cookie = response.headers["set-cookie"].split("HttpOnly, ") - for c in cookie: - cookies += c.split(";", 1)[0] + "; " - data = response.data.decode('unicode-escape') - data = urllib.unquote_plus(urllib.unquote_plus(data)) - headers_string = "|Cookie=" + cookies - url_streams = scrapertools.find_single_match(data, 'url_encoded_fmt_stream_map=(.*)') - streams = scrapertools.find_multiple_matches(url_streams, - 'itag=(\d+)&url=(.*?)(?:;.*?quality=.*?(?:,|&)|&quality=.*?(?:,|&))') - itags = {'18':'360p', '22':'720p', '34':'360p', '35':'480p', '37':'1080p', '43':'360p', '59':'480p'} - for itag, video_url in streams: - video_url += headers_string - video_urls.append([video_url, itags[itag]]) - - for video_item in video_urls: - calidad = video_item[1] - title = '%s [COLOR green](%s)[/COLOR] [COLOR green]([/COLOR][COLOR black]You[/COLOR][COLOR red]tube[/COLOR][COLOR green])[/COLOR]'%(item.contentTitle, calidad) - url = video_item[0] - - itemlist.append( - item.clone(channel=item.channel, - action='play', - title=title, - url= url, - thumbnail=item.thumbnail, - quality = calidad, - plot=item.plot, - fanart=item.fanart, - contentTitle=item.contentTitle, - language=lang.replace('Español ', ''), - server='directo', - context = item.context - )) - itemlist.sort(key=lambda it: it.title, reverse=True) - if 'pelispp.com' in scrapedurl or 'ultrapelis' in scrapedurl: + servidores = servidores.lower().strip() + if 'streamvips' or 'mediastream' or 'ultrastream' in servidores: data = httptools.downloadpage(scrapedurl, headers=headers).data - patronr = 'file: "([^"]+)",label:"([^"]+)",type' + patronr = "file:'([^']+)',label:'([^']+)',type" matchesr = re.compile(patronr, re.DOTALL).findall(data) for scrapedurl, label in matchesr: - url = scrapedurl.replace('\\', '') - quality = label.decode('cp1252').encode('utf8') - title = item.contentTitle + ' (' + str(label) + ') ([COLOR blue]G[/COLOR][COLOR red]o[/COLOR][COLOR yellow]o[/COLOR][COLOR blue]g[/COLOR][COLOR green]l[/COLOR][COLOR red]e[/COLOR])' - thumbnail = item.thumbnail - fanart = item.fanart - itemlist.append(item.clone(action="play", title=title, url=url, server='directo', - thumbnail=thumbnail, fanart=fanart, extra='directo', - quality=quality, language=lang.replace('Español ', ''))) + title = 'Ver en: [COLOR yellowgreen][%s][/COLOR] [COLOR yellow][%s][/COLOR]' % (servidores.title(), + item.contentQuality.upper()) + + itemlist.append(item.clone(action="play", title=title, url=scrapedurl, server='directo', + thumbnail=item.thumbnail, fanart=item.fanart, extra='directo', + quality=item.contentQuality, language=lang.replace('Español ', ''))) + itemlist.sort(key=lambda it: it.title, reverse=True) - # if 'youtube' not in scrapedurl: - servidores.lower() - if 'drive' not in scrapedurl and 'pelispp.com' not in scrapedurl and 'youtube' not in scrapedurl and 'streamplus' not in servidores: - quality = scrapertools.find_single_match( - datas, '