From 72777356957ea08f704e9f530e35595b31e98961 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Wed, 29 Aug 2018 08:24:50 -0500 Subject: [PATCH] fix varios 1 allcalidad: fix cambio de estructura cinefoxtv: eliminado web no existe crunchyroll: desactivado hasta ver si funciona findvideos jkanime: actualizaod por cambio de estructura miradetodo: actualizado dominio seriesmeme: eliminado web no existe documentary: servidor eliminado web no existe fileflyer : servidor eliminado web no existe filez : servidor eliminado web no existe movshare: servidor eliminado web no existe --- plugin.video.alfa/channels/allcalidad.py | 22 +- plugin.video.alfa/channels/cinefoxtv.json | 46 ---- plugin.video.alfa/channels/cinefoxtv.py | 209 ------------------ plugin.video.alfa/channels/crunchyroll.json | 2 +- plugin.video.alfa/channels/jkanime.py | 7 +- plugin.video.alfa/channels/miradetodo.py | 2 +- plugin.video.alfa/channels/seriesmeme.json | 12 -- plugin.video.alfa/channels/seriesmeme.py | 224 -------------------- plugin.video.alfa/servers/documentary.json | 41 ---- plugin.video.alfa/servers/documentary.py | 42 ---- plugin.video.alfa/servers/fileflyer.json | 45 ---- plugin.video.alfa/servers/fileflyer.py | 32 --- plugin.video.alfa/servers/filez.json | 42 ---- plugin.video.alfa/servers/filez.py | 38 ---- plugin.video.alfa/servers/movshare.json | 46 ---- plugin.video.alfa/servers/movshare.py | 49 ----- 16 files changed, 14 insertions(+), 845 deletions(-) delete mode 100755 plugin.video.alfa/channels/cinefoxtv.json delete mode 100644 plugin.video.alfa/channels/cinefoxtv.py delete mode 100755 plugin.video.alfa/channels/seriesmeme.json delete mode 100755 plugin.video.alfa/channels/seriesmeme.py delete mode 100755 plugin.video.alfa/servers/documentary.json delete mode 100755 plugin.video.alfa/servers/documentary.py delete mode 100755 plugin.video.alfa/servers/fileflyer.json delete mode 100755 plugin.video.alfa/servers/fileflyer.py delete mode 100755 plugin.video.alfa/servers/filez.json delete mode 100755 plugin.video.alfa/servers/filez.py delete mode 100755 plugin.video.alfa/servers/movshare.json delete mode 100755 plugin.video.alfa/servers/movshare.py diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 92b3fe6a..0b629353 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -98,20 +98,15 @@ def peliculas(item): data = httptools.downloadpage(item.url).data patron = '(?s)short_overlay.*?([^<]+)') - number_idioma = scrapertools.find_single_match(idioma, '[0-9]') - mtitulo = titulo - if number_idioma != "": - idioma = "" - else: - mtitulo += " (" + idioma + ")" - year = scrapertools.find_single_match(varios, 'Año.*?kinopoisk">([^<]+)') - year = scrapertools.find_single_match(year, '[0-9]{4}') + for url, thumbnail, titulo, datapostid in matches: + post = 'action=get_movie_details&postID=%s' %datapostid + data1 = httptools.downloadpage(host + "wp-admin/admin-ajax.php", post=post).data + idioma = "Latino" + mtitulo = titulo + " (" + idioma + ")" + year = scrapertools.find_single_match(data1, "Año:.*?(\d{4})") if year: mtitulo += " (" + year + ")" item.infoLabels['year'] = int(year) @@ -121,7 +116,6 @@ def peliculas(item): fulltitle = titulo, thumbnail = thumbnail, url = url, - contentTitle = titulo, contentType="movie", language = idioma )) diff --git a/plugin.video.alfa/channels/cinefoxtv.json b/plugin.video.alfa/channels/cinefoxtv.json deleted file mode 100755 index e60f35cc..00000000 --- a/plugin.video.alfa/channels/cinefoxtv.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "id": "cinefoxtv", - "name": "CineFoxTV", - "active": true, - "adult": false, - "language": ["lat"], - "thumbnail": "https://s28.postimg.cc/lytn2q1tp/cinefoxtv.png", - "banner": "cinefoxtv.png", - "categories": [ - "movie" - ], - "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": false, - "enabled": false, - "visible": false - }, - { - "id": "include_in_newest_latino", - "type": "bool", - "label": "Incluir en Novedades - Latino", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_peliculas", - "type": "bool", - "label": "Incluir en Novedades - Peliculas", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_infantiles", - "type": "bool", - "label": "Incluir en Novedades - Infantiles", - "default": true, - "enabled": true, - "visible": true - } - ] -} diff --git a/plugin.video.alfa/channels/cinefoxtv.py b/plugin.video.alfa/channels/cinefoxtv.py deleted file mode 100644 index 27f62699..00000000 --- a/plugin.video.alfa/channels/cinefoxtv.py +++ /dev/null @@ -1,209 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import urlparse - -from core import httptools -from core import scrapertools -from core import servertools -from core import tmdb -from core.item import Item -from platformcode import config, logger -from channelselector import get_thumb - -host = 'http://verhdpelis.com/' -headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], - ['Referer', host]] - -global duplicado -global itemlist -global temp_list -canal = 'cinefoxtv' - -tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png", - "Suspenso": "https://s13.postimg.cc/wmw6vl1cn/suspenso.png", - "Drama": "https://s16.postimg.cc/94sia332d/drama.png", - "Acción": "https://s3.postimg.cc/y6o9puflv/accion.png", - "Aventuras": "https://s10.postimg.cc/6su40czih/aventura.png", - "Animacion": "https://s13.postimg.cc/5on877l87/animacion.png", - "Ciencia Ficcion": "https://s9.postimg.cc/diu70s7j3/cienciaficcion.png", - "Terror": "https://s7.postimg.cc/yi0gij3gb/terror.png", - "Documentales": "https://s16.postimg.cc/7xjj4bmol/documental.png", - "Musical": "https://s29.postimg.cc/bbxmdh9c7/musical.png", - "Western": "https://s23.postimg.cc/lzyfbjzhn/western.png", - "Belico": "https://s23.postimg.cc/71itp9hcr/belica.png", - "Crimen": "https://s4.postimg.cc/6z27zhirx/crimen.png", - "Biográfica": "https://s15.postimg.cc/5lrpbx323/biografia.png", - "Deporte": "https://s13.postimg.cc/xuxf5h06v/deporte.png", - "Fantástico": "https://s10.postimg.cc/pbkbs6j55/fantastico.png", - "Estrenos": "https://s21.postimg.cc/fy69wzm93/estrenos.png", - "Película 18+": "https://s15.postimg.cc/exz7kysjf/erotica.png", - "Thriller": "https://s22.postimg.cc/5y9g0jsu9/thriller.png", - "Familiar": "https://s7.postimg.cc/6s7vdhqrf/familiar.png", - "Romanticas": "https://s21.postimg.cc/xfsj7ua0n/romantica.png", - "Intriga": "https://s27.postimg.cc/v9og43u2b/intriga.png", - "Infantil": "https://s23.postimg.cc/g5rmazozv/infantil.png"} - - -def mainlist(item): - logger.info() - - itemlist = [] - - itemlist.append(item.clone(title="Todas", action="lista", thumbnail=get_thumb('all', auto=True), - fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png', extra='peliculas/', - url=host + 'page/1.html')) - - itemlist.append( - itemlist[-1].clone(title="Generos", action="generos", thumbnail=get_thumb('genres', auto=True), - fanart='https://s3.postimg.cc/5s9jg2wtf/generos.png', url=host)) - - itemlist.append( - itemlist[-1].clone(title="Mas Vistas", action="lista", thumbnail=get_thumb('more watched', auto=True), - fanart='https://s9.postimg.cc/wmhzu9d7z/vistas.png', - url=host + 'top-peliculas-online/1.html')) - - itemlist.append(itemlist[-1].clone(title="Buscar", action="search", thumbnail=get_thumb('search', auto=True), - fanart='https://s30.postimg.cc/pei7txpa9/buscar.png', url=host + 'search/')) - - return itemlist - - -def lista(item): - logger.info() - itemlist = [] - duplicado = [] - max_items = 24 - next_page_url = '' - - data = httptools.downloadpage(item.url).data - data = re.sub(r"\n|\r|\t| |
", "", data) - data = scrapertools.decodeHtmlentities(data) - patron = '"box_image_b.*?"> max_items: - next_page_url = item.url - matches = matches[:max_items] - next_page = 'b' - else: - matches = matches[max_items:] - next_page = 'a' - patron_next_page = 'PROXIMO' - matches_next_page = re.compile(patron_next_page, re.DOTALL).findall(data) - if len(matches_next_page) > 0: - next_page_url = urlparse.urljoin(item.url, matches_next_page[0]) - - for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear in matches: - - url = scrapedurl - thumbnail = scrapedthumbnail - contentTitle = re.sub(r"\(.*?\)|\/.*?|\(|\)|.*?\/|!", "", scrapedtitle) - title = scrapertools.decodeHtmlentities(contentTitle) + '(' + scrapedyear + ')' - fanart = '' - plot = '' - - if url not in duplicado: - itemlist.append( - Item(channel=item.channel, action='findvideos', title=title, url=url, thumbnail=thumbnail, plot=plot, - fanart=fanart, contentTitle=contentTitle, infoLabels={'year': scrapedyear})) - duplicado.append(url) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - if next_page_url != '': - itemlist.append(Item(channel=item.channel, action="lista", title='Siguiente >>>', url=next_page_url, - thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', extra=item.extra, - next_page=next_page)) - return itemlist - - -def generos(item): - logger.info() - - itemlist = [] - - data = httptools.downloadpage(item.url).data - patron = '
  • <\/i> Películas de (.*?)<\/strong><\/a><\/li>' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedtitle in matches: - url = scrapedurl - if scrapedtitle in tgenero: - thumbnail = tgenero[scrapedtitle] - else: - thumbnail = '' - title = scrapedtitle - fanart = '' - plot = '' - - if title != 'Series': - itemlist.append( - Item(channel=item.channel, action='lista', title=title, url=url, thumbnail=thumbnail, plot=plot, - fanart=fanart)) - return itemlist - - -def getinfo(page_url): - logger.info() - data = httptools.downloadpage(page_url).data - plot = scrapertools.find_single_match(data, '<\/em>\.(?:\s*|.)(.*?)\s*<\/p>') - info = plot - - return info - - -def findvideos(item): - logger.info() - itemlist = [] - info = getinfo(item.url) - data = httptools.downloadpage(item.url, headers=headers).data - patron = 'src="(.*?)" style="border:none;' - matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedurl in matches: - itemlist.extend(servertools.find_video_items(data=scrapedurl)) - - for videoitem in itemlist: - videoitem.title = item.contentTitle - videoitem.channel = item.channel - videoitem.plot = info - videoitem.action = "play" - videoitem.folder = False - videoitem.infoLabels=item.infoLabels - - 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 lista(item) - - -def newest(categoria): - logger.info() - itemlist = [] - item = Item() - # categoria='peliculas' - try: - if categoria in ['peliculas','latino']: - item.url = host + 'page/1.html' - elif categoria == 'infantiles': - item.url = host + 'peliculas-de-genero/infantil/1.html' - itemlist = lista(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 diff --git a/plugin.video.alfa/channels/crunchyroll.json b/plugin.video.alfa/channels/crunchyroll.json index f4341d45..4005976e 100755 --- a/plugin.video.alfa/channels/crunchyroll.json +++ b/plugin.video.alfa/channels/crunchyroll.json @@ -2,7 +2,7 @@ "id": "crunchyroll", "name": "Crunchyroll", "language": ["cast", "lat"], - "active": true, + "active": false, "adult": false, "thumbnail": "http://i.imgur.com/O49fDS1.png", "categories": [ diff --git a/plugin.video.alfa/channels/jkanime.py b/plugin.video.alfa/channels/jkanime.py index 52c9430d..d538fac6 100755 --- a/plugin.video.alfa/channels/jkanime.py +++ b/plugin.video.alfa/channels/jkanime.py @@ -113,9 +113,10 @@ def series(item): scrapedtitle = ">> Pagina Siguiente" scrapedthumbnail = "" scrapedplot = "" - itemlist.append( - Item(channel=item.channel, action="series", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, - plot=scrapedplot, folder=True, viewmode="movie_with_plot")) + if len(itemlist)>0: + itemlist.append( + Item(channel=item.channel, action="series", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, + plot=scrapedplot, folder=True, viewmode="movie_with_plot")) except: pass return itemlist diff --git a/plugin.video.alfa/channels/miradetodo.py b/plugin.video.alfa/channels/miradetodo.py index 4bbfbea4..349de27c 100755 --- a/plugin.video.alfa/channels/miradetodo.py +++ b/plugin.video.alfa/channels/miradetodo.py @@ -41,7 +41,7 @@ tcalidad = {"FULL HD": "https://s18.postimg.cc/qszt3n6tl/fullhd.png", "HD": "https://s27.postimg.cc/m2dhhkrur/image.png", "SD": "https://s29.postimg.cc/l66t2pfqf/image.png" } -host = 'http://miradetodo.io/' +host = 'http://miradetodo.net/' def mainlist(item): diff --git a/plugin.video.alfa/channels/seriesmeme.json b/plugin.video.alfa/channels/seriesmeme.json deleted file mode 100755 index 006f5d6c..00000000 --- a/plugin.video.alfa/channels/seriesmeme.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "id": "seriesmeme", - "name": "SeriesMeme", - "active": true, - "adult": false, - "language": ["cast", "lat"], - "thumbnail": "seriesmeme.png", - "banner": "seriesmeme.png", - "categories": [ - "tvshow" - ] -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/seriesmeme.py b/plugin.video.alfa/channels/seriesmeme.py deleted file mode 100755 index 6676672e..00000000 --- a/plugin.video.alfa/channels/seriesmeme.py +++ /dev/null @@ -1,224 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import urlparse - -from channels import renumbertools -from channelselector import get_thumb -from core import httptools -from core import scrapertools -from core import servertools -from core import tmdb -from core.item import Item -from platformcode import config, logger -from channels import autoplay - -IDIOMAS = {'latino': 'Latino', 'español':'Español'} -list_language = IDIOMAS.values() -list_servers = ['openload', - 'sendvid', - 'netutv', - 'rapidvideo' - ] -list_quality = ['default'] - -host = "https://seriesmeme.com/" - - -def mainlist(item): - logger.info() - - thumb_series = get_thumb("channels_tvshow.png") - thumb_series_az = get_thumb("channels_tvshow_az.png") - autoplay.init(item.channel, list_servers, list_quality) - itemlist = list() - - itemlist.append(Item(channel=item.channel, action="lista_gen", title="Novedades", url=host, - thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="lista", title="Listado Completo de Series", url=urlparse.urljoin(host, "/lista"), - thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="categorias", title="Categorias", url=host, - thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="alfabetico", title="Listado Alfabetico", url=host, - thumbnail=thumb_series_az)) - itemlist.append(Item(channel=item.channel, action="top", title="Top Series", url=host, - thumbnail=thumb_series)) - itemlist = renumbertools.show_option(item.channel, itemlist) - autoplay.show_option(item.channel, itemlist) - return itemlist - - -""" -def search(item, texto): - logger.info() - texto = texto.replace(" ","+") - item.url = item.url+texto - if texto!='': - return lista(item) -""" - - -def categorias(item): - logger.info() - dict_gender = {"acción": "accion", "animes": "animacion", "aventuras": "aventura", "dibujos": "animacion", - "ciencia ficción": "ciencia%20ficcion", "intriga": "misterio", "suspenso": "suspense", - "thriller": "suspense", "fantástico": "fantasia"} - itemlist = [] - - data = httptools.downloadpage(item.url).data - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - patron_cat = '