diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index d39f9de3..0ae3730c 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,8 +19,11 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » pelisplus » pelisplusco - » gvideo ¤ arreglos internos + » cinetux » peliculasgratis + » gamovideo » peliculasaudiolatino + » streamixcloud » uptobox + » canalpelis » verpelis + ¤ 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/canalpelis.py b/plugin.video.alfa/channels/canalpelis.py index cb719be4..79e1dc61 100644 --- a/plugin.video.alfa/channels/canalpelis.py +++ b/plugin.video.alfa/channels/canalpelis.py @@ -357,19 +357,24 @@ def findvideos(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}| ", "", data) - patron = '
' - + patron = '
' matches = re.compile(patron, re.DOTALL).findall(data) for option, url in matches: - lang = scrapertools.find_single_match( - data, '
  • <\/b> (.*?)' % option) + lang = scrapertools.find_single_match(data, + '
  • <\/b> (.*?)' % option) lang = lang.replace('Español ', '').replace('B.S.O. ', '') + data_b = httptools.downloadpage(urlparse.urljoin(host, url), headers={'Referer': item.url}).data + patron = ']+src="([^"]+)"' + matches = re.compile(patron, re.DOTALL).findall(data_b) + url = matches[0] server = servertools.get_server_from_url(url) title = "%s [COLOR yellow](%s) (%s)[/COLOR]" % (item.contentTitle, server.title(), lang) - itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, - server=server, language = lang, text_color=color3)) + itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, server=server, language=lang, + text_color=color3)) itemlist.append(Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py index 96c848e4..59805451 100644 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -182,18 +182,15 @@ def destacadas(item): matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedtitle, scrapedurl, scrapedthumbnail in matches: scrapedurl = CHANNEL_HOST + scrapedurl - scrapedtitle = scrapedtitle.replace("Ver ", "") - new_item = item.clone(action="findvideos", title=scrapedtitle, fulltitle=scrapedtitle, + itemlist.append(item.clone(action="findvideos", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, - contentType="movie") - itemlist.append(new_item) - + contentType="movie" + )) # Extrae el paginador next_page_link = scrapertools.find_single_match(data, ']+>»') if next_page_link: itemlist.append( item.clone(action="destacadas", title=">> Página siguiente", url=next_page_link, text_color=color3)) - return itemlist @@ -243,13 +240,9 @@ def findvideos(item): # Busca el argumento data = httptools.downloadpage(item.url).data - year = scrapertools.find_single_match(item.title, "\(([0-9]+)") - tmdb.set_infoLabels(item, __modo_grafico__) - - if not item.infoLabels.get('plot'): - plot = scrapertools.find_single_match(data, '

    (.*?)

    ') - item.infoLabels['plot'] = plot + if item.infoLabels["year"]: + tmdb.set_infoLabels(item, __modo_grafico__) if filtro_enlaces != 0: list_enlaces = bloque_enlaces(data, filtro_idioma, dict_idiomas, "online", item) diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py index b2d48c92..cb0a4fb0 100644 --- a/plugin.video.alfa/channels/news.py +++ b/plugin.video.alfa/channels/news.py @@ -15,6 +15,8 @@ from core import scrapertools from core.item import Item from platformcode import config, logger from platformcode import platformtools +from core import jsontools +from channels import side_menu THUMBNAILS = {'0': 'posters', '1': 'banners', '2': 'squares'} @@ -27,11 +29,16 @@ perfil = [['0xFF0B7B92', '0xFF89FDFB', '0xFFACD5D4'], ['0xFFA5DEE5', '0xFFE0F9B5', '0xFFFEFDCA'], ['0xFFF23557', '0xFF22B2DA', '0xFFF0D43A']] +#color1, color2, color3 = ["white", "white", "white"] color1, color2, color3 = perfil[__perfil__] list_newest = [] +list_newest_tourl = [] channels_id_name = {} +menu_cache_path = os.path.join(config.get_data_path(), "settings_channels", 'menu_cache_data.json') +menu_settings_path = os.path.join(config.get_data_path(), "settings_channels", 'menu_settings_data.json') + def mainlist(item): logger.info() @@ -150,6 +157,54 @@ def get_channels_list(): return list_canales, any_active +def set_cache(item): + logger.info() + item.mode = 'set_cache' + t = Thread(target=novedades, args=[item]) + t.start() + #t.join() + +def get_from_cache(item): + logger.info() + itemlist=[] + cache_node = jsontools.get_node_from_file('menu_cache_data.json', 'cached') + first=item.last + last = first+40 + #if last >=len(cache_node[item.extra]): + # last = len(cache_node[item.extra]) + + for cached_item in cache_node[item.extra][first:last]: + new_item= Item() + new_item = new_item.fromurl(cached_item) + itemlist.append(new_item) + if item.mode == 'silent': + set_cache(item) + if last >= len(cache_node[item.extra]): + item.mode='finish' + itemlist = add_menu_items(item, itemlist) + else: + item.mode='get_cached' + item.last =last + itemlist = add_menu_items(item, itemlist) + + return itemlist + +def add_menu_items(item, itemlist): + logger.info() + + menu_icon = get_thumb('menu.png') + menu = Item(channel="channelselector", action="getmainlist", viewmode="movie", thumbnail=menu_icon, title='Menu') + itemlist.insert(0, menu) + if item.mode != 'finish': + if item.mode == 'get_cached': + last=item.last + else: + last = len(itemlist) + refresh_icon = get_thumb('more.png') + refresh = item.clone(thumbnail=refresh_icon, mode='get_cached',title='Mas', last=last) + itemlist.insert(len(itemlist), refresh) + + return itemlist def novedades(item): logger.info() @@ -159,6 +214,14 @@ def novedades(item): list_newest = [] start_time = time.time() + mode = item.mode + if mode == '': + mode = 'normal' + + if mode=='get_cached': + if os.path.exists(menu_cache_path): + return get_from_cache(item) + multithread = config.get_setting("multithread", "news") logger.info("multithread= " + str(multithread)) @@ -170,8 +233,22 @@ def novedades(item): if config.set_setting("multithread", True, "news"): multithread = True - progreso = platformtools.dialog_progress(item.category, "Buscando canales...") + if mode == 'normal': + progreso = platformtools.dialog_progress(item.category, "Buscando canales...") + list_canales, any_active = get_channels_list() + + if mode=='silent' and any_active and len(list_canales[item.extra]) > 0: + side_menu.set_menu_settings(item) + aux_list=[] + for canal in list_canales[item.extra]: + if len(aux_list)<2: + aux_list.append(canal) + list_canales[item.extra]=aux_list + + if mode == 'set_cache': + list_canales[item.extra] = list_canales[item.extra][2:] + if any_active and len(list_canales[item.extra])>0: import math # fix float porque la division se hace mal en python 2.x @@ -191,12 +268,14 @@ def novedades(item): t = Thread(target=get_newest, args=[channel_id, item.extra], name=channel_title) t.start() threads.append(t) - progreso.update(percentage, "", "Buscando en '%s'..." % channel_title) + if mode == 'normal': + progreso.update(percentage, "", "Buscando en '%s'..." % channel_title) # Modo single Thread else: - logger.info("Obteniendo novedades de channel_id=" + channel_id) - progreso.update(percentage, "", "Buscando en '%s'..." % channel_title) + if mode == 'normal': + logger.info("Obteniendo novedades de channel_id=" + channel_id) + progreso.update(percentage, "", "Buscando en '%s'..." % channel_title) get_newest(channel_id, item.extra) # Modo Multi Thread: esperar q todos los hilos terminen @@ -208,25 +287,29 @@ def novedades(item): percentage = int(math.ceil(index * t)) list_pendent_names = [a.getName() for a in pendent] - mensaje = "Buscando en %s" % (", ".join(list_pendent_names)) - progreso.update(percentage, "Finalizado en %d/%d canales..." % (len(threads) - len(pendent), len(threads)), + if mode == 'normal': + mensaje = "Buscando en %s" % (", ".join(list_pendent_names)) + progreso.update(percentage, "Finalizado en %d/%d canales..." % (len(threads) - len(pendent), len(threads)), mensaje) - logger.debug(mensaje) + logger.debug(mensaje) - if progreso.iscanceled(): - logger.info("Busqueda de novedades cancelada") - break + if progreso.iscanceled(): + logger.info("Busqueda de novedades cancelada") + break time.sleep(0.5) pendent = [a for a in threads if a.isAlive()] - - mensaje = "Resultados obtenidos: %s | Tiempo: %2.f segundos" % (len(list_newest), time.time() - start_time) - progreso.update(100, mensaje, " ", " ") - logger.info(mensaje) - start_time = time.time() - # logger.debug(start_time) + if mode == 'normal': + mensaje = "Resultados obtenidos: %s | Tiempo: %2.f segundos" % (len(list_newest), time.time() - start_time) + progreso.update(100, mensaje, " ", " ") + logger.info(mensaje) + start_time = time.time() + # logger.debug(start_time) result_mode = config.get_setting("result_mode", "news") + if mode != 'normal': + result_mode=0 + if result_mode == 0: # Agrupados por contenido ret = group_by_content(list_newest) elif result_mode == 1: # Agrupados por canales @@ -237,13 +320,19 @@ def novedades(item): while time.time() - start_time < 2: # mostrar cuadro de progreso con el tiempo empleado durante almenos 2 segundos time.sleep(0.5) - - progreso.close() - return ret + if mode == 'normal': + progreso.close() + if mode == 'silent': + set_cache(item) + item.mode = 'set_cache' + ret = add_menu_items(item, ret) + if mode != 'set_cache': + return ret else: - no_channels = platformtools.dialog_ok('Novedades - %s'%item.extra, 'No se ha definido ningun canal para la ' - 'busqueda.','Utilice el menu contextual ' - 'para agregar al menos uno') + if mode != 'set_cache': + no_channels = platformtools.dialog_ok('Novedades - %s'%item.extra, 'No se ha definido ningun canal para la ' + 'busqueda.','Utilice el menu contextual ' + 'para agregar al menos uno') return @@ -251,6 +340,7 @@ def get_newest(channel_id, categoria): logger.info("channel_id=" + channel_id + ", categoria=" + categoria) global list_newest + global list_newest_tourl # Solicitamos las novedades de la categoria (item.extra) buscada en el canal channel # Si no existen novedades para esa categoria en el canal devuelve una lista vacia @@ -271,11 +361,22 @@ def get_newest(channel_id, categoria): logger.info("running channel " + modulo.__name__ + " " + modulo.__file__) list_result = modulo.newest(categoria) logger.info("canal= %s %d resultados" % (channel_id, len(list_result))) - + exist=False + if os.path.exists(menu_cache_path): + cache_node = jsontools.get_node_from_file('menu_cache_data.json', 'cached') + exist=True + else: + cache_node = {} + #logger.debug('cache node: %s' % cache_node) for item in list_result: # logger.info("item="+item.tostring()) item.channel = channel_id list_newest.append(item) + list_newest_tourl.append(item.tourl()) + + cache_node[categoria] = list_newest_tourl + + jsontools.update_node(cache_node, 'menu_cache_data.json', "cached") except: logger.error("No se pueden recuperar novedades de: " + channel_id) diff --git a/plugin.video.alfa/channels/peliculasaudiolatino.py b/plugin.video.alfa/channels/peliculasaudiolatino.py index 8ab94e70..437a3dd2 100644 --- a/plugin.video.alfa/channels/peliculasaudiolatino.py +++ b/plugin.video.alfa/channels/peliculasaudiolatino.py @@ -43,7 +43,7 @@ def newest(categoria): elif categoria == 'terror': item.url = HOST + '/genero/terror.html' itemlist = peliculas(item) - if "Pagina" in itemlist[-1].title: + if ">> Página siguiente" in itemlist[-1].title: itemlist.pop() except: import sys diff --git a/plugin.video.alfa/channels/peliculasgratis.py b/plugin.video.alfa/channels/peliculasgratis.py index 35e07ba5..9105048d 100644 --- a/plugin.video.alfa/channels/peliculasgratis.py +++ b/plugin.video.alfa/channels/peliculasgratis.py @@ -3,28 +3,14 @@ import os import re import urllib -import urlparse -import xbmc -import xbmcgui from core import httptools from core import scrapertools from core import servertools from core import tmdb from core.item import Item -from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger -ACTION_SHOW_FULLSCREEN = 36 -ACTION_GESTURE_SWIPE_LEFT = 511 -ACTION_SELECT_ITEM = 7 -ACTION_PREVIOUS_MENU = 10 -ACTION_MOVE_LEFT = 1 -ACTION_MOVE_RIGHT = 2 -ACTION_MOVE_DOWN = 4 -ACTION_MOVE_UP = 3 -OPTION_PANEL = 6 -OPTIONS_OK = 5 host = "http://peliculasgratis.biz" @@ -37,49 +23,6 @@ CALIDADES = {"micro1080p": "[COLOR plum]Micro1080p[/COLOR]", "dvds": "[COLOR lim IDIOMAS = {"castellano": "[COLOR yellow]Castellano[/COLOR]", "latino": "[COLOR orange]Latino[/COLOR]", "vose": "[COLOR lightsalmon]Subtitulada[/COLOR]", "vo": "[COLOR crimson]Ingles[/COLOR]", "en": "[COLOR crimson]Ingles[/COLOR]"} -IDIOMASP = {"es": "[COLOR yellow]CAST[/COLOR]", "la": "[COLOR orange]LAT[/COLOR]", - "vs": "[COLOR lightsalmon]SUB[/COLOR]", "vo": "[COLOR crimson]Ingles[/COLOR]", - "en": "[COLOR crimson]INGL[/COLOR]"} - - -# Para la busqueda en bing evitando baneos - -def browser(url): - import mechanize - - # Utilizamos Browser mechanize para saltar problemas con la busqueda en bing - br = mechanize.Browser() - # Browser options - br.set_handle_equiv(False) - br.set_handle_gzip(True) - br.set_handle_redirect(True) - br.set_handle_referer(False) - br.set_handle_robots(False) - # Follows refresh 0 but not hangs on refresh > 0 - br.set_handle_refresh(mechanize._http.HTTPRefreshProcessor(), max_time=1) - # Want debugging messages? - # br.set_debug_http(True) - # br.set_debug_redirects(True) - # br.set_debug_responses(True) - - # User-Agent (this is cheating, ok?) - # br.addheaders = [('User-agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.7.12 (KHTML, like Gecko) Version/7.1.7 Safari/537.85.16')] - # br.addheaders =[('Cookie','SRCHD=AF=QBRE; domain=.bing.com; expires=25 de febrero de 2018 13:00:28 GMT+1; MUIDB=3B942052D204686335322894D3086911; domain=www.bing.com;expires=24 de febrero de 2018 13:00:28 GMT+1')] - # Open some site, let's pick a random one, the first that pops in mind - r = br.open(url) - response = r.read() - print response - if "img,divreturn" in response: - r = br.open("http://ssl-proxy.my-addr.org/myaddrproxy.php/" + url) - print "prooooxy" - response = r.read() - - return response - - -api_key = "2e2160006592024ba87ccdf78c28f49f" -api_fankey = "dffe90fba4d02c199ae7a9e71330c987" - def mainlist(item): logger.info() @@ -88,22 +31,26 @@ def mainlist(item): thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Más vistas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?order=most_viewed", + url= host + "/catalogue?order=most_viewed", thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title=" [COLOR lightskyblue][B]Recomendadas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?order=most_rated", - thumbnail="http://imgur.com/fN2p6qH.png.png", + url=host + "/catalogue?order=most_rated", + thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Actualizadas[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/catalogue?", + url= host + "/catalogue?", + thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", + contentType="movie")) + itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B] Género[/B][/COLOR]", action="genero", + url= host, thumbnail="http://imgur.com/fN2p6qH.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Series[/B][/COLOR]", action="scraper", - url="http://peliculasgratis.biz/lista-de-series", + url= host + "/lista-de-series", thumbnail="http://imgur.com/Jia27Uc.png", fanart="http://imgur.com/b8OuBR2.jpg", contentType="tvshow")) - itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Buscar[/B][/COLOR]", action="", url="", + itemlist.append(itemlist[-1].clone(title="[COLOR lightskyblue][B]Buscar[/B][/COLOR]", thumbnail="http://imgur.com/mwTwfN7.png", fanart="http://imgur.com/b8OuBR2.jpg")) itemlist.append( itemlist[-1].clone(title="[COLOR lightskyblue][B] Buscar Película[/B][/COLOR]", action="search", url="", @@ -117,11 +64,31 @@ def mainlist(item): return itemlist +def genero(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + patron = 'Películas por géneros(.*?)<\/i>Anuncios') if item.contentType != "movie": - matches = scrapertools.find_multiple_matches(bloque_enlaces, - '    (.*?)<\/a>

    .*?(completa)">([^"]+)<\/a><\/h3> (.*?)<\/span>') + patron = '([^<]+)<.*?
    (.*?)<\/a>

    .*?title[^<]+>([^<]+)<\/a><\/h3> (.*?)<') - for url, thumb, quality, check_idioma, title, check_year in matches: - - logger.debug('check_idioma: %s' % check_idioma) + patron = '') title = title - itemlist.append( - Item(channel=item.channel, title=title, url=urlparse.urljoin(host, url), action="fanart", thumbnail=thumb, - fanart="http://imgur.com/nqmJozd.jpg", extra=title_fan + "|" + title_item + "|" + check_year.strip(), - contentType=item.contentType, folder=True, language = idiomas)) + Item(channel=item.channel, title=title, fulltitle=title, url=host + url, action=action, thumbnail=thumb, + fanart="http://imgur.com/nqmJozd.jpg", extra=title_fan + "|" + title_item + "|" + year, show=title, + contentType=item.contentType, folder=True, language = idiomas, infoLabels={"year":year})) ## Paginación - if check_year: + tmdb.set_infoLabels(itemlist) + if year: next = scrapertools.find_single_match(data, 'href="([^"]+)" title="Siguiente página">') if len(next) > 0: url = next if not "http" in url: - url = urlparse.urljoin(host, url) + url = host + url itemlist.append( Item(channel=item.channel, action="scraper", title="[COLOR floralwhite][B]Siguiente[/B][/COLOR]", url=url, thumbnail="http://imgur.com/jhRFAmk.png", fanart="http://imgur.com/nqmJozd.jpg", extra=item.extra, contentType=item.contentType, folder=True)) - - return itemlist - - -def fanart(item): - logger.info() - itemlist = [] - url = item.url - data = httptools.downloadpage(item.url).data - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - year = item.extra.split("|")[2] - if not year.isdigit(): - try: - year = scrapertools.find_single_match(data, '[^<]+<\/span>(\d+)<') - except: - year = "" - if item.contentType != "movie": - tipo_ps = "tv" - else: - tipo_ps = "movie" - title = item.extra.split("|")[0] - fulltitle = title - if "El infiltrado" in title: - title = "The Night Manager" - title_o = scrapertools.find_single_match(data, '(.*?)<\/div>') - if sinopsis == "": - try: - sinopsis = scrapertools.find_single_match(data, 'sinopsis\'>(.*?)<\/div>') - except: - sinopsis = "" - if "Miniserie" in sinopsis: - tipo_ps = "tv" - year = scrapertools.find_single_match(sinopsis, 'de TV \((\d+)\)') - if year == "": - if item.contentType != "movie": - try: - year = scrapertools.find_single_match(data, 'Estreno:<\/strong>(\d+)<\/span>') - except: - year = "" - else: - year = scrapertools.find_single_match(data, '
    A.*?(\d+)
    ') - if year == "": - try: - year = scrapertools.find_single_match(data, 'Estreno.*?\d+/\d+/(\d+)') - except: - try: - year = scrapertools.find_single_match(data, - '
    .*?Año
    .*?(\d\d\d\d)') - except: - try: - year = scrapertools.find_single_match(data, - '(.*?)h="ID.*?.*?TV Series') - else: - urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % (title_imdb.replace(' ', '+'), year) - data = browser(urlbing_imdb) - data = re.sub(r"\n|\r|\t|\s{2}| |http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data) - subdata_imdb = scrapertools.find_single_match(data, '
  • (.*?)h="ID.*?') - try: - imdb_id = scrapertools.get_match(subdata_imdb, '(.*?)h="ID.*?.*?TV Series') - else: - urlbing_imdb = "http://www.bing.com/search?q=%s+%s+site:imdb.com" % ( - title_imdb.replace(' ', '+'), year) - data = browser(urlbing_imdb) - data = re.sub(r"\n|\r|\t|\s{2}| |http://ssl-proxy.my-addr.org/myaddrproxy.php/", "", data) - subdata_imdb = scrapertools.find_single_match(data, '
  • (.*?)h="ID.*?') - try: - imdb_id = scrapertools.get_match(subdata_imdb, '= 5: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[3] - fanart_4 = imagenes[4] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 4: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[3] - fanart_4 = imagenes[1] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 3: - fanart_info = imagenes[1] - fanart_2 = imagenes[2] - fanart_3 = imagenes[1] - fanart_4 = imagenes[0] - if fanart == item.fanart: - fanart = fanart_info - elif len(imagenes) == 2: - fanart_info = imagenes[1] - fanart_2 = imagenes[0] - fanart_3 = imagenes[1] - fanart_4 = imagenes[1] - if fanart == item.fanart: - fanart = fanart_info - else: - fanart_info = fanart - fanart_2 = fanart - fanart_3 = fanart - fanart_4 = fanart - images_fanarttv = fanartv(item, id_tvdb, id) - if item.contentType != "movie": - url = item.url + "/episodios" - action = "findvideos_series" - if images_fanarttv: - try: - thumbnail_art = images_fanarttv.get("hdtvlogo")[0].get("url") - except: - try: - thumbnail_art = images_fanarttv.get("clearlogo")[0].get("url") - except: - thumbnail_art = posterdb - if images_fanarttv.get("tvbanner"): - tvf = images_fanarttv.get("tvbanner")[0].get("url") - elif images_fanarttv.get("tvthumb"): - tvf = images_fanarttv.get("tvthumb")[0].get("url") - elif images_fanarttv.get("tvposter"): - tvf = images_fanarttv.get("tvposter")[0].get("url") - else: - tvf = posterdb - if images_fanarttv.get("tvthumb"): - thumb_info = images_fanarttv.get("tvthumb")[0].get("url") - else: - thumb_info = thumbnail_art - - if images_fanarttv.get("hdclearart"): - tiw = images_fanarttv.get("hdclearart")[0].get("url") - elif images_fanarttv.get("characterart"): - tiw = images_fanarttv.get("characterart")[0].get("url") - elif images_fanarttv.get("hdtvlogo"): - tiw = images_fanarttv.get("hdtvlogo")[0].get("url") - else: - tiw = "" - else: - tiw = "" - tvf = thumbnail_info = thumbnail_art = posterdb - else: - url = item.url - action = "findvideos" - if images_fanarttv: - if images_fanarttv.get("hdmovielogo"): - thumbnail_art = images_fanarttv.get("hdmovielogo")[0].get("url") - elif images_fanarttv.get("moviethumb"): - thumbnail_art = images_fanarttv.get("moviethumb")[0].get("url") - elif images_fanarttv.get("moviebanner"): - thumbnail_art = images_fanarttv.get("moviebanner")[0].get("url") - else: - thumbnail_art = posterdb - if images_fanarttv.get("moviedisc"): - tvf = images_fanarttv.get("moviedisc")[0].get("url") - elif images_fanarttv.get("hdmovielogo"): - tvf = images_fanarttv.get("hdmovielogo")[0].get("url") - else: - tvf = posterdb - if images_fanarttv.get("hdmovieclearart"): - tiw = images_fanarttv.get("hdmovieclearart")[0].get("url") - elif images_fanarttv.get("hdmovielogo"): - tiw = images_fanarttv.get("hdmovielogo")[0].get("url") - else: - tiw = "" - else: - tiw = "" - tvf = thumbnail_art = posterdb - extra = str(fanart_2) + "|" + str(fanart_3) + "|" + str(fanart_4) + "|" + str(id) + "|" + str(tvf) + "|" + str( - id_tvdb) + "|" + str(tiw) + "|" + str(rating) + "|" + tipo_ps - itemlist.append( - Item(channel=item.channel, title=item.title, url=url, action=action, thumbnail=thumbnail_art, fanart=fanart, - extra=extra, contentType=item.contentType, fulltitle=fulltitle, folder=True)) - title_info = "[COLOR powderblue][B]Info[/B][/COLOR]" - extra = str(rating) + "|" + str(rating_filma) + "|" + str(id) + "|" + str(item.title) + "|" + str( - id_tvdb) + "|" + str(tagline) + "|" + str(sinopsis) + "|" + str(critica) + "|" + str(thumbnail_art) + "|" + str( - fanart_4) - itemlist.append(Item(channel=item.channel, action="info", title=title_info, url=item.url, thumbnail=posterdb, - fanart=fanart_info, extra=extra, contentType=item.contentType, folder=False)) return itemlist def findvideos_series(item): logger.info() itemlist = [] - fanart = "" check_temp = [] - data = httptools.downloadpage(item.url).data - if item.contentType != "movie": - itmdb = tmdb.Tmdb(id_Tmdb=item.extra.split("|")[3], tipo=item.extra.split("|")[8]) - season = itmdb.result.get("seasons") - check = "no" - try: - temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)Temporada') - except: - if "no se agregaron" in data: - temp = bloque_enlaces = "" - else: - temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)
    ') - if temp != "": - thumbnail = "" - if season: - for detail in season: - if str(detail["season_number"]) == temp: - if detail["poster_path"]: - thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"] - images_fanarttv = fanartv(item, item.extra.split("|")[5], item.extra.split("|")[3]) - if images_fanarttv: - season_f = images_fanarttv.get("showbackground") - if season_f: - for detail in season_f: - if str(detail["season"]) == temp: - if detail["url"]: - fanart = detail["url"] - if fanart == "": - fanart = item.extra.split("|")[0] - if thumbnail == "": - thumbnail = item.thumbnail - itemlist.append(Item(channel=item.channel, - title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + temp + "[/COLOR]", - url="", action="", thumbnail=thumbnail, fanart=fanart, extra="", - contentType=item.contentType, folder=False)) - capitulos = scrapertools.find_multiple_matches(bloque_enlaces, 'href="([^"]+)".*?Episodio (\d+) - ([^<]+)') - for url, epi, title in capitulos: - if epi == "1": - if epi in str(check_temp): - temp = int(temp) + 1 - thumbnail = "" - if season: - for detail in season: - if detail["season_number"] == temp: - if detail["poster_path"]: - thumbnail = "https://image.tmdb.org/t/p/original" + detail["poster_path"] - images_fanarttv = fanartv(item, item.extra.split("|")[5], item.extra.split("|")[3]) - if images_fanarttv: - season_f = images_fanarttv.get("showbackground") - if season_f: - for detail in season_f: - if detail["season"] == temp: - if detail["url"]: - fanart = detail["url"] - if fanart == "": - fanart = item.extra.split("|")[0] - if thumbnail == "": - thumbnail = item.thumbnail - itemlist.append(Item(channel=item.channel, - title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + str( - temp) + "[/COLOR]", url="", action="", thumbnail=thumbnail, fanart=fanart, - extra="", contentType=item.contentType, folder=False)) - check_temp.append([epi]) - itemlist.append(Item(channel=item.channel, - title=" [COLOR cyan]Episodio[/COLOR] " + "[COLOR darkcyan]" + epi + "[/COLOR]" + " - " + "[COLOR cadetblue]" + title + "[/COLOR]", - url=url, action="findvideos", thumbnail=item.extra.split("|")[4], - fanart=item.extra.split("|")[0], extra="", contentType=item.contentType, folder=True)) - title_info = " Info" - title_info = "[COLOR steelblue]" + title_info + "[/COLOR]" - itemlist.append(Item(channel=item.channel, action="info_capitulos", title=title_info, url=item.url, - thumbnail=item.extra.split("|")[6], fanart=item.extra.split("|")[1], - extra=item.extra + "|" + str(temp) + "|" + epi, folder=False)) - + data = httptools.downloadpage(item.url + "/episodios").data + try: + temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)Temporada') + except: + if "no se agregaron" in data: + temp = bloque_enlaces = "" + else: + temp, bloque_enlaces = scrapertools.find_single_match(data, 'Temporada (\d+)(.*?)
    ') + if temp != "": + item.infoLabels["season"] = temp + itemlist.append(item.clone(title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + temp + "[/COLOR]", + folder=False)) + capitulos = scrapertools.find_multiple_matches(bloque_enlaces, 'href="([^"]+)".*?Episodio (\d+) - ([^<]+)') + for url, epi, title in capitulos: + if epi == "1": + if epi in str(check_temp): + temp = int(temp) + 1 + item.infoLabels["season"] = temp + item.infoLabels["episode"] = 0 + itemlist.append(item.clone(title="[COLOR darkturquoise]Temporada[/COLOR] " + "[COLOR beige]" + str( + temp) + "[/COLOR]", folder=False + )) + check_temp.append([epi]) + item.infoLabels["season"] = temp + item.infoLabels["episode"] = epi + itemlist.append(item.clone(title=" [COLOR cyan]Episodio[/COLOR] " + "[COLOR darkcyan]" + epi + "[/COLOR]" + " - " + "[COLOR cadetblue]" + title + "[/COLOR]", + url=url, action="findvideos", thumbnail="", + extra="", contentType=item.contentType, folder=True)) + tmdb.set_infoLabels(itemlist) return itemlist @@ -584,9 +197,7 @@ def findvideos(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - if item.extra != "dd" and item.extra != "descarga": - if item.contentType != "movie": bloque_links = scrapertools.find_single_match(data, '
    (.*?)<\/i>Selecciona un') if bloque_links == "": @@ -595,30 +206,29 @@ def findvideos(item): bloque_links = scrapertools.find_single_match(data, '
    (.*?)<\/i>Descargar') if bloque_links == "": bloque_links = scrapertools.find_single_match(data, '
    (.*?)
    ') - links = scrapertools.find_multiple_matches(bloque_links, - '([^<]+)<.*?src="([^"]+)">([^<]+).*?([^<]+)') + patron = 'Descargar(.*?)
    ') links_dd = scrapertools.find_multiple_matches(bloque_dd, @@ -637,7 +247,7 @@ def findvideos(item): idioma = IDIOMAS.get(idioma) else: idioma = "[COLOR brown]" + idioma + "[/COLOR]" - url = "http://peliculasgratis.biz/goto/" + url = host + "/goto/" data_post = urllib.urlencode({'id': id}) server_name = scrapertools.get_match(server, '(.*?)\.').strip() icon_server = os.path.join(config.get_runtime_path(), "resources", "images", "servers", @@ -649,10 +259,10 @@ def findvideos(item): extra = "descarga" itemlist.append( item.clone(title="[COLOR floralwhite][B]" + server + "[/B][/COLOR] " + calidad + " " + idioma, url=url, - action="play", thumbnail=icon_server, fanart="", contentType=item.contentType, id=data_post)) - + action="play", thumbnail=icon_server, id=data_post)) + if item.infoLabels["year"]: + tmdb.set_infoLabels(itemlist) if item.contentType == "movie" and item.extra != "descarga" and item.extra != "online": - if config.get_videolibrary_support() and len(itemlist) > 0: itemlist.append(Item(channel=item.channel, title="Añadir película a la videoteca", action="add_pelicula_to_library", url=item.url, text_color="green", @@ -665,445 +275,15 @@ def findvideos(item): itemlist.append(item.clone(title="[COLOR aqua][B]Ver enlaces Descarga[/B][/COLOR] ", action="findvideos", thumbnail=thumb, fanart="", contentType=item.contentType, bloque_dd=bloque_dd, extra="dd")) - return itemlist def play(item): itemlist = [] - data = httptools.downloadpage(item.url, post=item.id, ).data - enlaces = scrapertools.find_single_match(data, '= 5 and int(check_rat_tmdba) < 8: - rating = "[COLOR springgreen][B]" + rating_tmdba_tvdb + "[/B][/COLOR]" - elif int(check_rat_tmdba) >= 8 or rating_tmdba_tvdb == 10: - rating = "[COLOR yellow][B]" + rating_tmdba_tvdb + "[/B][/COLOR]" - else: - rating = "[COLOR crimson][B]" + rating_tmdba_tvdb + "[/B][/COLOR]" - print "lolaymaue" - except: - rating = "[COLOR crimson][B]" + rating_tmdba_tvdb + "[/B][/COLOR]" - if "10." in rating: - rating = re.sub(r'10\.\d+', '10', rating) - try: - check_rat_filma = scrapertools.get_match(rating_filma, '(\d)') - print "paco" - print check_rat_filma - if int(check_rat_filma) >= 5 and int(check_rat_filma) < 8: - print "dios" - print check_rat_filma - rating_filma = "[COLOR springgreen][B]" + rating_filma + "[/B][/COLOR]" - elif int(check_rat_filma) >= 8: - - print check_rat_filma - rating_filma = "[COLOR yellow][B]" + rating_filma + "[/B][/COLOR]" - else: - rating_filma = "[COLOR crimson][B]" + rating_filma + "[/B][/COLOR]" - print "rojo??" - print check_rat_filma - except: - rating_filma = "[COLOR crimson][B]" + rating_filma + "[/B][/COLOR]" - plot = item.extra.split("|")[6] - plot = "[COLOR moccasin][B]" + plot + "[/B][/COLOR]" - plot = re.sub(r"\\|
    ", "", plot) - if item.extra.split("|")[5] != "": - tagline = item.extra.split("|")[5] - if tagline == "\"\"": - tagline = " " - tagline = "[COLOR aquamarine][B]" + tagline + "[/B][/COLOR]" - else: - tagline = "" - if item.contentType != "movie": - icon = "http://s6.postimg.org/hzcjag975/tvdb.png" - else: - icon = "http://imgur.com/SenkyxF.png" - - foto = item.extra.split("|")[9] - if not "tmdb" in foto: - foto = "" - if item.extra.split("|")[7] != "": - critica = item.extra.split("|")[7] - else: - critica = "Esta serie no tiene críticas..." - - photo = item.extra.split("|")[8].replace(" ", "%20") - if ".jpg" in photo: - photo = "" - # Tambien te puede interesar - peliculas = [] - if item.contentType != "movie": - url_tpi = "http://api.themoviedb.org/3/tv/" + item.extra.split("|")[ - 2] + "/recommendations?api_key=" + api_key + "&language=es" - data_tpi = httptools.downloadpage(url_tpi).data - tpi = scrapertools.find_multiple_matches(data_tpi, - 'id":(.*?),.*?"original_name":"(.*?)",.*?"poster_path":(.*?),"popularity"') - else: - url_tpi = "http://api.themoviedb.org/3/movie/" + item.extra.split("|")[ - 2] + "/recommendations?api_key=" + api_key + "&language=es" - data_tpi = httptools.downloadpage(url_tpi).data - tpi = scrapertools.find_multiple_matches(data_tpi, - 'id":(.*?),.*?"original_title":"(.*?)",.*?"poster_path":(.*?),"popularity"') - - for idp, peli, thumb in tpi: - - thumb = re.sub(r'"|}', '', thumb) - if "null" in thumb: - thumb = "http://s6.postimg.org/tw1vhymj5/noposter.png" - else: - thumb = "https://image.tmdb.org/t/p/original" + thumb - peliculas.append([idp, peli, thumb]) - - extra = "" + "|" + item.extra.split("|")[2] + "|" + item.extra.split("|")[2] + "|" + item.extra.split("|")[ - 6] + "|" + "" - infoLabels = {'title': title, 'plot': plot, 'thumbnail': photo, 'fanart': foto, 'tagline': tagline, - 'rating': rating} - item_info = item.clone(info=infoLabels, icon=icon, extra=extra, rating=rating, rating_filma=rating_filma, - critica=critica, contentType=item.contentType, thumb_busqueda="http://imgur.com/Q0BTHyO.png") - from channels import infoplus - infoplus.start(item_info, peliculas) - - -def info_capitulos(item, images={}): - logger.info() - url = "https://api.themoviedb.org/3/tv/" + item.extra.split("|")[3] + "/season/" + item.extra.split("|")[ - 9] + "/episode/" + item.extra.split("|")[10] + "?api_key=" + api_key + "&language=es" - if "/0" in url: - url = url.replace("/0", "/") - from core import jsontools - data = jsontools.load(scrapertools.downloadpage(url)) - foto = item.extra.split("|")[6] - if not ".png" in foto: - foto = "http://imgur.com/Q0BTHyO.png" - if data: - if data.get("name"): - title = data.get("name") - else: - title = "" - title = "[COLOR aqua][B]" + title + "[/B][/COLOR]" - if data.get("still_path"): - image = "https://image.tmdb.org/t/p/original" + data.get("still_path") - else: - image = "http://imgur.com/ZiEAVOD.png" - if data.get("overview"): - plot = data.get("overview") - else: - plot = "Sin informacion del capítulo aún..." - plot = "[COLOR honeydew][B]" + plot + "[/B][/COLOR]" - if data.get("vote_average"): - rating = data.get("vote_average") - else: - rating = 0 - try: - - if rating >= 5 and rating < 8: - rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR springgreen][B]" + str(rating) + "[/B][/COLOR]" - elif rating >= 8 and rating < 10: - rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR yellow][B]" + str(rating) + "[/B][/COLOR]" - elif rating == 10: - rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR orangered][B]" + str(rating) + "[/B][/COLOR]" - else: - rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR crimson][B]" + str(rating) + "[/B][/COLOR]" - except: - rating = "[COLOR yellow]Puntuación[/COLOR] " + "[COLOR crimson][B]" + str(rating) + "[/B][/COLOR]" - if "10." in rating: - rating = re.sub(r'10\.\d+', '10', rating) - - - else: - - title = "[COLOR red][B]LO SENTIMOS...[/B][/COLOR]" - plot = "Este capitulo no tiene informacion..." - plot = "[COLOR yellow][B]" + plot + "[/B][/COLOR]" - image = "http://s6.postimg.org/ub7pb76c1/noinfo.png" - foto = "http://s6.postimg.org/nm3gk1xox/noinfosup2.png" - rating = "" - - ventana = TextBox2(title=title, plot=plot, thumbnail=image, fanart=foto, rating=rating) - ventana.doModal() - - -class TextBox2(xbmcgui.WindowDialog): - """ Create a skinned textbox window """ - - def __init__(self, *args, **kwargs): - self.getTitle = kwargs.get('title') - self.getPlot = kwargs.get('plot') - self.getThumbnail = kwargs.get('thumbnail') - self.getFanart = kwargs.get('fanart') - self.getRating = kwargs.get('rating') - - self.background = xbmcgui.ControlImage(70, 20, 1150, 630, 'http://imgur.com/oWUdNFg.jpg') - self.title = xbmcgui.ControlTextBox(120, 60, 430, 50) - self.rating = xbmcgui.ControlTextBox(145, 112, 1030, 45) - self.plot = xbmcgui.ControlTextBox(120, 150, 1056, 100) - self.thumbnail = xbmcgui.ControlImage(120, 300, 1056, 300, self.getThumbnail) - self.fanart = xbmcgui.ControlImage(780, 43, 390, 100, self.getFanart) - - self.addControl(self.background) - self.background.setAnimations( - [('conditional', 'effect=slide start=1000% end=0% time=1500 condition=true tween=bounce',), - ('WindowClose', 'effect=slide delay=800 start=0% end=1000% time=800 condition=true',)]) - self.addControl(self.thumbnail) - self.thumbnail.setAnimations([('conditional', - 'effect=zoom start=0% end=100% delay=2700 time=1500 condition=true tween=elastic easing=inout',), - ('WindowClose', 'effect=slide end=0,700% time=300 condition=true',)]) - self.addControl(self.plot) - self.plot.setAnimations( - [('conditional', 'effect=zoom delay=2000 center=auto start=0 end=100 time=800 condition=true ',), ( - 'conditional', - 'effect=rotate delay=2000 center=auto aceleration=6000 start=0% end=360% time=800 condition=true',), - ('WindowClose', 'effect=zoom center=auto start=100% end=-0% time=600 condition=true',)]) - self.addControl(self.fanart) - self.fanart.setAnimations( - [('WindowOpen', 'effect=slide start=0,-700 delay=1000 time=2500 tween=bounce condition=true',), ( - 'conditional', - 'effect=rotate center=auto start=0% end=360% delay=3000 time=2500 tween=bounce condition=true',), - ('WindowClose', 'effect=slide end=0,-700% time=1000 condition=true',)]) - self.addControl(self.title) - self.title.setText(self.getTitle) - self.title.setAnimations( - [('conditional', 'effect=slide start=-1500% end=0% delay=1000 time=2000 condition=true tween=elastic',), - ('WindowClose', 'effect=slide start=0% end=-1500% time=800 condition=true',)]) - self.addControl(self.rating) - self.rating.setText(self.getRating) - self.rating.setAnimations( - [('conditional', 'effect=fade start=0% end=100% delay=3000 time=1500 condition=true',), - ('WindowClose', 'effect=slide end=0,-700% time=600 condition=true',)]) - xbmc.sleep(200) - - try: - self.plot.autoScroll(7000, 6000, 30000) - except: - - xbmc.executebuiltin( - 'Notification([COLOR red][B]Actualiza Kodi a su última versión[/B][/COLOR], [COLOR skyblue]para mejor info[/COLOR],8000,"https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kodi-icon.png")') - self.plot.setText(self.getPlot) - - def get(self): - self.show() - - def onAction(self, action): - if action == ACTION_PREVIOUS_MENU or action.getId() == ACTION_GESTURE_SWIPE_LEFT or action == 110 or action == 92: - self.close() - - -def test(): - return True - - -def tokenize(text, match=re.compile("([idel])|(\d+):|(-?\d+)").match): - i = 0 - while i < len(text): - m = match(text, i) - s = m.group(m.lastindex) - i = m.end() - if m.lastindex == 2: - yield "s" - yield text[i:i + int(s)] - i = i + int(s) - else: - yield s - - -def decode_item(next, token): - if token == "i": - # integer: "i" value "e" - data = int(next()) - if next() != "e": - raise ValueError - elif token == "s": - # string: "s" value (virtual tokens) - data = next() - elif token == "l" or token == "d": - # container: "l" (or "d") values "e" - data = [] - tok = next() - while tok != "e": - data.append(decode_item(next, tok)) - tok = next() - if token == "d": - data = dict(zip(data[0::2], data[1::2])) - else: - raise ValueError - return data - - -def decode(text): - try: - src = tokenize(text) - data = decode_item(src.next, src.next()) - for token in src: # look for more tokens - raise SyntaxError("trailing junk") - except (AttributeError, ValueError, StopIteration): - try: - data = data - except: - data = src - - return data - - -def convert_size(size): - import math - if (size == 0): - return '0B' - size_name = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB") - i = int(math.floor(math.log(size, 1024))) - p = math.pow(1024, i) - s = round(size / p, 2) - return '%s %s' % (s, size_name[i]) - - -def fanartv(item, id_tvdb, id, images={}): - headers = [['Content-Type', 'application/json']] - from core import jsontools - if item.contentType == "movie": - url = "http://webservice.fanart.tv/v3/movies/%s?api_key=cab16e262d72fea6a6843d679aa10300" \ - % id - else: - url = "http://webservice.fanart.tv/v3/tv/%s?api_key=cab16e262d72fea6a6843d679aa10300" % id_tvdb - try: - data = jsontools.load(scrapertools.downloadpage(url, headers=headers)) - if data and not "error message" in data: - for key, value in data.items(): - if key not in ["name", "tmdb_id", "imdb_id", "thetvdb_id"]: - images[key] = value - else: - images = [] - - except: - images = [] - return images - - -def filmaffinity(item, infoLabels): - title = infoLabels["title"].replace(" ", "+") - try: - year = infoLabels["year"] - except: - year = "" - sinopsis = infoLabels["sinopsis"] - - if year == "": - if item.contentType != "movie": - tipo = "serie" - url_bing = "http://www.bing.com/search?q=%s+Serie+de+tv+site:filmaffinity.com" % title - else: - tipo = "película" - url_bing = "http://www.bing.com/search?q=%s+site:filmaffinity.com" % title - try: - data = browser(url_bing) - data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - if "myaddrproxy.php" in data: - subdata_bing = scrapertools.get_match(data, - 'li class="b_algo">

    (

    (\s*

    (

    ((.*?)') - sinopsis_f = sinopsis_f.replace("

    ", "\n") - sinopsis_f = re.sub(r"\(FILMAFFINITY\)
    ", "", sinopsis_f) - try: - year_f = scrapertools.get_match(data, '
    Año
    .*?>(\d+)') - except: - year_f = "" - try: - rating_filma = scrapertools.get_match(data, 'itemprop="ratingValue" content="(.*?)">') - except: - rating_filma = "Sin puntuacion" - critica = "" - patron = '
    (.*?)
    .*?itemprop="author">(.*?)\s*(.*?)Popeye el marino     - patron = ']+>([^<]+)' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedtitle in matches: - title = scrapedtitle.strip() - url = urlparse.urljoin(item.url, scrapedurl) - thumbnail = "" - plot = "" - logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") - - itemlist.append( - Item(channel=item.channel, action="episodios", title=title, url=url, thumbnail=thumbnail, plot=plot, - fanart=item.fanart)) - - next_page_url = scrapertools.find_single_match(data, '') - if next_page_url != "": - itemlist.append(Item(channel=item.channel, action="episodios", title=">> Página siguiente", - url=urlparse.urljoin(item.url, next_page_url), folder=True, - fanart=item.fanart)) - - return itemlist - - -def episodios(item): - logger.info() - - ''' -
  • -
    -

    Caillou ratón de biblioteca

    -

    Caillou volvía con su hermanita Rosi y su mamá de la biblioteca y traían un montón de libros que Caillou quería leer, especialmente uno de piratas. Capítulo titulado "Caillou ratón de biblioteca".

    -
    -
    - Categoría: - Caillou -
    -
    -
    - 0.5 - 1 - 1.5 - 2 - 2.5 - 3 - 3.5 - 4 - 4.5 - 5 -
    -
    -
    - -
    -
    - - Caillou ratón de biblioteca - -

    Caillou ratón de biblioteca

    -
    -
    • - ''' - - # Descarga la pagina - data = scrapertools.cache_page(item.url) - patron = '
    ') - if next_page_url != "": - itemlist.append(Item(channel=item.channel, action="episodios", title=">> Página siguiente", - url=urlparse.urljoin(item.url, next_page_url), folder=True, - fanart=item.fanart)) - - return itemlist diff --git a/plugin.video.alfa/channels/side_menu.py b/plugin.video.alfa/channels/side_menu.py new file mode 100644 index 00000000..cdba529e --- /dev/null +++ b/plugin.video.alfa/channels/side_menu.py @@ -0,0 +1,341 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------ + +import os +from core.item import Item +from core import jsontools +from platformcode import config, logger +from platformcode import launcher +import xbmc, xbmcgui, xbmcplugin, xbmcaddon + +media_path = os.path.join(config.get_runtime_path(), "resources/skins/Default/media/side_menu/") +menu_settings_path = os.path.join(config.get_data_path(), "settings_channels", 'menu_settings_data.json') + +if os.path.exists(menu_settings_path): + menu_node = jsontools.get_node_from_file('menu_setting_data.json', 'menu') +else: + menu_node = {'categoria actual':config.get_setting('category')} + jsontools.update_node(menu_node, 'menu_settings_data.json', "menu") + + + +ACTION_SHOW_FULLSCREEN = 36 +ACTION_GESTURE_SWIPE_LEFT = 511 +ACTION_SELECT_ITEM = 7 +ACTION_PREVIOUS_MENU = 10 +ACTION_MOVE_LEFT = 1 +ACTION_MOVE_RIGHT = 2 +ACTION_MOVE_DOWN = 4 +ACTION_MOVE_UP = 3 + +def set_menu_settings(item): + if os.path.exists(menu_settings_path): + menu_node = jsontools.get_node_from_file('menu_settings_data.json', 'menu') + else: + menu_node = {} + menu_node['categoria actual'] = item.extra + + jsontools.update_node(menu_node, 'menu_settings_data.json', "menu") + +def check_user_home(item): + logger.info() + if os.path.exists(menu_settings_path): + menu_node = jsontools.get_node_from_file('menu_settings_data.json', 'menu') + if 'user_home' in menu_node: + item = Item().fromurl(menu_node['user_home']) + else: + item = Item(channel="channelselector", action="getmainlist", viewmode="movie") + from platformcode import platformtools + undefined_start = platformtools.dialog_ok('Inicio Personalizado', 'No has definido ninguna seccion para mostrar ' + 'en tu inicio', 'Utiliza el menu contextual para definir una') + return item + +def set_custom_start(item): + logger.info() + if os.path.exists(menu_settings_path): + menu_node = jsontools.get_node_from_file('menu_settings_data.json', 'menu') + else: + menu_node={} + parent_item= Item().fromurl(item.parent) + parent_item.start=True + config.set_setting("custom_start",True) + if config.get_setting("news_start"): + config.set_setting("news_start", False) + menu_node['user_home']=parent_item.tourl() + jsontools.update_node(menu_node, 'menu_settings_data.json', "menu") + +def get_start_page(): + logger.info() + + category = config.get_setting('category').lower() + custom_start= config.get_setting("custom_start") + #if category != 'definido': + if custom_start == False: + item = Item(channel="news", action="novedades", extra=category, mode='silent') + else: + from channels import side_menu + item = Item() + item = side_menu.check_user_home(item) + return item + + + +def open_menu(item): + main = Main('side_menu.xml', config.get_runtime_path()) + main.doModal() + del main + + +class Main(xbmcgui.WindowXMLDialog): + def __init__(self, *args, **kwargs): + self.items = [] + + def onInit(self): + self.setCoordinateResolution(2) + self.focus = -1 + self.buttons = [] + posx= 0 + posy= 145 + space = 30 + + selected = 'selected.png' + width = 260 + height = 30 + textcolor = "0xffffd700" + conditional_textcolor = "0xffff3030" + shadow = "0xFF000000" + offsetx = 30 + offsety = 0 + font = 'font25_title' + + if config.get_setting('start_page'): + label = 'Inicio' + self.button_start = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_start) + self.buttons.append(self.button_start) + + posy += space * 2 + label = 'Menú Clasico' + self.button_alfa = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path+selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_alfa) + self.buttons.append(self.button_alfa) + + + posy += space + label = 'Configuracion' + self.button_config = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_config) + self.buttons.append(self.button_config) + posy += space*2 + label = 'Peliculas' + self.button_peliculas = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_peliculas) + self.buttons.append(self.button_peliculas) + posy += space + label = 'Series' + self.button_series = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_series) + self.buttons.append(self.button_series) + posy += space + label = 'Anime' + self.button_anime = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path+selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_anime) + self.buttons.append(self.button_anime) + posy += space + label = 'Infantiles' + self.button_infantil = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_infantil) + self.buttons.append(self.button_infantil) + posy += space + label = 'Documentales' + self.button_docu = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path + selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_docu) + self.buttons.append(self.button_docu) + posy += space + + label = 'Terror' + self.button_terror = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_terror) + self.buttons.append(self.button_terror) + + posy += space + label = 'Latino' + self.button_lat = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path+selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_lat) + self.buttons.append(self.button_lat) + posy += space + label = 'Castellano' + self.button_cast = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_cast) + self.buttons.append(self.button_cast) + posy += space + label = 'Torrents' + self.button_torrent = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_torrent) + self.buttons.append(self.button_torrent) + + start_page_item = get_start_page() + if config.get_setting('start_page') and start_page_item.channel =='news': + posy += space + label = 'Canales Activos' + self.button_config = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, noFocusTexture='', + focusTexture=media_path+selected, textColor=conditional_textcolor, + shadowColor=shadow, textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_config) + self.buttons.append(self.button_config) + + posy += space*2 + label = 'Buscar' + self.button_buscar = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_buscar) + self.buttons.append(self.button_buscar) + posy += space + label = 'Buscar Actor' + self.button_actor = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=textcolor, shadowColor=shadow, textOffsetX=offsetx, + textOffsetY=offsety) + self.addControl(self.button_actor) + self.buttons.append(self.button_actor) + + posy += space + label = 'Donde Buscar' + self.button_config_search = xbmcgui.ControlButton(posx, posy, width, height, label, font=font, + alignment=0x00000000, + noFocusTexture='', focusTexture=media_path + selected, + textColor=conditional_textcolor, shadowColor=shadow, + textOffsetX=offsetx, textOffsetY=offsety) + self.addControl(self.button_config_search) + self.buttons.append(self.button_config_search) + + + label='' + self.button_close = xbmcgui.ControlButton(260, 0, 1020, 725, label, noFocusTexture='', focusTexture='') + self.addControl(self.button_close) + + + + def onClick(self, control): + new_item='' + + control = self.getControl(control).getLabel() + + if control == 'Inicio': + new_item = get_start_page() + elif control == u'Menú Clasico': + new_item = Item(channel='', action='getmainlist', title='Menú Alfa') + elif control == 'Configuracion': + new_item = Item(channel='setting', action="settings") + elif control == 'Peliculas': + new_item = Item(channel='news', action="novedades", extra="peliculas", mode='silent') + elif control == 'Series': + new_item = Item(channel='news', action="novedades", extra="series", mode='silent') + elif control == 'Anime': + new_item = Item(channel='news', action="novedades", extra="anime", mode='silent') + elif control == 'Infantiles': + new_item = Item(channel='news', action="novedades", extra="infantiles", mode='silent') + elif control == 'Documentales': + new_item = Item(channel='news', action="novedades", extra="documentales", mode='silent') + elif control == 'Terror': + new_item = Item(channel='news', action="novedades", extra="terror", mode='silent') + elif control == 'Castellano': + new_item = Item(channel='news', action="novedades", extra="castellano", mode='silent') + elif control == 'Latino': + new_item = Item(channel='news', action="novedades", extra="latino", mode='silent') + elif control == 'Torrents': + new_item = Item(channel='news', action="novedades", extra="torrent", mode='silent') + elif control == 'Canales Activos': + menu_node = jsontools.get_node_from_file('menu_settings_data.json', 'menu') + if 'categoria actual' in menu_node: + category = menu_node['categoria actual'] + new_item = Item(channel='news', action="setting_channel", extra=category, menu=True) + elif control == 'Buscar': + new_item = Item(channel='search', action="search") + elif control == 'Buscar Actor': + new_item = Item(channel='tvmoviedb', title="Buscar actor/actriz", action="search_", + search={'url': 'search/person', 'language': 'es', 'page': 1}, star=True) + elif control == 'Donde Buscar': + new_item = Item(channel='search', action="setting_channel") + elif control == '': + self.close() + if new_item !='': + self.run_action(new_item) + + + def onAction(self, action): + + + if action == ACTION_PREVIOUS_MENU or action == ACTION_GESTURE_SWIPE_LEFT or action == 110 or action == 92: + self.close() + + if action == ACTION_MOVE_RIGHT or action == ACTION_MOVE_DOWN: + self.focus += 1 + if self.focus > len(self.buttons)-1: + self.focus = 0 + while True: + id_focus = str(self.buttons[self.focus].getId()) + + if xbmc.getCondVisibility('[Control.IsVisible(' + id_focus + ')]'): + self.setFocus(self.buttons[self.focus]) + break + self.focus += 1 + + if action == ACTION_MOVE_LEFT or action == ACTION_MOVE_UP: + self.focus -= 1 + if self.focus < 0: + self.focus = len(self.buttons) - 1 + while True: + id_focus = str(self.buttons[self.focus].getId()) + if xbmc.getCondVisibility('[Control.IsVisible(' + id_focus + ')]'): + self.setFocus(self.buttons[self.focus]) + break + self.focus -= 1 + + def run_action(self, item): + logger.info() + if item.menu != True: + self.close() + xbmc.executebuiltin("Container.update(%s)"%launcher.run(item)) + + + diff --git a/plugin.video.alfa/channels/unsoloclic.json b/plugin.video.alfa/channels/unsoloclic.json deleted file mode 100755 index 54877b68..00000000 --- a/plugin.video.alfa/channels/unsoloclic.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "unsoloclic", - "name": "Unsoloclic", - "active": true, - "adult": false, - "language": ["cast", "lat"], - "banner": "unsoloclic.png", - "thumbnail": "unsoloclic.png", - "categories": [ - "movie", - "tvshow" - ] -} \ No newline at end of file diff --git a/plugin.video.alfa/channels/unsoloclic.py b/plugin.video.alfa/channels/unsoloclic.py deleted file mode 100755 index a6cf396f..00000000 --- a/plugin.video.alfa/channels/unsoloclic.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- - -import re -import urlparse - -from core import scrapertools -from core.item import Item -from platformcode import logger - - -def mainlist(item): - logger.info() - item.url = "http://unsoloclic.info" - return novedades(item) - - -def novedades(item): - logger.info() - itemlist = [] - - # Descarga la página - data = scrapertools.cachePage(item.url) - ''' -
    -

    Pelicula Ek Tha Tiger (2012) BLU-RAY 720p HD

    -
    noviembre 5th, 2012 - -
    -
    -

    -

    -
    - Seguir Leyendo -
    -
    -
    - ''' - ''' -
    -

    The Giant Mechanical Man (2012) BluRay 720p HD

    -
    diciembre 24th, 2012 - -
    -
    -

    -

    -

    - Seguir Leyendo -
    -
    -
    - ''' - patron = '
    [^<]+' - patron += '

    ([^<]+)

    [^<]+' - patron += '
    .*?
    [^<]+' - patron += '
    [^<]+' - patron += '« Peliculas anteriores - ''' - patron = '\«\; Peliculas anteriores' - matches = re.compile(patron, re.DOTALL).findall(data) - - for match in matches: - scrapedtitle = ">> Página siguiente" - scrapedplot = "" - scrapedurl = urlparse.urljoin(item.url, match) - scrapedthumbnail = "" - logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]") - itemlist.append(Item(channel=item.channel, action="novedades", title=scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True)) - - return itemlist - - -def findvideos(item): - logger.info() - data = scrapertools.cache_page(item.url) - itemlist = [] - - #

    - #

    - patron = ']+>>[/COLOR]": itemlist.pop() # Se captura la excepción, para no interrumpir al canal novedades si un canal falla diff --git a/plugin.video.alfa/core/jsontools.py b/plugin.video.alfa/core/jsontools.py index 74edfb25..8727ea9a 100755 --- a/plugin.video.alfa/core/jsontools.py +++ b/plugin.video.alfa/core/jsontools.py @@ -104,7 +104,7 @@ def get_node_from_file(name_file, node, path=None): if node in dict_data: dict_node = dict_data[node] - logger.debug("dict_node: %s" % dict_node) + #logger.debug("dict_node: %s" % dict_node) return dict_node diff --git a/plugin.video.alfa/platformcode/launcher.py b/plugin.video.alfa/platformcode/launcher.py old mode 100755 new mode 100644 index 18ca763d..513576c8 --- a/plugin.video.alfa/platformcode/launcher.py +++ b/plugin.video.alfa/platformcode/launcher.py @@ -14,6 +14,8 @@ from core import videolibrarytools from core.item import Item from platformcode import config, logger from platformcode import platformtools +from channelselector import get_thumb + def start(): @@ -37,8 +39,18 @@ def run(item=None): # If no item, this is mainlist else: - item = Item(channel="channelselector", action="getmainlist", viewmode="movie") + if config.get_setting("start_page"): + if not config.get_setting("custom_start"): + category = config.get_setting("category").lower() + item = Item(channel="news", action="novedades", extra=category, mode = 'silent') + else: + from channels import side_menu + item= Item() + item = side_menu.check_user_home(item) + item.start = True; + else: + item = Item(channel="channelselector", action="getmainlist", viewmode="movie") logger.info(item.tostring()) try: @@ -264,6 +276,11 @@ def run(item=None): else: logger.info("Executing channel '%s' method" % item.action) itemlist = getattr(channel, item.action)(item) + # if item.start: + # menu_icon = get_thumb('menu.png') + # menu = Item(channel="channelselector", action="getmainlist", viewmode="movie", thumbnail=menu_icon, + # title='Menu') + # itemlist.insert(0, menu) platformtools.render_items(itemlist, item) except urllib2.URLError, e: diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py index a170a20f..a5b88b8a 100644 --- a/plugin.video.alfa/platformcode/platformtools.py +++ b/plugin.video.alfa/platformcode/platformtools.py @@ -18,6 +18,7 @@ import xbmcgui import xbmcplugin from core.item import Item from platformcode import logger +from channelselector import get_thumb def dialog_ok(heading, line1, line2="", line3=""): @@ -95,15 +96,21 @@ def render_items(itemlist, parent_item): """ # Si el itemlist no es un list salimos if not type(itemlist) == list: + return + if parent_item.start: + menu_icon = get_thumb('menu.png') + menu = Item(channel="channelselector", action="getmainlist", viewmode="movie", thumbnail=menu_icon, + title='Menu') + itemlist.insert(0, menu) + # Si no hay ningun item, mostramos un aviso if not len(itemlist): itemlist.append(Item(title="No hay elementos que mostrar")) # Recorremos el itemlist for item in itemlist: - # logger.debug(item) # Si el item no contiene categoria, le ponemos la del item padre if item.category == "": item.category = parent_item.category @@ -181,7 +188,6 @@ def render_items(itemlist, parent_item): if config.get_setting("forceview"): # ...forzamos segun el viewcontent xbmcplugin.setContent(int(sys.argv[1]), parent_item.viewcontent) - # logger.debug(parent_item) elif parent_item.channel not in ["channelselector", ""]: # ... o segun el canal xbmcplugin.setContent(int(sys.argv[1]), "movies") @@ -199,9 +205,12 @@ def render_items(itemlist, parent_item): if config.get_setting("forceview"): viewmode_id = get_viewmode_id(parent_item) xbmc.executebuiltin("Container.SetViewMode(%s)" % viewmode_id) + if parent_item.mode in ['silent', 'get_cached', 'set_cache','finish']: + xbmc.executebuiltin("Container.SetViewMode(500)") def get_viewmode_id(parent_item): + # viewmode_json habria q guardarlo en un archivo y crear un metodo para q el user fije sus preferencias en: # user_files, user_movies, user_tvshows, user_season y user_episodes. viewmode_json = {'skin.confluence': {'default_files': 50, @@ -393,7 +402,6 @@ def set_context_commands(item, parent_item): (sys.argv[0], item.clone(channel="favorites", action="addFavourite", from_channel=item.channel, from_action=item.action).tourl()))) - #Buscar en otros canales if item.contentType in ['movie','tvshow']and item.channel != 'search': # Buscar en otros canales @@ -406,8 +414,16 @@ def set_context_commands(item, parent_item): item.clone(channel='search', action="do_search", from_channel=item.channel, - contextual=True).tourl()))) + contextual=True).tourl()))) + #Definir como Pagina de inicio + if config.get_setting('start_page'): + if item.action not in ['findvideos', 'play']: + context_commands.insert(0, ("[COLOR 0xffccff00]Definir como pagina de inicio[/COLOR]", + "XBMC.RunPlugin(%s?%s)" % ( + sys.argv[0], Item(channel='side_menu', + action="set_custom_start", + parent=item.tourl()).tourl()))) if item.channel != "videolibrary": # Añadir Serie a la videoteca @@ -468,7 +484,19 @@ def set_context_commands(item, parent_item): context_commands.append(("Super Favourites Menu", "XBMC.RunScript(special://home/addons/plugin.program.super.favourites/LaunchSFMenu.py)")) - return sorted(context_commands, key=lambda comand: comand[0]) + + + context_commands = sorted(context_commands, key=lambda comand: comand[0]) + # Menu Rapido + context_commands.insert(0,("[COLOR 0xffccff00][/COLOR]", + "XBMC.Container.Update (%s?%s)" % (sys.argv[0], Item(channel='side_menu', + action="open_menu", + parent=parent_item.tourl()).tourl( + + )))) + return context_commands + + def is_playing(): diff --git a/plugin.video.alfa/resources/media/themes/default/thumb_menu.png b/plugin.video.alfa/resources/media/themes/default/thumb_menu.png new file mode 100644 index 00000000..ded1a5bc Binary files /dev/null and b/plugin.video.alfa/resources/media/themes/default/thumb_menu.png differ diff --git a/plugin.video.alfa/resources/media/themes/default/thumb_more.png b/plugin.video.alfa/resources/media/themes/default/thumb_more.png new file mode 100644 index 00000000..fbd690e2 Binary files /dev/null and b/plugin.video.alfa/resources/media/themes/default/thumb_more.png differ diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml old mode 100755 new mode 100644 index 1c4c8225..3026412d --- a/plugin.video.alfa/resources/settings.xml +++ b/plugin.video.alfa/resources/settings.xml @@ -37,6 +37,16 @@ + + + + + + diff --git a/plugin.video.alfa/resources/skins/Default/720p/side_menu.xml b/plugin.video.alfa/resources/skins/Default/720p/side_menu.xml new file mode 100644 index 00000000..3b3803f5 --- /dev/null +++ b/plugin.video.alfa/resources/skins/Default/720p/side_menu.xml @@ -0,0 +1,27 @@ + + + + 0 + 0 + + 1 + + + + + + 0 + 0 + 260 + 725 + side_menu/bg.png + + + 25 + 30 + 200 + 70 + side_menu/logo.png + + + \ No newline at end of file diff --git a/plugin.video.alfa/resources/skins/Default/media/side_menu/bg.png b/plugin.video.alfa/resources/skins/Default/media/side_menu/bg.png new file mode 100644 index 00000000..3e0df58f Binary files /dev/null and b/plugin.video.alfa/resources/skins/Default/media/side_menu/bg.png differ diff --git a/plugin.video.alfa/resources/skins/Default/media/side_menu/logo.png b/plugin.video.alfa/resources/skins/Default/media/side_menu/logo.png new file mode 100644 index 00000000..d17f20f8 Binary files /dev/null and b/plugin.video.alfa/resources/skins/Default/media/side_menu/logo.png differ diff --git a/plugin.video.alfa/resources/skins/Default/media/side_menu/selected.png b/plugin.video.alfa/resources/skins/Default/media/side_menu/selected.png new file mode 100644 index 00000000..82314752 Binary files /dev/null and b/plugin.video.alfa/resources/skins/Default/media/side_menu/selected.png differ diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py index 69b16631..cb325d53 100644 --- a/plugin.video.alfa/servers/flashx.py +++ b/plugin.video.alfa/servers/flashx.py @@ -31,13 +31,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= 'Accept-Language': 'en-US,en;q=0.5', 'Accept-Encoding': 'gzip, deflate, br', 'Connection': 'keep-alive', 'Upgrade-Insecure-Requests': '1', 'Cookie': ''} - data = httptools.downloadpage(page_url, headers=headers, replace_headers=True).data + data = httptools.downloadpage(page_url, cookies=False).data data = data.replace("\n","") cgi_counter = scrapertools.find_single_match(data, """(?is)src=.(https://www.flashx.tv/counter.cgi.*?[^(?:'|")]+)""") cgi_counter = cgi_counter.replace("%0A","").replace("%22","") playnow = scrapertools.find_single_match(data, 'https://www.flashx.tv/dl[^"]+') # Para obtener el f y el fxfx - js_fxfx = "https://www." + scrapertools.find_single_match(data.replace("//","/"), """(?is)(flashx.tv/jss/coder.js.*?[^(?:'|")]+)""") + js_fxfx = "https://www." + scrapertools.find_single_match(data.replace("//","/"), """(?is)(flashx.tv/js\w+/c\w+.*?[^(?:'|")]+)""") data_fxfx = httptools.downloadpage(js_fxfx).data mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","") matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)') @@ -63,8 +63,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= headers['X-Requested-With'] = 'XMLHttpRequest' # Obligatorio descargar estos 2 archivos, porque si no, muestra error - httptools.downloadpage(coding_url, headers=headers, replace_headers=True) - httptools.downloadpage(cgi_counter, headers=headers, replace_headers=True) + httptools.downloadpage(coding_url, cookies=False) + httptools.downloadpage(cgi_counter, cookies=False) try: time.sleep(int(wait_time) + 1) @@ -73,7 +73,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= headers.pop('X-Requested-With') headers['Content-Type'] = 'application/x-www-form-urlencoded' - data = httptools.downloadpage(playnow, post, headers, replace_headers=True).data + data = httptools.downloadpage(playnow, post).data # Si salta aviso, se carga la pagina de comprobacion y luego la inicial # LICENSE GPL3, de alfa-addon: https://github.com/alfa-addon/ ES OBLIGATORIO AÑADIR ESTAS LÍNEAS @@ -81,7 +81,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= url_reload = scrapertools.find_single_match(data, 'try to reload the page.*?href="([^"]+)"') try: data = httptools.downloadpage(url_reload, cookies=False).data - data = httptools.downloadpage(playnow, post, headers, replace_headers=True).data + data = httptools.downloadpage(playnow, post, cookies=False).data # LICENSE GPL3, de alfa-addon: https://github.com/alfa-addon/ ES OBLIGATORIO AÑADIR ESTAS LÍNEAS except: pass @@ -92,15 +92,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= try: match = jsunpack.unpack(match) match = match.replace("\\'", "'") - - # {src:\'https://bigcdn.flashx1.tv/cdn25/5k7xmlcjfuvvjuw5lx6jnu2vt7gw4ab43yvy7gmkvhnocksv44krbtawabta/normal.mp4\',type:\'video/mp4\',label:\'SD\',res:360}, media_urls = scrapertools.find_multiple_matches(match, "{src:'([^']+)'.*?,label:'([^']+)'") subtitle = "" for media_url, label in media_urls: if media_url.endswith(".srt") and label == "Spanish": try: from core import filetools - data = scrapertools.downloadpage(media_url) + data = httptools.downloadpage(media_url) subtitle = os.path.join(config.get_data_path(), 'sub_flashx.srt') filetools.write(subtitle, data) except: diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py index cd7a1307..cbb32783 100755 --- a/plugin.video.alfa/servers/gamovideo.py +++ b/plugin.video.alfa/servers/gamovideo.py @@ -18,7 +18,8 @@ def test_video_exists(page_url): return False, "[Gamovideo] El archivo no existe o ha sido borrado" if "Video is processing now" in data: return False, "[Gamovideo] El video está procesándose en estos momentos. Inténtelo mas tarde." - + if "File is awaiting for moderation" in data: + return False, "[Gamovideo] El video está esperando por moderación." return True, "" diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index ba350a9f..cfb6f977 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -1 +1 @@ -import base64;exec base64.b64decode('# -*- coding: utf-8 -*-

import re

from core import httptools
from core import scrapertools
from lib import jsunpack
#from platformcode import logger

headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']]
host = "http://powvideo.net/"


def test_video_exists(page_url):
    #logger.info("(page_url='%s')" % page_url)
    return True, ""


def get_video_url(page_url, premium=False, user="", password="", video_password=""):
    #logger.info("(page_url='%s')" % page_url)

    referer = page_url.replace('iframe', 'preview')
    data = httptools.downloadpage(page_url, headers={'referer': referer}).data

    _0xa3e8 = scrapertools.find_single_match(data, 'var _0xf475=(\[[^;]+\]);')
    #logger.info("Intel11 %s" %_0xa3e8)
    #logger.info("Intel22 %s" %data)
    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
    unpacked = jsunpack.unpack(packed)

    video_urls = []

    url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
    video_urls.append([".mp4" + " [powvideo]", S(_0xa3e8).decode(url)])

    video_urls.sort(key=lambda x: x[0], reverse=True)
    return video_urls


class S:
    def __init__(self, _0xa3e8):
        self.r = None
        self.s = None
        self.k = None
        self.n = None
        self.c = None
        self.b = None
        self.d = None

        _0xa3e8 = eval(_0xa3e8)
        self.t(_0xa3e8[14] + _0xa3e8[15] + _0xa3e8[14] + _0xa3e8[15], _0xa3e8[16])

    def decode(self, url):
        _hash = re.compile('[A-z0-9_-]{40,}', re.DOTALL).findall(url)[0]
        return url.replace(_hash, self.p(_hash))

    def t(self, t, i):
        self.r = 20
        self.s = [1634760805, 857760878, 2036477234, 1797285236]
        self.k = []
        self.n = [0, 0]
        self.c = [0, 0]
        self.b = [None] * 64
        self.d = 64

        self.sk(self.sa(t))
        self.sn(self.sa(i))

    def e(self, t):
        s = self.gb(len(t))
        i = [s[h] ^ t[h] for h in range(len(t))]
        return i

    def p(self, t):
        import base64
        t += "=" * (4 - len(t) % 4)
        t = base64.b64decode(t.replace('-', '+').replace('_', '/'))
        return self._as(self.e(self.sa(t)))

    @staticmethod
    def sa(t):
        s = [ord(t[i]) for i in range(len(t))]
        return s

    @staticmethod
    def _as(t):
        s = [chr(t[i]) for i in range(len(t))]
        return ''.join(s)

    def sk(self, t):
        s = 0
        for i in range(8):
            self.k.append(
                255 & t[s] | self.lshift((255 & t[s + 1]), 8) | self.lshift((255 & t[s + 2]), 16) | self.lshift(
                    (255 & t[s + 3]), 24))
            s += 4
        self._r()

    def sn(self, t):
        self.n[0] = 255 & t[0] | self.lshift((255 & t[1]), 8) | self.lshift((255 & t[2]), 16) | self.lshift(
            (255 & t[3]), 24)
        self.n[1] = 255 & t[4] | self.lshift((255 & t[5]), 8) | self.lshift((255 & t[6]), 16) | self.lshift(
            (255 & t[7]), 24)
        self._r()

    def gb(self, t):
        i = [None] * t

        for s in range(t):
            if 64 == self.d:
                self._g()
                self._i()
                self.d = 0

            i[s] = self.b[self.d]
            self.d += 1

        return i

    def gh(self, t):
        i = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f']
        h = self.gb(t)
        s = [i[self.rshift(h[b], 4) & 15] for b in range(len(h))]
        s.append(i[15 & h[len(h)]])
        return ''.join(s)

    def _r(self):
        self.c[0] = 0
        self.c[1] = 0
        self.d = 64

    def _i(self):
        self.c[0] = self.c[0] + 1 & 4294967295
        if 0 == self.c[0]:
            self.c[1] = self.c[1] + 1 & 4294967295

    def _g(self):
        i = self.s[0]
        s = self.k[0]
        h = self.k[1]
        b = self.k[2]
        r = self.k[3]
        n = self.s[1]
        o = self.n[0]
        e = self.n[1]
        c = self.c[0]
        p = self.c[1]
        a = self.s[2]
        f = self.k[4]
        u = self.k[5]
        g = self.k[6]
        y = self.k[7]
        k = self.s[3]
        l = i
        d = s
        v = h
        _ = b
        A = r
        w = n
        C = o
        S = e
        j = c
        m = p
        q = a
        x = f
        z = u
        B = g
        D = y
        E = k

        for F in range(0, self.r, 2):
            # 0
            t = l + z
            A ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = A + l
            j ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = j + A
            z ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = z + j
            l ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 1
            t = w + d
            m ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = m + w
            B ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = B + m
            d ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = d + B
            w ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 2
            t = q + C
            D ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = D + q
            v ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = v + D
            C ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = C + v
            q ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 3
            t = E + x
            _ ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = _ + E
            S ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = S + _
            x ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = x + S
            E ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 4
            t = l + _
            d ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = d + l
            v ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = v + d
            _ ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = _ + v
            l ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 5
            t = w + A
            C ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = C + w
            S ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = S + C
            A ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = A + S
            w ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 6
            t = q + m
            x ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = x + q
            j ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = j + x
            m ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = m + j
            q ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 7
            t = E + D
            z ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = z + E
            B ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = B + z
            D ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = D + B
            E ^= self.lshift(t, 18) | self.bshift(t, 14)

        l += i
        d += s
        v += h
        _ += b
        A += r
        w += n
        C += o
        S += e
        j += c
        m += p
        q += a
        x += f
        z += u
        B += g
        D += y
        E += k

        self.b[0] = self.bshift(l, 0) & 255
        self.b[1] = self.bshift(l, 8) & 255
        self.b[2] = self.bshift(l, 16) & 255
        self.b[3] = self.bshift(l, 24) & 255
        self.b[4] = self.bshift(d, 0) & 255
        self.b[5] = self.bshift(d, 8) & 255
        self.b[6] = self.bshift(d, 16) & 255
        self.b[7] = self.bshift(d, 24) & 255
        self.b[8] = self.bshift(v, 0) & 255
        self.b[9] = self.bshift(v, 8) & 255
        self.b[10] = self.bshift(v, 16) & 255
        self.b[11] = self.bshift(v, 24) & 255
        self.b[12] = self.bshift(_, 0) & 255
        self.b[13] = self.bshift(_, 8) & 255
        self.b[14] = self.bshift(_, 16) & 255
        self.b[15] = self.bshift(_, 24) & 255
        self.b[16] = self.bshift(A, 0) & 255
        self.b[17] = self.bshift(A, 8) & 255
        self.b[18] = self.bshift(A, 16) & 255
        self.b[19] = self.bshift(A, 24) & 255
        self.b[20] = self.bshift(w, 0) & 255
        self.b[21] = self.bshift(w, 8) & 255
        self.b[22] = self.bshift(w, 16) & 255
        self.b[23] = self.bshift(w, 24) & 255
        self.b[24] = self.bshift(C, 0) & 255
        self.b[25] = self.bshift(C, 8) & 255
        self.b[26] = self.bshift(C, 16) & 255
        self.b[27] = self.bshift(C, 24) & 255
        self.b[28] = self.bshift(S, 0) & 255
        self.b[29] = self.bshift(S, 8) & 255
        self.b[30] = self.bshift(S, 16) & 255
        self.b[31] = self.bshift(S, 24) & 255
        self.b[32] = self.bshift(j, 0) & 255
        self.b[33] = self.bshift(j, 8) & 255
        self.b[34] = self.bshift(j, 16) & 255
        self.b[35] = self.bshift(j, 24) & 255
        self.b[36] = self.bshift(m, 0) & 255
        self.b[37] = self.bshift(m, 8) & 255
        self.b[38] = self.bshift(m, 16) & 255
        self.b[39] = self.bshift(m, 24) & 255
        self.b[40] = self.bshift(q, 0) & 255
        self.b[41] = self.bshift(q, 8) & 255
        self.b[42] = self.bshift(q, 16) & 255
        self.b[43] = self.bshift(q, 24) & 255
        self.b[44] = self.bshift(x, 0) & 255
        self.b[45] = self.bshift(x, 8) & 255
        self.b[46] = self.bshift(x, 16) & 255
        self.b[47] = self.bshift(x, 24) & 255
        self.b[48] = self.bshift(z, 0) & 255
        self.b[49] = self.bshift(z, 8) & 255
        self.b[50] = self.bshift(z, 16) & 255
        self.b[51] = self.bshift(z, 24) & 255
        self.b[52] = self.bshift(B, 0) & 255
        self.b[53] = self.bshift(B, 8) & 255
        self.b[54] = self.bshift(B, 16) & 255
        self.b[55] = self.bshift(B, 24) & 255
        self.b[56] = self.bshift(D, 0) & 255
        self.b[57] = self.bshift(D, 8) & 255
        self.b[58] = self.bshift(D, 16) & 255
        self.b[59] = self.bshift(D, 24) & 255
        self.b[60] = self.bshift(E, 0) & 255
        self.b[61] = self.bshift(E, 8) & 255
        self.b[62] = self.bshift(E, 16) & 255
        self.b[63] = self.bshift(E, 24) & 255

    def lshift(self, num, other):
        lnum = self.ToInt32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToInt32(lnum << shift_count)

    def rshift(self, num, other):
        lnum = self.ToInt32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToInt32(lnum >> shift_count)

    def bshift(self, num, other):
        lnum = self.ToUint32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToUint32(lnum >> shift_count)

    @staticmethod
    def ToInt32(num):
        int32 = num % 2 ** 32
        return int32 - 2 ** 32 if int32 >= 2 ** 31 else int32

    @staticmethod
    def ToUint32(num):
        return num % 2 ** 32
') +import base64;exec base64.b64decode('# -*- coding: utf-8 -*-

import re

from core import httptools
from core import scrapertools
from lib import jsunpack
#from platformcode import logger

headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']]
host = "http://powvideo.net/"


def test_video_exists(page_url):
    referer = page_url.replace('iframe', 'preview')
    data = httptools.downloadpage(page_url, headers={'referer': referer}).data
    if data == "File was deleted":
        return False, "[powvideo] El video ha sido borrado"
    return True, ""


def get_video_url(page_url, premium=False, user="", password="", video_password=""):
    #logger.info("(page_url='%s')" % page_url)

    referer = page_url.replace('iframe', 'preview')
    data = httptools.downloadpage(page_url, headers={'referer': referer}).data

    _0xa3e8 = scrapertools.find_single_match(data, 'var _0xf475=(\[[^;]+\]);')
    #logger.info("Intel11 %s" %_0xa3e8)
    #logger.info("Intel22 %s" %data)
    packed = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
    unpacked = jsunpack.unpack(packed)

    video_urls = []

    url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'")
    video_urls.append([".mp4" + " [powvideo]", S(_0xa3e8).decode(url)])

    video_urls.sort(key=lambda x: x[0], reverse=True)
    return video_urls


class S:
    def __init__(self, _0xa3e8):
        self.r = None
        self.s = None
        self.k = None
        self.n = None
        self.c = None
        self.b = None
        self.d = None

        _0xa3e8 = eval(_0xa3e8)
        self.t(_0xa3e8[14] + _0xa3e8[15] + _0xa3e8[14] + _0xa3e8[15], _0xa3e8[16])

    def decode(self, url):
        _hash = re.compile('[A-z0-9_-]{40,}', re.DOTALL).findall(url)[0]
        return url.replace(_hash, self.p(_hash))

    def t(self, t, i):
        self.r = 20
        self.s = [1634760805, 857760878, 2036477234, 1797285236]
        self.k = []
        self.n = [0, 0]
        self.c = [0, 0]
        self.b = [None] * 64
        self.d = 64

        self.sk(self.sa(t))
        self.sn(self.sa(i))

    def e(self, t):
        s = self.gb(len(t))
        i = [s[h] ^ t[h] for h in range(len(t))]
        return i

    def p(self, t):
        import base64
        t += "=" * (4 - len(t) % 4)
        t = base64.b64decode(t.replace('-', '+').replace('_', '/'))
        return self._as(self.e(self.sa(t)))

    @staticmethod
    def sa(t):
        s = [ord(t[i]) for i in range(len(t))]
        return s

    @staticmethod
    def _as(t):
        s = [chr(t[i]) for i in range(len(t))]
        return ''.join(s)

    def sk(self, t):
        s = 0
        for i in range(8):
            self.k.append(
                255 & t[s] | self.lshift((255 & t[s + 1]), 8) | self.lshift((255 & t[s + 2]), 16) | self.lshift(
                    (255 & t[s + 3]), 24))
            s += 4
        self._r()

    def sn(self, t):
        self.n[0] = 255 & t[0] | self.lshift((255 & t[1]), 8) | self.lshift((255 & t[2]), 16) | self.lshift(
            (255 & t[3]), 24)
        self.n[1] = 255 & t[4] | self.lshift((255 & t[5]), 8) | self.lshift((255 & t[6]), 16) | self.lshift(
            (255 & t[7]), 24)
        self._r()

    def gb(self, t):
        i = [None] * t

        for s in range(t):
            if 64 == self.d:
                self._g()
                self._i()
                self.d = 0

            i[s] = self.b[self.d]
            self.d += 1

        return i

    def gh(self, t):
        i = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f']
        h = self.gb(t)
        s = [i[self.rshift(h[b], 4) & 15] for b in range(len(h))]
        s.append(i[15 & h[len(h)]])
        return ''.join(s)

    def _r(self):
        self.c[0] = 0
        self.c[1] = 0
        self.d = 64

    def _i(self):
        self.c[0] = self.c[0] + 1 & 4294967295
        if 0 == self.c[0]:
            self.c[1] = self.c[1] + 1 & 4294967295

    def _g(self):
        i = self.s[0]
        s = self.k[0]
        h = self.k[1]
        b = self.k[2]
        r = self.k[3]
        n = self.s[1]
        o = self.n[0]
        e = self.n[1]
        c = self.c[0]
        p = self.c[1]
        a = self.s[2]
        f = self.k[4]
        u = self.k[5]
        g = self.k[6]
        y = self.k[7]
        k = self.s[3]
        l = i
        d = s
        v = h
        _ = b
        A = r
        w = n
        C = o
        S = e
        j = c
        m = p
        q = a
        x = f
        z = u
        B = g
        D = y
        E = k

        for F in range(0, self.r, 2):
            # 0
            t = l + z
            A ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = A + l
            j ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = j + A
            z ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = z + j
            l ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 1
            t = w + d
            m ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = m + w
            B ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = B + m
            d ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = d + B
            w ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 2
            t = q + C
            D ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = D + q
            v ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = v + D
            C ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = C + v
            q ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 3
            t = E + x
            _ ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = _ + E
            S ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = S + _
            x ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = x + S
            E ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 4
            t = l + _
            d ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = d + l
            v ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = v + d
            _ ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = _ + v
            l ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 5
            t = w + A
            C ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = C + w
            S ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = S + C
            A ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = A + S
            w ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 6
            t = q + m
            x ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = x + q
            j ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = j + x
            m ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = m + j
            q ^= self.lshift(t, 18) | self.bshift(t, 14)

            # 7
            t = E + D
            z ^= self.lshift(t, 7) | self.bshift(t, 25)
            t = z + E
            B ^= self.lshift(t, 9) | self.bshift(t, 23)
            t = B + z
            D ^= self.lshift(t, 13) | self.bshift(t, 19)
            t = D + B
            E ^= self.lshift(t, 18) | self.bshift(t, 14)

        l += i
        d += s
        v += h
        _ += b
        A += r
        w += n
        C += o
        S += e
        j += c
        m += p
        q += a
        x += f
        z += u
        B += g
        D += y
        E += k

        self.b[0] = self.bshift(l, 0) & 255
        self.b[1] = self.bshift(l, 8) & 255
        self.b[2] = self.bshift(l, 16) & 255
        self.b[3] = self.bshift(l, 24) & 255
        self.b[4] = self.bshift(d, 0) & 255
        self.b[5] = self.bshift(d, 8) & 255
        self.b[6] = self.bshift(d, 16) & 255
        self.b[7] = self.bshift(d, 24) & 255
        self.b[8] = self.bshift(v, 0) & 255
        self.b[9] = self.bshift(v, 8) & 255
        self.b[10] = self.bshift(v, 16) & 255
        self.b[11] = self.bshift(v, 24) & 255
        self.b[12] = self.bshift(_, 0) & 255
        self.b[13] = self.bshift(_, 8) & 255
        self.b[14] = self.bshift(_, 16) & 255
        self.b[15] = self.bshift(_, 24) & 255
        self.b[16] = self.bshift(A, 0) & 255
        self.b[17] = self.bshift(A, 8) & 255
        self.b[18] = self.bshift(A, 16) & 255
        self.b[19] = self.bshift(A, 24) & 255
        self.b[20] = self.bshift(w, 0) & 255
        self.b[21] = self.bshift(w, 8) & 255
        self.b[22] = self.bshift(w, 16) & 255
        self.b[23] = self.bshift(w, 24) & 255
        self.b[24] = self.bshift(C, 0) & 255
        self.b[25] = self.bshift(C, 8) & 255
        self.b[26] = self.bshift(C, 16) & 255
        self.b[27] = self.bshift(C, 24) & 255
        self.b[28] = self.bshift(S, 0) & 255
        self.b[29] = self.bshift(S, 8) & 255
        self.b[30] = self.bshift(S, 16) & 255
        self.b[31] = self.bshift(S, 24) & 255
        self.b[32] = self.bshift(j, 0) & 255
        self.b[33] = self.bshift(j, 8) & 255
        self.b[34] = self.bshift(j, 16) & 255
        self.b[35] = self.bshift(j, 24) & 255
        self.b[36] = self.bshift(m, 0) & 255
        self.b[37] = self.bshift(m, 8) & 255
        self.b[38] = self.bshift(m, 16) & 255
        self.b[39] = self.bshift(m, 24) & 255
        self.b[40] = self.bshift(q, 0) & 255
        self.b[41] = self.bshift(q, 8) & 255
        self.b[42] = self.bshift(q, 16) & 255
        self.b[43] = self.bshift(q, 24) & 255
        self.b[44] = self.bshift(x, 0) & 255
        self.b[45] = self.bshift(x, 8) & 255
        self.b[46] = self.bshift(x, 16) & 255
        self.b[47] = self.bshift(x, 24) & 255
        self.b[48] = self.bshift(z, 0) & 255
        self.b[49] = self.bshift(z, 8) & 255
        self.b[50] = self.bshift(z, 16) & 255
        self.b[51] = self.bshift(z, 24) & 255
        self.b[52] = self.bshift(B, 0) & 255
        self.b[53] = self.bshift(B, 8) & 255
        self.b[54] = self.bshift(B, 16) & 255
        self.b[55] = self.bshift(B, 24) & 255
        self.b[56] = self.bshift(D, 0) & 255
        self.b[57] = self.bshift(D, 8) & 255
        self.b[58] = self.bshift(D, 16) & 255
        self.b[59] = self.bshift(D, 24) & 255
        self.b[60] = self.bshift(E, 0) & 255
        self.b[61] = self.bshift(E, 8) & 255
        self.b[62] = self.bshift(E, 16) & 255
        self.b[63] = self.bshift(E, 24) & 255

    def lshift(self, num, other):
        lnum = self.ToInt32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToInt32(lnum << shift_count)

    def rshift(self, num, other):
        lnum = self.ToInt32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToInt32(lnum >> shift_count)

    def bshift(self, num, other):
        lnum = self.ToUint32(num)
        rnum = self.ToUint32(other)
        shift_count = rnum & 0x1F
        return self.ToUint32(lnum >> shift_count)

    @staticmethod
    def ToInt32(num):
        int32 = num % 2 ** 32
        return int32 - 2 ** 32 if int32 >= 2 ** 31 else int32

    @staticmethod
    def ToUint32(num):
        return num % 2 ** 32
') diff --git a/plugin.video.alfa/servers/streamixcloud.py b/plugin.video.alfa/servers/streamixcloud.py index bc9d81a5..37664748 100755 --- a/plugin.video.alfa/servers/streamixcloud.py +++ b/plugin.video.alfa/servers/streamixcloud.py @@ -9,7 +9,7 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data - if "Not Found" in data: + if "Not Found" in data or "File was deleted" in data: return False, "[streamixcloud] El archivo no existe o ha sido borrado" if "Video is processing" in data: return False, "[streamixcloud] El video se está procesando, inténtelo mas tarde" diff --git a/plugin.video.alfa/servers/uptobox.py b/plugin.video.alfa/servers/uptobox.py index d563ca52..43d90807 100755 --- a/plugin.video.alfa/servers/uptobox.py +++ b/plugin.video.alfa/servers/uptobox.py @@ -14,7 +14,7 @@ def test_video_exists(page_url): if "Streaming link:" in data: return True, "" - elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data: + elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data or "This stream doesn" in data: return False, "[Uptobox] El archivo no existe o ha sido borrado" wait = scrapertools.find_single_match(data, "You have to wait ([0-9]+) (minute|second)") if len(wait) > 0: @@ -40,7 +40,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= # Si el archivo tiene enlace de streaming se redirige a upstream if "Streaming link:" in data: page_url = "http://uptostream.com/iframe/" + scrapertools.find_single_match(page_url, - 'uptobox.com/([a-z0-9]+)') + 'uptobox.com/([a-z0-9]+)') data = httptools.downloadpage(page_url).data video_urls = uptostream(data) else: @@ -56,17 +56,27 @@ def uptostream(data): subtitle = scrapertools.find_single_match(data, "kind='subtitles' src='//([^']+)'") if subtitle: subtitle = "http://" + subtitle - video_urls = [] - patron = "