diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 3f8b9b0e..13848d35 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,9 +19,10 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » pelisplus » cinetux - » powvideo » streamplay - » gvideo ¤ arreglos internos + » cartoonlatino » clasicofilm + » hdfull » yaske + » ver-peliculas » thevideome + » powvideo ¤ arreglos internos [COLOR green]Gracias a [COLOR yellow]caperucitaferoz[/COLOR] por su colaboración en esta versión[/COLOR] Navega con Kodi por páginas web para ver sus videos de manera fácil. diff --git a/plugin.video.alfa/channels/animeflv_me.py b/plugin.video.alfa/channels/animeflv_me.py index b762c316..1fc97cbf 100755 --- a/plugin.video.alfa/channels/animeflv_me.py +++ b/plugin.video.alfa/channels/animeflv_me.py @@ -11,6 +11,12 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import config, logger +from channels import autoplay + +list_servers = ['openload', + 'directo' + ] +list_quality = ['default'] CHANNEL_HOST = "http://animeflv.co" CHANNEL_DEFAULT_HEADERS = [ @@ -117,7 +123,8 @@ def __find_series(html): def mainlist(item): logger.info() - + + autoplay.init(item.channel, list_servers, list_quality) itemlist = list() itemlist.append(Item(channel=item.channel, action="letras", @@ -134,6 +141,7 @@ def mainlist(item): url=CHANNEL_HOST + "/Buscar?s=")) itemlist = renumbertools.show_option(item.channel, itemlist) + autoplay.show_option(item.channel, itemlist) return itemlist @@ -179,10 +187,13 @@ def search(item, texto): show_list = __find_series(html) items = [] + context = renumbertools.context(item) + context2 = autoplay.context + context.extend(context2) for show in show_list: title, url, thumbnail, plot = show items.append(Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, - plot=plot, show=title, viewmode="movies_with_plot", context=renumbertools.context(item))) + plot=plot, show=title, viewmode="movies_with_plot", context=context)) except: import sys for line in sys.exc_info(): @@ -197,10 +208,13 @@ def series(item): page_html = get_url_contents(item.url) show_list = __find_series(page_html) items = [] + context = renumbertools.context(item) + context2 = autoplay.context + context.extend(context2) for show in show_list: title, url, thumbnail, plot = show items.append(Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, - plot=plot, show=title, viewmode="movies_with_plot", context=renumbertools.context(item))) + plot=plot, show=title, viewmode="movies_with_plot", context=context)) url_next_page = scrapertools.find_single_match(page_html, REGEX_NEXT_PAGE) if url_next_page: @@ -292,4 +306,5 @@ def findvideos(item): itemlist.append(Item(channel=item.channel, action="play", url=video_url, show=re.escape(item.show), title="Ver en calidad [%s]" % (qualities[quality_id]), plot=item.plot, fulltitle=item.title)) + autoplay.start(__sort_by_quality(itemlist), item) return __sort_by_quality(itemlist) diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py index fe586fa3..e26f0c97 100644 --- a/plugin.video.alfa/channels/animemovil.py +++ b/plugin.video.alfa/channels/animemovil.py @@ -96,7 +96,6 @@ def recientes(item): action = "peliculas" if not thumb.startswith("http"): thumb = "http:%s" % thumb - action ="findvideos" infoLabels = {'filtro': {"original_language": "ja"}.items()} itemlist.append(item.clone(action=action, title=title, url=url, thumbnail=thumb, text_color=color3, contentTitle=contentTitle, contentSerieName=show, infoLabels=infoLabels, diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index b507978c..467d7621 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -90,7 +90,7 @@ def start(itemlist, item): videoitem.contentType=item.contentType videoitem.episode_id=item.episode_id videoitem.hasContentDetails=item.hasContentDetails - videoitem.infoLabels=item.infoLabels + #videoitem.infoLabels=item.infoLabels videoitem.thumbnail=item.thumbnail #videoitem.title=item.title if not config.is_xbmc(): diff --git a/plugin.video.alfa/channels/bajui.py b/plugin.video.alfa/channels/bajui.py index 0baf7190..017562e3 100644 --- a/plugin.video.alfa/channels/bajui.py +++ b/plugin.video.alfa/channels/bajui.py @@ -1,8 +1,9 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import urlparse +from core import httptools from core import scrapertools from core import servertools from core.item import Item @@ -33,8 +34,7 @@ def menupeliculas(item): Item(channel=item.channel, title="Películas - A-Z", action="peliculas", url=item.url + "/orden:nombre", fanart=item.fanart, viewmode="movie_with_plot")) - # - data = scrapertools.cache_page(item.url) + data = httptools.downloadpage(item.url).data data = scrapertools.get_match(data, '
    (.*?)
') patron = '([^<]+)' matches = re.compile(patron, re.DOTALL).findall(data) @@ -78,7 +78,6 @@ def menudocumentales(item): return itemlist -# Al llamarse "search" la función, el launcher pide un texto a buscar y lo añade como parámetro def search(item, texto, categoria=""): logger.info(item.url + " search " + texto) itemlist = [] @@ -101,9 +100,7 @@ def search(item, texto, categoria=""): def peliculas(item, paginacion=True): logger.info() url = item.url - - # Descarga la página - data = scrapertools.cache_page(url) + data = httptools.downloadpage(url).data patron = '
  • (.*?)') @@ -201,18 +193,6 @@ def enlaces(item): except: pass - ''' -
    -
  • -
    -
    Enlaces de: - jerobien
    -
    Actualizado: Hace 8 minutos
    -
    Mostrar enlaces
    -
    uploaded.combitshare.comfreakshare.comletitbit.netturbobit.netrapidgator.netclz.to
    -
    - ''' - patron = '
    freakshare.comrapidgator.netturbobit.netmuchshare.netletitbit.netshareflare.netOtros patronservidores = ']+>]+>([^<]+).*?""" + patron += """src="([^"]+)""" + matches = scrapertools.find_multiple_matches(data, patron) + for scrapedurl, scrapedtitle, scrapedthumbnail in matches: + year = scrapertools.find_single_match(scrapedtitle, "\(([0-9]{4})\)") + ctitle = scrapedtitle.split("(")[0].strip() + itemlist.append(item.clone(action = "findvideos", + contentTitle = ctitle, + infoLabels = {"year" : year}, + thumbnail = scrapedthumbnail, + title = scrapedtitle, + url = scrapedurl + )) + tmdb.set_infoLabels(itemlist, __modo_grafico__) return itemlist @@ -197,9 +168,10 @@ def generos(item): # Descarga la página data = httptools.downloadpage(item.url).data - patron = '([^<]+)
    \s*") - data = jsunpack.unpack(match) - - matches = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)"\}') - video_urls = [] - for video_url in matches: - filename = scrapertools.get_filename_from_url(video_url)[-4:] - if video_url.endswith("smil"): - playpath = video_url.rsplit("/", 1)[1].replace(".smil", "") - rtmp = scrapertools.find_single_match(data, 'image\s*:\s*"([^"]+)"') - rtmp = scrapertools.find_single_match(rtmp, 'i/(.*?)_') - video_url = "rtmp://kingvid.tv:1935/vod/ playpath=mp4:%s_n?h=%s " \ - "swfUrl=http://kingvid.tv/player7/jwplayer.flash.swf pageUrl=%s" % \ - (rtmp, playpath, page_url) - filename = "RTMP" - video_urls.append([filename + " [kingvid]", video_url]) - elif video_url[-4:] in ['.mp4', 'm3u8']: - video_urls.append([filename + " [kingvid]", video_url]) - - video_urls.sort(key=lambda x: x[0], reverse=True) - for video_url in video_urls: - logger.info("%s - %s" % (video_url[0], video_url[1])) - - return video_urls diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index b18431a4..dc78800e 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -16,9 +16,6 @@ def test_video_exists(page_url): referer = page_url.replace('iframe', 'preview') data = httptools.downloadpage(page_url, headers={'referer': referer}).data - - if "watch " in data.lower(): - return False, "[powvideo] El archivo no existe o ha sido borrado" if "el archivo ha sido borrado por no respetar" in data.lower(): return False, "[powvideo] El archivo no existe o ha sido borrado por no respetar los Terminos de uso" diff --git a/plugin.video.alfa/servers/rapidvideo.py b/plugin.video.alfa/servers/rapidvideo.py index a6584eef..b92df605 100755 --- a/plugin.video.alfa/servers/rapidvideo.py +++ b/plugin.video.alfa/servers/rapidvideo.py @@ -23,7 +23,7 @@ def test_video_exists(page_url): if "Object not found" in response.data: return False, "[Rapidvideo] El archivo no existe o ha sido borrado" - if reponse.code == 500: + if response.code == 500: return False, "[Rapidvideo] Error de servidor, inténtelo más tarde." return True, "" diff --git a/plugin.video.alfa/servers/thevideome.json b/plugin.video.alfa/servers/thevideome.json index 666799bb..06a9ef6c 100755 --- a/plugin.video.alfa/servers/thevideome.json +++ b/plugin.video.alfa/servers/thevideome.json @@ -4,7 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "(?:thevideo.me|tvad.me)/(?:embed-|)([A-z0-9]+)", + "pattern": "(?:thevideo.me|tvad.me|thevid.net)/(?:embed-|)([A-z0-9]+)", "url": "http://thevideo.me/embed-\\1.html" } ]