diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 88e1185a..5dc70aef 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@ - + @@ -19,12 +19,12 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » allcalidad » inkaseries - » animemovil » descargas2020 - » descargasmix » mispelisyseries + » thevideome » cinecalidad + » ciberpeliculashd » vidlox + » descargasmix » cinefox + » allpeliculas » cinemahd + » allcalidad ¤ arreglos internos - - ¤ Agradecimientos a @GeorgeRamga por animemovil. 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.json b/plugin.video.alfa/channels/allcalidad.json index 1d553516..0caed17c 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -12,6 +12,18 @@ ], "settings": [ { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "LAT" + ] + }, + { "id": "modo_grafico", "type": "bool", "label": "Buscar información extra", diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 93bf520f..58d9bfa2 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- from channelselector import get_thumb +from channels import autoplay +from channels import filtertools from core import httptools from core import scrapertools from core import servertools @@ -8,6 +10,13 @@ from core import tmdb from core.item import Item from platformcode import config, logger + +IDIOMAS = {'Latino': 'LAT'} +list_language = IDIOMAS.values() +list_quality = [] +list_servers = ['rapidvideo', 'streamango', 'fastplay', 'flashx', 'openload', 'vimeo', 'netutv'] + + __channel__='allcalidad' host = "http://allcalidad.com/" @@ -20,6 +29,7 @@ except: def mainlist(item): logger.info() + autoplay.init(item.channel, list_servers, list_quality) itemlist = [] itemlist.append(Item(channel = item.channel, title = "Novedades", action = "peliculas", url = host, thumbnail = get_thumb("newest", auto = True))) itemlist.append(Item(channel = item.channel, title = "Por género", action = "generos_years", url = host, extra = "Genero", thumbnail = get_thumb("genres", auto = True) )) @@ -27,6 +37,7 @@ def mainlist(item): itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "peliculas", url = host + "/favorites", thumbnail = get_thumb("favorites", auto = True) )) itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host + "?s=", thumbnail = get_thumb("search", auto = True))) + autoplay.show_option(item.channel, itemlist) return itemlist def newest(categoria): @@ -146,6 +157,13 @@ def findvideos(item): )) tmdb.set_infoLabels(itemlist, __modo_grafico__) itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + # Requerido para FilterTools + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) + if itemlist: itemlist.append(Item(channel = item.channel)) itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="", diff --git a/plugin.video.alfa/channels/allpeliculas.json b/plugin.video.alfa/channels/allpeliculas.json index 198fc1bb..f0cae0fb 100755 --- a/plugin.video.alfa/channels/allpeliculas.json +++ b/plugin.video.alfa/channels/allpeliculas.json @@ -19,6 +19,18 @@ "enabled": true, "visible": true }, + { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "LAT" + ] + }, { "id": "include_in_newest_latino", "type": "bool", diff --git a/plugin.video.alfa/channels/allpeliculas.py b/plugin.video.alfa/channels/allpeliculas.py index 0aabc854..4e249b29 100644 --- a/plugin.video.alfa/channels/allpeliculas.py +++ b/plugin.video.alfa/channels/allpeliculas.py @@ -8,6 +8,9 @@ from core import tmdb from core.item import Item from channelselector import get_thumb from platformcode import config, logger +from channels import autoplay +from channels import filtertools + __modo_grafico__ = config.get_setting('modo_grafico', "allpeliculas") __perfil__ = int(config.get_setting('perfil', "allpeliculas")) @@ -18,11 +21,18 @@ perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00'], ['0xFF58D3F7', '0xFF2E9AFE', '0xFF2E64FE']] color1, color2, color3 = perfil[__perfil__] -IDIOMAS = {"Castellano": "CAST", "Latino": "LAT", "Subtitulado": "VOSE", "Ingles": "VO"} +IDIOMAS = {"Latino": "LAT"} +list_language = IDIOMAS.values() + +list_quality = [] + SERVERS = {"26": "powvideo", "45": "okru", "75": "openload", "12": "netutv", "65": "thevideos", "67": "spruto", "71": "stormo", "73": "idowatch", "48": "okru", "55": "openload", "20": "nowvideo", "84": "fastplay", "96": "raptu", "94": "tusfiles"} +list_servers = ['powvideo', 'okru', 'openload', 'netutv', 'thevideos', 'spruto', 'stormo', 'idowatch', 'nowvideo', + 'fastplay', 'raptu', 'tusfiles'] + host = "http://allpeliculas.com/" def mainlist(item): @@ -30,6 +40,8 @@ def mainlist(item): itemlist = [] item.text_color = color1 + autoplay.init(item.channel, list_servers, list_quality) + itemlist.append(item.clone(title="Películas", action="lista", fanart="http://i.imgur.com/c3HS8kj.png", url= host + "movies/newmovies?page=1", extra1 = 0, thumbnail=get_thumb('movies', auto=True))) @@ -40,6 +52,8 @@ def mainlist(item): itemlist.append(item.clone(title="", action="")) itemlist.append(item.clone(title="Buscar...", action="search", thumbnail=get_thumb('search', auto=True))) + autoplay.show_option(item.channel, itemlist) + return itemlist @@ -136,11 +150,9 @@ def findvideos(item): fulltitle = item.title, contentThumbnail = item.thumbnail, url = url, + language = IDIOMAS['Latino'] )) - try: - tmdb.set_infoLabels(itemlist, __modo_grafico__) - except: - pass + tmdb.set_infoLabels(itemlist, seekTmdb = True) itemlist = servertools.get_servers_itemlist(itemlist) itemlist.append(Item(channel=item.channel)) if config.get_videolibrary_support(): @@ -148,6 +160,13 @@ def findvideos(item): action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail, fulltitle = item.fulltitle )) + # Requerido para FilterTools + + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) return itemlist diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index eadc9577..a6352fc6 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -615,8 +615,11 @@ def get_languages(channel): list_language = ['No filtrar'] list_controls, dict_settings = channeltools.get_channel_controls_settings(channel) for control in list_controls: - if control["id"] == 'filter_languages': - list_language = control["lvalues"] + try: + if control["id"] == 'filter_languages': + list_language = control["lvalues"] + except: + pass return list_language diff --git a/plugin.video.alfa/channels/ciberpeliculashd.py b/plugin.video.alfa/channels/ciberpeliculashd.py index cc9c5a86..01184f6a 100644 --- a/plugin.video.alfa/channels/ciberpeliculashd.py +++ b/plugin.video.alfa/channels/ciberpeliculashd.py @@ -29,36 +29,17 @@ def mainlist(item): extra = "qualitys", thumbnail=get_thumb('quality', auto=True))) itemlist.append(Item(channel = item.channel, title = " Por idioma", action = "filtro", url = host, extra = "languages", thumbnail=get_thumb('language', auto=True))) + itemlist.append(Item(channel = item.channel, title = " Por año", action = "filtro", url = host, + extra = "years", thumbnail=get_thumb('year', auto=True))) itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Series", text_bold = True, folder = False)) itemlist.append(Item(channel = item.channel, title = " Novedades", action = "series", url = host +"/series/?peli=1", thumbnail=get_thumb('newest', auto=True))) - itemlist.append(Item(channel = item.channel, title = " Nuevos Capitulos", action = "nuevos_capitulos", - url = host + "/series/?peli=1", thumbnail=get_thumb('new episodes', auto=True))) itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host + "/?s=", thumbnail=get_thumb('search', auto=True))) return itemlist -def nuevos_capitulos(item): - logger.info() - itemlist = [] - data = httptools.downloadpage(item.url).data - patron = 'class="episode" href="([^"]+).*?' - patron += 'src="([^"]+).*?' - patron += 'title="([^"]+).*?' - patron += '-->([^<]+).*?' - patron += 'created_at">([^<]+)' - matches = scrapertools.find_multiple_matches(data, patron) - for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedepisode, scrapeddays in matches: - scrapedtitle = scrapedtitle + " %s (%s)" %(scrapedepisode.strip(), scrapeddays.strip()) - itemlist.append(Item(action = "findvideos", - channel = item.channel, - title = scrapedtitle, - thumbnail = scrapedthumbnail, - url = scrapedurl - )) - return itemlist def series(item): logger.info() @@ -70,7 +51,7 @@ def series(item): patron += 'title="([^"]+)' matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedurl, scrapedthumbnail, scrapedtitle in matches: - itemlist.append(Item(action = "temporadas", + itemlist.append(Item(action = "capitulos", channel = item.channel, thumbnail = scrapedthumbnail, title = scrapedtitle, @@ -84,25 +65,41 @@ def series(item): next_page += "%s" %page itemlist.append(Item(action = "series", channel = item.channel, - title = "Página siguiente", + title = "Página siguiente >>", url = next_page )) return itemlist -def temporadas(item): +def episodios(item): + logger.info() + itemlist = [] + itemlist = capitulos(item) + return itemlist + + +def capitulos(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - bloque = scrapertools.find_single_match(data, 'Lista de Temporadas.*?') - matches = scrapertools.find_multiple_matches(bloque, ' (.*?[0-9]+)') - for scrapedtitle in matches: - season = scrapertools.find_single_match(scrapedtitle, '[0-9]+') + bloque = scrapertools.find_single_match(data, 'Lista de Temporadas.*?Content principal') + patron = '", "") - episode = scrapertools.find_single_match(scrapedtitle, "Capitulo ([0-9]+)") - scrapedtitle = scrapedtitle.split(":")[1] - scrapedtitle = "%sx%s %s" %(item.infoLabels["season"], episode, scrapedtitle) - item.infoLabels["episode"] = episode - itemlist.append(item.clone(action = "findvideos", - title = scrapedtitle, - url = scrapedurl - )) - tmdb.set_infoLabels(itemlist) - return itemlist - - def newest(categoria): logger.info() itemlist = [] @@ -183,17 +150,30 @@ def search(item, texto): def filtro(item): logger.info() itemlist = [] + filter = "" + filter_end = "data-uk-dropdown" + if item.extra == "categories": + filter = "genero" + elif item.extra == "qualitys": + filter = "calidad" + elif item.extra == "languages": + filter = "audio" + elif item.extra == "years": + filter = "ano" + filter_end = "
%s.*?' %item.extra + patron = 'uk-button btn-filter %s.*?%s' %(item.extra, filter_end) bloque = scrapertools.find_single_match(data, patron) - patron = "href='([^']+)" - patron += "'>([^<]+)" + patron = 'id="([^"]+).*?' + patron += 'label for.*?>([^<]+)' matches = scrapertools.find_multiple_matches(bloque, patron) for url, titulo in matches: + url = filter + url itemlist.append(Item(channel = item.channel, action = "peliculas", title = titulo, - url = url + "/?peli=1" + url = url + "&peli=1" )) return itemlist @@ -202,8 +182,11 @@ def peliculas(item): logger.info() itemlist = [] infoLabels = dict() + filter = "uk-icon-angle-right next" + if item.extra == "busca": + filter = '
' data = httptools.downloadpage(item.url).data - bloque = scrapertools.find_single_match(data, 'loop-posts".*?panel-pagination pagination-bottom') + bloque = scrapertools.find_single_match(data, '%s.*?panel-pagination pagination-bottom' %(filter)) patron = 'a href="([^"]+)".*?' patron += 'img alt="([^"]+)".*?' patron += '((?:http|https)://image.tmdb.org[^"]+)".*?' @@ -218,7 +201,7 @@ def peliculas(item): year = 0 fulltitle = scrapertools.find_single_match(scrapedtitle, "(.*?) \(") if "serie" in scrapedurl: - action = "temporadas" + action = "capitulos" infoLabels ['tvshowtitle'] = scrapedtitle else: action = "findvideos" @@ -239,7 +222,7 @@ def peliculas(item): next_page += "%s" %page itemlist.append(Item(action = "peliculas", channel = item.channel, - title = "Página siguiente", + title = "Página siguiente >>", url = next_page )) return itemlist @@ -249,7 +232,9 @@ def findvideos(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - patron = 'src="([^&]+)' + url = scrapertools.find_single_match(data, 'iframe-.*?src="([^"]+)') + data = httptools.downloadpage(url).data + patron = ']+>Más resultados') if next_page != "": @@ -330,10 +351,7 @@ def peliculas(item): if "valores" in item and item.valores: itemlist.append(item.clone(action="", title=item.valores, text_color=color4)) - if __menu_info__: - action = "menu_info" - else: - action = "findvideos" + action = "findvideos" data = httptools.downloadpage(item.url).data bloque = scrapertools.find_multiple_matches(data, @@ -344,14 +362,15 @@ def peliculas(item): matches = scrapertools.find_multiple_matches(match, patron) for scrapedthumbnail, scrapedurl, scrapedtitle in matches: url = urlparse.urljoin(host, scrapedurl) + filter_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w200_and_h300_bestv2", "") + filter_list = {"poster_path": filter_thumb} + filter_list = filter_list.items() itemlist.append(Item(channel=item.channel, action=action, title=scrapedtitle, url=url, extra="media", thumbnail=scrapedthumbnail, contentTitle=scrapedtitle, fulltitle=scrapedtitle, - text_color=color2, contentType="movie")) + text_color=color2, contentType="movie", infoLabels={'filtro':filter_list})) else: - patron = '
(.*?)
(.*?)' \ - 'src="([^"]+)".*?href="([^"]+)">([^<]+)' + patron = '
(.*?)
([^<]+)' matches = scrapertools.find_multiple_matches(match, patron) - for idiomas, calidad, scrapedthumbnail, scrapedurl, scrapedtitle in matches: calidad = scrapertools.find_single_match(calidad, '
([^<]+)
') if calidad: @@ -361,17 +380,25 @@ def peliculas(item): if "medium-vs" in idiomas: audios.append('VOSE') if "medium-la" in idiomas: audios.append('LAT') if "medium-en" in idiomas or 'medium-"' in idiomas: - audios.append('V.O') + audios.append('VO') title = "%s [%s]" % (scrapedtitle, "/".join(audios)) + if calidad: title += " (%s)" % calidad url = urlparse.urljoin(host, scrapedurl) + filter_thumb = scrapedthumbnail.replace("https://image.tmdb.org/t/p/w200_and_h300_bestv2", "") + filter_list = {"poster_path": filter_thumb} + filter_list = filter_list.items() itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, extra="media", thumbnail=scrapedthumbnail, contentTitle=scrapedtitle, fulltitle=scrapedtitle, - text_color=color2, contentType="movie", quality=calidad, language=audios)) + text_color=color2, contentType="movie", quality=calidad, language=audios, + infoLabels={'filtro':filter_list})) next_page = scrapertools.find_single_match(data, 'href="([^"]+)"[^>]+>Siguiente') + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + if next_page != "" and item.title != "": itemlist.append(Item(channel=item.channel, action="peliculas", title=">> Siguiente", url=next_page, thumbnail=item.thumbnail, extra=item.extra, text_color=color3)) @@ -387,10 +414,10 @@ def ultimos(item): logger.info() item.text_color = color2 - if __menu_info__: - action = "menu_info_episode" - else: - action = "episodios" + # if __menu_info__: + # action = "menu_info_episode" + # else: + action = "episodios" itemlist = [] data = httptools.downloadpage(item.url).data @@ -407,20 +434,16 @@ def ultimos(item): if "medium-vs" in idiomas: audios.append('VOSE') if "medium-la" in idiomas: audios.append('LAT') if "medium-en" in idiomas or 'medium-"' in idiomas: - audios.append('V.O') + audios.append('VO') title = "%s - %s" % (show, re.sub(show, '', scrapedtitle)) if audios: title += " [%s]" % "/".join(audios) url = urlparse.urljoin(host, scrapedurl) itemlist.append(item.clone(action=action, title=title, url=url, thumbnail=scrapedthumbnail, - contentTitle=show, fulltitle=show, show=show, + contentSerieName=show, fulltitle=show, show=show, text_color=color2, extra="ultimos", contentType="tvshow")) - try: - from core import tmdb - tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) - except: - pass + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) next_page = scrapertools.find_single_match(data, 'href="([^"]+)"[^>]+>Siguiente') if next_page != "": @@ -444,12 +467,12 @@ def series(item): for scrapedthumbnail, scrapedurl, scrapedtitle in matches: url = urlparse.urljoin(host, scrapedurl + "/episodios") itemlist.append(Item(channel=item.channel, action="episodios", title=scrapedtitle, url=url, - thumbnail=scrapedthumbnail, contentTitle=scrapedtitle, fulltitle=scrapedtitle, + thumbnail=scrapedthumbnail, contentSerieName=scrapedtitle, fulltitle=scrapedtitle, show=scrapedtitle, text_color=color2, contentType="tvshow")) try: from core import tmdb - tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) except: pass @@ -512,10 +535,10 @@ def episodios(item): data = httptools.downloadpage(item.url).data data_season = data[:] - if "episodios" in item.extra or not __menu_info__ or item.path: - action = "findvideos" - else: - action = "menu_info_episode" + #if "episodios" in item.extra or not __menu_info__ or item.path: + action = "findvideos" + # else: + # action = "menu_info_episode" seasons = scrapertools.find_single_match(data, ']+>.*?release.*?>(\d+)<') @@ -634,7 +653,7 @@ def findvideos(item): if "|" in item.extra: extra = item.extra[:-1] url = host + "/sources/list?id=%s&type=%s&order=%s" % (id, extra, "streaming") - itemlist.extend(get_enlaces(item, url, "Online")) + itemlist=(get_enlaces(item, url, "Online")) url = host + "/sources/list?id=%s&type=%s&order=%s" % (id, extra, "download") itemlist.extend(get_enlaces(item, url, "de Descarga")) @@ -658,12 +677,20 @@ def findvideos(item): type = item.type.replace("streaming", "Online").replace("download", "de Descarga") itemlist.extend(get_enlaces(item, url, type)) + # Requerido para FilterTools + + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) + return itemlist def get_enlaces(item, url, type): itemlist = [] - itemlist.append(item.clone(action="", title="Enlaces %s" % type, text_color=color1)) + #itemlist.append(item.clone(action="", title="Enlaces %s" % type, text_color=color1)) data = httptools.downloadpage(url, add_referer=True).data if type == "Online": gg = httptools.downloadpage(item.url, add_referer=True).data @@ -674,14 +701,15 @@ def get_enlaces(item, url, type): matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedopcion, scrapedlanguage, scrapedcalidad in matches: google_url = scrapertools.find_single_match(bloque, 'id="%s.*?src="([^"]+)' % scrapedopcion) - if "medium-es" in scrapedlanguage: language = "Castellano" - if "medium-en" in scrapedlanguage: language = "Ingles" + if "medium-es" in scrapedlanguage: language = "CAST" + if "medium-en" in scrapedlanguage: language = "VO" if "medium-vs" in scrapedlanguage: language = "VOSE" - if "medium-la" in scrapedlanguage: language = "Latino" + if "medium-la" in scrapedlanguage: language = "LAT" titulo = " [%s/%s]" % (language, scrapedcalidad.strip()) itemlist.append( item.clone(action="play", url=google_url, title=" Ver en Gvideo" + titulo, text_color=color2, extra="", server="gvideo", language=language, quality=scrapedcalidad.strip())) + patron = '
([^<]+)<' matches = scrapertools.find_multiple_matches(data, patron) @@ -694,10 +722,12 @@ def get_enlaces(item, url, type): if servertools.is_server_enabled(server): scrapedtitle = " Ver en " + server.capitalize() + " [" + idioma + "/" + calidad + "]" itemlist.append(item.clone(action="play", url=scrapedurl, title=scrapedtitle, text_color=color2, - extra="", server=server, language=idioma)) + extra="", server=server, language=IDIOMAS[idioma])) if len(itemlist) == 1: itemlist.append(item.clone(title=" No hay enlaces disponibles", action="", text_color=color2)) + + return itemlist diff --git a/plugin.video.alfa/channels/cinemahd.json b/plugin.video.alfa/channels/cinemahd.json index 72ef64f0..79091cb0 100644 --- a/plugin.video.alfa/channels/cinemahd.json +++ b/plugin.video.alfa/channels/cinemahd.json @@ -19,6 +19,18 @@ "enabled": false, "visible": false }, + { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "LAT" + ] + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -52,4 +64,4 @@ "visible": true } ] -} \ No newline at end of file +} diff --git a/plugin.video.alfa/channels/cinemahd.py b/plugin.video.alfa/channels/cinemahd.py index 44e3062d..ce07e269 100644 --- a/plugin.video.alfa/channels/cinemahd.py +++ b/plugin.video.alfa/channels/cinemahd.py @@ -11,13 +11,23 @@ from core import servertools from core import tmdb from core.item import Item from platformcode import config, logger +from channels import autoplay +from channels import filtertools + host = 'http://www.cinemahd.co/' +IDIOMAS = {'Latino': 'LAT'} +list_language = IDIOMAS.values() +list_quality = [] +list_servers = ['fastplay', 'rapidvideo', 'streamplay', 'flashx', 'streamito', 'streamango', 'vidoza'] + def mainlist(item): logger.info() + autoplay.init(item.channel, list_servers, list_quality) + itemlist = list() itemlist.append(item.clone(title="Ultimas", action="list_all", url=host, thumbnail=get_thumb('last', auto=True))) itemlist.append(item.clone(title="Generos", action="section", section='genre', @@ -31,6 +41,8 @@ def mainlist(item): itemlist.append(item.clone(title="Buscar", action="search", url=host+'?s=', thumbnail=get_thumb('search', auto=True))) + autoplay.show_option(item.channel, itemlist) + return itemlist @@ -132,16 +144,28 @@ def findvideos(item): language = opt_data[0].strip() quality = opt_data[1].strip() - - if url != '': - itemlist.append(item.clone(title='%s', url=url, language=language, quality=quality, action='play')) + if url != '' and 'youtube' not in url: + itemlist.append(item.clone(title='%s', url=url, language=IDIOMAS[language], quality=quality, action='play')) + elif 'youtube' in url: + trailer = item.clone(title='Trailer', url=url, action='play', server='youtube') itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % '%s [%s] [%s]'%(i.server.capitalize(), i.language, i.quality)) + itemlist.append(trailer) + + # Requerido para FilterTools + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) + 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 diff --git a/plugin.video.alfa/channels/descargasmix.py b/plugin.video.alfa/channels/descargasmix.py index 5366a331..8022ffaa 100644 --- a/plugin.video.alfa/channels/descargasmix.py +++ b/plugin.video.alfa/channels/descargasmix.py @@ -6,6 +6,7 @@ import urllib 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 @@ -164,6 +165,7 @@ def entradas(item): titulo = scrapedtitle + scrapedinfo titulo = scrapertools.decodeHtmlentities(titulo) scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) + scrapedthumbnail = urllib.unquote(re.sub(r'&b=4|/go\.php\?u=', '', scrapedthumbnail)) if not scrapedthumbnail.startswith("http"): scrapedthumbnail = "http:" + scrapedthumbnail @@ -201,7 +203,7 @@ def entradas(item): if info: titulo += " [%s]" % unicode(info, "utf-8").capitalize().encode("utf-8") - + year = scrapertools.find_single_match(titulo,'\[\d{4}\]') scrapedthumbnail = urllib.unquote(re.sub(r'&b=4|/go\.php\?u=', '', scrapedthumbnail)) if not scrapedthumbnail.startswith("http"): scrapedthumbnail = "http:" + scrapedthumbnail @@ -211,8 +213,8 @@ def entradas(item): itemlist.append(item.clone(action=action, title=titulo, url=scrapedurl, thumbnail=scrapedthumbnail, fulltitle=scrapedtitle, contentTitle=scrapedtitle, viewmode="movie_with_plot", - show=show, contentType="movie")) - + show=show, contentType="movie", infoLabels={'year':year})) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) # Paginación next_page = scrapertools.find_single_match(data, '
- patron = '
  • ([^<]+)' - matches = re.compile(patron, re.DOTALL).findall(data) - itemlist = [] - - for scrapedurl, scrapedtitle in matches: - title = scrapedtitle.strip() - thumbnail = "" - plot = "" - url = urlparse.urljoin(item.url, scrapedurl) - logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") - itemlist.append( - Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot, - fulltitle=title, viewmode="movie")) - - return itemlist - - -def generos(item): - logger.info() - - # Descarga la pagina - data = scrapertools.cache_page(item.url) - # logger.info("data="+data) - - # Extrae las entradas (carpetas) - # Acción - patron = "([^<]+)" - matches = re.compile(patron, re.DOTALL).findall(data) - itemlist = [] - - for scrapedurl, scrapedtitle in matches: - title = unicode(scrapedtitle, "iso-8859-1", errors="replace").encode("utf-8").strip() - thumbnail = "" - plot = "" - url = urlparse.urljoin(item.url, scrapedurl) - logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") - itemlist.append( - Item(channel=item.channel, action="peliculas", title=title, url=url, thumbnail=thumbnail, plot=plot, - fulltitle=title, viewmode="movie")) - - return itemlist - - -def peliculas(item): - logger.info() - itemlist = [] - - # Descarga la pagina - data = scrapertools.cache_page(item.url) - # logger.info("data="+data) - - # Extrae las entradas - ''' - -
  • -

    El Jardinero Fiel

    -
    -
    - - El Jardinero Fiel -
    -
    -
    - - - - - - - - - -
    -
    -
    -

    El Jardinero Fiel

    -
    -
    Genero: Suspenso, Drama, 2005
    -

    -
    Idioma:
    -

    -
    Calidad:
    -

    -
    Visualizada: 629 Veces
    - - -
    -
    -
    -
    • - - ''' - patronbloque = "