From 5ad0f99f4268079f581c574abd03b38d08226441 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 19 May 2018 15:42:28 -0300 Subject: [PATCH 01/15] explora --- plugin.video.alfa/channels/search.py | 121 +++++++++++++++++++++++- plugin.video.alfa/core/tmdb.py | 111 ++++++++++++++++++++++ plugin.video.alfa/platformcode/unify.py | 22 ++++- 3 files changed, 250 insertions(+), 4 deletions(-) mode change 100755 => 100644 plugin.video.alfa/core/tmdb.py diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py index d0bbf80d..34f98475 100644 --- a/plugin.video.alfa/channels/search.py +++ b/plugin.video.alfa/channels/search.py @@ -11,12 +11,73 @@ from core import channeltools from core.item import Item from platformcode import config, logger from platformcode import platformtools +from core import tmdb + +link_list = [] +max_links = 30 def mainlist(item): logger.info() item.channel = "search" + itemlist = [] + context = [{"title": "Elegir canales incluidos", "action": "setting_channel", "channel": item.channel}] + itemlist.append(Item(channel=item.channel, action="sub_menu", title="Buscar en canales", context=context, + thumbnail=get_thumb("search.png"))) + + itemlist.append(Item(channel=item.channel, action='genres_menu', title='Películas por Generos', type='movie')) + + itemlist.append (Item(channel=item.channel, action='discover_list', title='Películas mas populares', + context=context, + search_type='list', list_type='movie/popular')) + + itemlist.append(Item(channel=item.channel, action='discover_list', title='Películas mejor valoradas', + context=context, + search_type='list', list_type='movie/top_rated')) + + itemlist.append( + Item(channel=item.channel, action='discover_list', title='Películas Ahora en cines', context=context, + search_type='list', + list_type='movie/now_playing')) + + itemlist.append(Item(channel=item.channel, action='genres_menu', title='Series por Generos', type='tv')) + + itemlist.append( + Item(channel=item.channel, action='discover_list', title='Series mas populares', context=context, + search_type='list',list_type='tv/popular')) + + itemlist.append(Item(channel=item.channel, action='discover_list', title='Series en emisión', context=context, + search_type='list', list_type='tv/on_the_air')) + + + itemlist.append(Item(channel=item.channel, action='discover_list', title='Series mejor valoradas', context=context, + search_type='list', list_type='tv/top_rated')) + + + + + return itemlist + + +def genres_menu(item): + + itemlist = [] + + genres = tmdb.get_genres(item.type) + + logger.debug(genres) + logger.debug(genres[item.type]) + + for key, value in genres[item.type].items(): + itemlist.append(item.clone(title=value, action='discover_list', search_type='discover', + list_type=key, page='1')) + return sorted(itemlist, key=lambda it: it.title) + +def sub_menu(item): + logger.info() + item.channel = "search" + itemlist = list() context = [{"title": "Elegir canales incluidos", "action": "setting_channel", @@ -433,7 +494,7 @@ def do_search(item, categories=None): title = channel # resultados agrupados por canales - if item.contextual == True: + if item.contextual == True or item.action == 'search_tmdb': result_mode = 1 if result_mode == 0: if len(search_results[channel]) > 1: @@ -514,3 +575,61 @@ def get_saved_searches(): saved_searches_list = list(current_saved_searches_list) return saved_searches_list + + +def discover_list(item): + itemlist = [] + + itemlist = tmdb.discovery(item) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + if item.search_type=='discover': + next_page = str(int(item.page)+1) + itemlist.append(item.clone(title='Pagina Siguente', page=next_page)) + + return itemlist + +def search_tmdb(item): + logger.debug(item) + + itemlist = [] + threads = [] + logger.debug(item) + wanted = item.contentTitle + + search = do_search(item) + + if item.contentSerieName == '': + results = exact_results(search, wanted) + for result in results: + logger.debug(result) + t = Thread(target=get_links, args=[result]) + t.start() + threads.append(t) + + for thread in threads: + thread.join() + + # try: + # get_links(result) + # except: + # pass + + for link in link_list: + if link.action == 'play' and not 'trailer' in link.title.lower() and len(itemlist) < max_links: + itemlist.append(link) + + return sorted(itemlist, key=lambda it: it.server) + else: + for item in search: + if item.contentSerieName != '' and item.contentSerieName == wanted: + logger.debug(item) + itemlist.append(item) + return itemlist + +def get_links (item): + logger.info() + results =[] + channel = __import__('channels.%s' % item.from_channel, None, None, ["channels.%s" % item.from_channel]) + if len(link_list) <= max_links: + link_list.extend(getattr(channel, item.from_action)(item)) diff --git a/plugin.video.alfa/core/tmdb.py b/plugin.video.alfa/core/tmdb.py old mode 100755 new mode 100644 index 1ba25685..0412b42d --- a/plugin.video.alfa/core/tmdb.py +++ b/plugin.video.alfa/core/tmdb.py @@ -536,6 +536,54 @@ def completar_codigos(item): item.infoLabels['url_scraper'].append(url_scraper) +def discovery(item): + from core.item import Item + from platformcode import unify + + tvshow = False + itemlist = [] + logger.debug(item) + + if item.search_type == 'discover': + listado = Tmdb(discover={'url':'discover/%s' % item.type, 'with_genres':item.list_type, 'language':'es', + 'page':item.page}) + + elif item.search_type == 'list': + listado = Tmdb(list={'url': item.list_type, 'language':'es'}) + + logger.debug(listado.get_list_resultados()) + result = listado.get_list_resultados() + + for elem in result: + elem['tmdb_id']=elem['id'] + if 'title' in elem: + title = unify.normalize(elem['title']).capitalize() + contentTitle = title + elem['year'] = scrapertools.find_single_match(elem['release_date'], '(\d{4})-\d+-\d+') + else: + title = unify.normalize(elem['name']).capitalize() + tvshow = True + + logger.debug(elem) + new_item = Item(channel=item.channel, title=title, infoLabels=elem, action='search_tmdb', extra=title) + + if tvshow: + new_item.contentSerieName = title + else: + new_item.contentTitle = title + + itemlist.append(new_item) + + return itemlist + +def get_genres(type): + lang = 'es' + genres = Tmdb(tipo=type) + + return genres.dic_generos[lang] + + + # Clase auxiliar class ResultDictDefault(dict): # Python 2.4 @@ -762,6 +810,7 @@ class Tmdb(object): self.busqueda_year = kwargs.get('year', '') self.busqueda_filtro = kwargs.get('filtro', {}) self.discover = kwargs.get('discover', {}) + self.list = kwargs.get('list', {}) # Reellenar diccionario de generos si es necesario if (self.busqueda_tipo == 'movie' or self.busqueda_tipo == "tv") and \ @@ -793,6 +842,9 @@ class Tmdb(object): elif self.discover: self.__discover() + elif self.list: + self.__list() + else: logger.debug("Creado objeto vacio") @@ -947,6 +999,65 @@ class Tmdb(object): logger.error(msg) return 0 + def __list(self, index_results=0): + self.result = ResultDictDefault() + results = [] + total_results = 0 + total_pages = 0 + + # Ejemplo self.discover: {'url': 'movie/', 'with_cast': '1'} + # url: Método de la api a ejecutar + # resto de claves: Parámetros de la búsqueda concatenados a la url + type_search = self.list.get('url', '') + if type_search: + params = [] + for key, value in self.list.items(): + if key != "url": + params.append("&"+key + "=" + str(value)) + # http://api.themoviedb.org/3/movie/popolar?api_key=a1ab8b8669da03637a4b98fa39c39228&&language=es + url = ('http://api.themoviedb.org/3/%s?api_key=a1ab8b8669da03637a4b98fa39c39228%s' + % (type_search, ''.join(params))) + + logger.info("[Tmdb.py] Buscando %s:\n%s" % (type_search, url)) + resultado = self.get_json(url) + + total_results = resultado.get("total_results", -1) + total_pages = resultado.get("total_pages", 1) + + if total_results > 0: + results = resultado["results"] + if self.busqueda_filtro and results: + # TODO documentar esta parte + for key, value in dict(self.busqueda_filtro).items(): + for r in results[:]: + if key not in r or r[key] != value: + results.remove(r) + total_results -= 1 + elif total_results == -1: + results = resultado + + if index_results >= len(results): + logger.error( + "La busqueda de '%s' no dio %s resultados" % (type_search, index_results)) + return 0 + + # Retornamos el numero de resultados de esta pagina + if results: + self.results = results + self.total_results = total_results + self.total_pages = total_pages + if total_results > 0: + self.result = ResultDictDefault(self.results[index_results]) + else: + self.result = results + return len(self.results) + else: + # No hay resultados de la busqueda + logger.error("La busqueda de '%s' no dio resultados" % type_search) + return 0 + + + def __discover(self, index_results=0): self.result = ResultDictDefault() results = [] diff --git a/plugin.video.alfa/platformcode/unify.py b/plugin.video.alfa/platformcode/unify.py index 494999af..4b19a6ce 100644 --- a/plugin.video.alfa/platformcode/unify.py +++ b/plugin.video.alfa/platformcode/unify.py @@ -140,6 +140,11 @@ def remove_format(string): #logger.debug('sale de remove: %s' % string) return string +def normalize(string): + string = string.decode('utf-8') + normal = ''.join((c for c in unicodedata.normalize('NFD', unicode(string)) if unicodedata.category(c) != 'Mn')) + return normal + def simplify(string): #logger.info() @@ -148,9 +153,11 @@ def simplify(string): string = string.replace('-',' ').replace('_',' ') string = re.sub(r'\d+','', string) string = string.strip() - string = string.decode('utf-8') - notilde = ''.join((c for c in unicodedata.normalize('NFD', unicode(string)) if unicodedata.category(c) != 'Mn')) - string = notilde.decode() + notilde = normalize(string) + try: + string = notilde.decode() + except: + pass string = string.lower() #logger.debug('sale de simplify: %s' % string) @@ -410,6 +417,15 @@ def title_format(item): if lang: item.title = add_languages(item.title, simple_language) + + # Para las busquedas por canal + if item.from_channel != '': + from core import channeltools + channel_parameters = channeltools.get_channel_parameters(item.from_channel) + logger.debug(channel_parameters) + item.title = '%s [%s]' % (item.title, channel_parameters['title']) + + # Formato para actualizaciones de series en la videoteca sobreescribe los colores anteriores if item.channel=='videolibrary' and item.context!='': From 317007be454372cc20f0e67fa66f3eb2141b7cb4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 19 May 2018 15:53:27 -0300 Subject: [PATCH 02/15] unify en la ultima version --- plugin.video.alfa/platformcode/unify.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/platformcode/unify.py b/plugin.video.alfa/platformcode/unify.py index 4b19a6ce..3c172fd4 100644 --- a/plugin.video.alfa/platformcode/unify.py +++ b/plugin.video.alfa/platformcode/unify.py @@ -145,6 +145,7 @@ def normalize(string): normal = ''.join((c for c in unicodedata.normalize('NFD', unicode(string)) if unicodedata.category(c) != 'Mn')) return normal + def simplify(string): #logger.info() @@ -153,6 +154,7 @@ def simplify(string): string = string.replace('-',' ').replace('_',' ') string = re.sub(r'\d+','', string) string = string.strip() + notilde = normalize(string) try: string = notilde.decode() @@ -417,7 +419,6 @@ def title_format(item): if lang: item.title = add_languages(item.title, simple_language) - # Para las busquedas por canal if item.from_channel != '': from core import channeltools From 33c7d4bf6df4f7c00c90f8780264750260f3cba3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 24 May 2018 09:07:33 -0300 Subject: [PATCH 03/15] Ajustes para la busqueda + buscar similares --- plugin.video.alfa/channels/search.py | 36 +++++++++++++++++-- plugin.video.alfa/core/tmdb.py | 30 +++------------- .../platformcode/platformtools.py | 31 ++++++++++++---- 3 files changed, 62 insertions(+), 35 deletions(-) diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py index 34f98475..cc274fb8 100644 --- a/plugin.video.alfa/channels/search.py +++ b/plugin.video.alfa/channels/search.py @@ -8,6 +8,7 @@ from threading import Thread from channelselector import get_thumb from core import channeltools +from core import scrapertools from core.item import Item from platformcode import config, logger from platformcode import platformtools @@ -578,14 +579,43 @@ def get_saved_searches(): def discover_list(item): + from platformcode import unify itemlist = [] - itemlist = tmdb.discovery(item) + result = tmdb.discovery(item) + + tvshow = False + + logger.debug(item) + + for elem in result: + elem['tmdb_id']=elem['id'] + if 'title' in elem: + title = unify.normalize(elem['title']).capitalize() + elem['year'] = scrapertools.find_single_match(elem['release_date'], '(\d{4})-\d+-\d+') + else: + title = unify.normalize(elem['name']).capitalize() + tvshow = True + + new_item = Item(channel='search', title=title, infoLabels=elem, action='search_tmdb', extra=title, + category='Resultados', context ='') + + if tvshow: + new_item.contentSerieName = title + else: + new_item.contentTitle = title + + itemlist.append(new_item) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - if item.search_type=='discover': + if item.page != '' and len(itemlist)>0: next_page = str(int(item.page)+1) - itemlist.append(item.clone(title='Pagina Siguente', page=next_page)) + #if not 'similar' in item.list_type: + # itemlist.append(item.clone(title='Pagina Siguente', page=next_page)) + #else: + itemlist.append(Item(channel=item.channel, action='discover_list', title='Pagina Siguente', + search_type=item.search_type, list_type=item.list_type, type=item.type, page=next_page)) return itemlist diff --git a/plugin.video.alfa/core/tmdb.py b/plugin.video.alfa/core/tmdb.py index 0412b42d..d58936c6 100644 --- a/plugin.video.alfa/core/tmdb.py +++ b/plugin.video.alfa/core/tmdb.py @@ -540,41 +540,19 @@ def discovery(item): from core.item import Item from platformcode import unify - tvshow = False - itemlist = [] - logger.debug(item) - if item.search_type == 'discover': listado = Tmdb(discover={'url':'discover/%s' % item.type, 'with_genres':item.list_type, 'language':'es', 'page':item.page}) elif item.search_type == 'list': - listado = Tmdb(list={'url': item.list_type, 'language':'es'}) + if item.page == '': + item.page = '1' + listado = Tmdb(list={'url': item.list_type, 'language':'es', 'page':item.page}) logger.debug(listado.get_list_resultados()) result = listado.get_list_resultados() - for elem in result: - elem['tmdb_id']=elem['id'] - if 'title' in elem: - title = unify.normalize(elem['title']).capitalize() - contentTitle = title - elem['year'] = scrapertools.find_single_match(elem['release_date'], '(\d{4})-\d+-\d+') - else: - title = unify.normalize(elem['name']).capitalize() - tvshow = True - - logger.debug(elem) - new_item = Item(channel=item.channel, title=title, infoLabels=elem, action='search_tmdb', extra=title) - - if tvshow: - new_item.contentSerieName = title - else: - new_item.contentTitle = title - - itemlist.append(new_item) - - return itemlist + return result def get_genres(type): lang = 'es' diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py index 7c934e31..701ae750 100644 --- a/plugin.video.alfa/platformcode/platformtools.py +++ b/plugin.video.alfa/platformcode/platformtools.py @@ -226,9 +226,9 @@ def render_items(itemlist, parent_item): context_commands = set_context_commands(item, parent_item) # Añadimos el item - if config.get_platform(True)['num_version'] >= 17.0: + if config.get_platform(True)['num_version'] >= 17.0 and parent_item.list_type == '': listitem.addContextMenuItems(context_commands) - else: + elif parent_item.list_type == '': listitem.addContextMenuItems(context_commands, replaceItems=True) if not item.totalItems: @@ -247,7 +247,18 @@ def render_items(itemlist, parent_item): xbmcplugin.setContent(int(sys.argv[1]), "movies") # Fijamos el "breadcrumb" - xbmcplugin.setPluginCategory(handle=int(sys.argv[1]), category=parent_item.category.capitalize()) + if parent_item.list_type == '': + breadcrumb = parent_item.category.capitalize() + else: + if 'similar' in parent_item.list_type: + if parent_item.contentTitle != '': + breadcrumb = 'Similares (%s)' % parent_item.contentTitle + else: + breadcrumb = 'Similares (%s)' % parent_item.contentSerieName + else: + breadcrumb = 'Busqueda' + + xbmcplugin.setPluginCategory(handle=int(sys.argv[1]), category=breadcrumb) # No ordenar items xbmcplugin.addSortMethod(handle=int(sys.argv[1]), sortMethod=xbmcplugin.SORT_METHOD_NONE) @@ -394,7 +405,6 @@ def set_context_commands(item, parent_item): else: context_commands.append( (command["title"], "XBMC.RunPlugin(%s?%s)" % (sys.argv[0], item.clone(**command).tourl()))) - # Opciones segun criterios, solo si el item no es un tag (etiqueta), ni es "Añadir a la videoteca", etc... if item.action and item.action not in ["add_pelicula_to_library", "add_serie_to_library", "buscartrailer"]: # Mostrar informacion: si el item tiene plot suponemos q es una serie, temporada, capitulo o pelicula @@ -430,7 +440,8 @@ def set_context_commands(item, parent_item): elif item.contentType == "movie" and (item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.contentTitle): param = "id =%s,imdb_id=%s,name=%s" \ - % (item.infoLabels['tmdb_id'], item.infoLabels['imdb_id'], item.contentTitle) + % (item.infoLabels['tmdb_id'], item.infoLabels['imdb_id'], item.contentTitle) + context_commands.append(("ExtendedInfo", "XBMC.RunScript(script.extendedinfo,info=extendedinfo,%s)" % param)) @@ -455,7 +466,7 @@ 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 + # Buscar en otros canales y similares if item.contentType in ['movie', 'tvshow'] and item.channel != 'search': # Buscar en otros canales if item.contentSerieName != '': @@ -469,6 +480,14 @@ def set_context_commands(item, parent_item): from_channel=item.channel, contextual=True).tourl()))) + if item.contentType == 'tvshow': + mediatype = 'tv' + else: + mediatype = item.contentType + context_commands.append(("[COLOR yellow]Buscar Similares[/COLOR]", "XBMC.Container.Update (%s?%s)" % ( + sys.argv[0], item.clone(channel='search', action='discover_list', search_type='list', page='1', + list_type='%s/%s/similar' % (mediatype,item.infoLabels['tmdb_id'])).tourl()))) + # Definir como Pagina de inicio if config.get_setting('start_page'): if item.action not in ['findvideos', 'play']: From 10d152dbc0e92d3dad1075f87e4babc8a2fdc5f1 Mon Sep 17 00:00:00 2001 From: angedam Date: Thu, 26 Jul 2018 21:32:39 +0200 Subject: [PATCH 04/15] added localized strings --- plugin.video.alfa/servers/adnstream.json | 4 ++-- plugin.video.alfa/servers/animeid.json | 4 ++-- plugin.video.alfa/servers/auroravid.json | 4 ++-- plugin.video.alfa/servers/backin.json | 4 ++-- plugin.video.alfa/servers/bdupload.json | 4 ++-- plugin.video.alfa/servers/bigfile.json | 4 ++-- plugin.video.alfa/servers/bitertv.json | 4 ++-- plugin.video.alfa/servers/bitp.json | 4 ++-- plugin.video.alfa/servers/bitshare.json | 4 ++-- plugin.video.alfa/servers/bitvidsx.json | 4 ++-- plugin.video.alfa/servers/clicknupload.json | 4 ++-- plugin.video.alfa/servers/clipwatching.json | 4 ++-- plugin.video.alfa/servers/cloudsany.json | 4 ++-- plugin.video.alfa/servers/cloudvideo.json | 4 ++-- plugin.video.alfa/servers/cloudy.json | 4 ++-- plugin.video.alfa/servers/cnubis.json | 4 ++-- plugin.video.alfa/servers/crunchyroll.json | 4 ++-- plugin.video.alfa/servers/cumlouder.json | 4 ++-- plugin.video.alfa/servers/dailymotion.json | 4 ++-- plugin.video.alfa/servers/datoporn.json | 4 ++-- plugin.video.alfa/servers/directo.json | 4 ++-- plugin.video.alfa/servers/documentary.json | 4 ++-- plugin.video.alfa/servers/dostream.json | 4 ++-- plugin.video.alfa/servers/downace.json | 4 ++-- plugin.video.alfa/servers/eroshare.json | 4 ++-- plugin.video.alfa/servers/estream.json | 4 ++-- plugin.video.alfa/servers/facebook.json | 4 ++-- plugin.video.alfa/servers/fakingstv.json | 4 ++-- plugin.video.alfa/servers/fastplay.json | 4 ++-- plugin.video.alfa/servers/filebebo.json | 4 ++-- plugin.video.alfa/servers/filefactory.json | 4 ++-- plugin.video.alfa/servers/fileflyer.json | 4 ++-- plugin.video.alfa/servers/filescdn.json | 4 ++-- plugin.video.alfa/servers/filesmonster.json | 4 ++-- plugin.video.alfa/servers/filevideo.json | 4 ++-- plugin.video.alfa/servers/filez.json | 4 ++-- plugin.video.alfa/servers/flashx.json | 4 ++-- plugin.video.alfa/servers/fourshared.json | 4 ++-- plugin.video.alfa/servers/freakshare.json | 4 ++-- plugin.video.alfa/servers/gamovideo.json | 4 ++-- plugin.video.alfa/servers/gigasize.json | 4 ++-- plugin.video.alfa/servers/googlevideo.json | 4 ++-- plugin.video.alfa/servers/gounlimited.json | 4 ++-- plugin.video.alfa/servers/gvideo.json | 4 ++-- plugin.video.alfa/servers/hugefiles.json | 4 ++-- plugin.video.alfa/servers/kbagi.json | 4 ++-- plugin.video.alfa/servers/mailru.json | 4 ++-- plugin.video.alfa/servers/mediafire.json | 4 ++-- plugin.video.alfa/servers/mega.json | 4 ++-- plugin.video.alfa/servers/movshare.json | 4 ++-- plugin.video.alfa/servers/mp4upload.json | 4 ++-- plugin.video.alfa/servers/netutv.json | 4 ++-- plugin.video.alfa/servers/nowvideo.json | 4 ++-- plugin.video.alfa/servers/oboom.json | 4 ++-- plugin.video.alfa/servers/okru.json | 4 ++-- plugin.video.alfa/servers/onefichier.json | 4 ++-- plugin.video.alfa/servers/openload.json | 4 ++-- plugin.video.alfa/servers/pelismundo.json | 4 ++-- plugin.video.alfa/servers/playwatch.json | 4 ++-- plugin.video.alfa/servers/playwire.json | 4 ++-- plugin.video.alfa/servers/powvideo.json | 4 ++-- plugin.video.alfa/servers/rapidgator.json | 4 ++-- plugin.video.alfa/servers/rapidvideo.json | 4 ++-- plugin.video.alfa/servers/rutube.json | 4 ++-- plugin.video.alfa/servers/sendvid.json | 4 ++-- plugin.video.alfa/servers/speedvideo.json | 4 ++-- plugin.video.alfa/servers/streamango.json | 4 ++-- plugin.video.alfa/servers/streamcherry.json | 4 ++-- plugin.video.alfa/servers/streamcloud.json | 4 ++-- plugin.video.alfa/servers/streame.json | 4 ++-- plugin.video.alfa/servers/streaminto.json | 4 ++-- plugin.video.alfa/servers/streamixcloud.json | 4 ++-- plugin.video.alfa/servers/streamplay.json | 4 ++-- plugin.video.alfa/servers/thevideome.json | 4 ++-- plugin.video.alfa/servers/thevideos.json | 4 ++-- plugin.video.alfa/servers/torrent.json | 4 ++-- plugin.video.alfa/servers/tunepk.json | 4 ++-- plugin.video.alfa/servers/turbobit.json | 4 ++-- plugin.video.alfa/servers/tusfiles.json | 4 ++-- plugin.video.alfa/servers/tutv.json | 4 ++-- plugin.video.alfa/servers/uploadedto.json | 4 ++-- plugin.video.alfa/servers/uptobox.json | 4 ++-- plugin.video.alfa/servers/upvid.json | 4 ++-- plugin.video.alfa/servers/userscloud.json | 4 ++-- plugin.video.alfa/servers/veoh.json | 4 ++-- plugin.video.alfa/servers/vidabc.json | 4 ++-- plugin.video.alfa/servers/videowood.json | 4 ++-- plugin.video.alfa/servers/vidgg.json | 4 ++-- plugin.video.alfa/servers/vidgot.json | 4 ++-- plugin.video.alfa/servers/vidlox.json | 4 ++-- plugin.video.alfa/servers/vidoza.json | 4 ++-- plugin.video.alfa/servers/vidspot.json | 4 ++-- plugin.video.alfa/servers/vidtodo.json | 4 ++-- plugin.video.alfa/servers/vidtome.json | 4 ++-- plugin.video.alfa/servers/vidup.json | 4 ++-- plugin.video.alfa/servers/vidzella.json | 4 ++-- plugin.video.alfa/servers/vidzi.json | 4 ++-- plugin.video.alfa/servers/vimeo.json | 4 ++-- plugin.video.alfa/servers/vimpleru.json | 4 ++-- plugin.video.alfa/servers/vivo.json | 4 ++-- plugin.video.alfa/servers/vk.json | 4 ++-- plugin.video.alfa/servers/vshare.json | 4 ++-- plugin.video.alfa/servers/watchers.json | 4 ++-- plugin.video.alfa/servers/watchvideo.json | 4 ++-- plugin.video.alfa/servers/wholecloud.json | 4 ++-- plugin.video.alfa/servers/xvideos.json | 4 ++-- plugin.video.alfa/servers/yourupload.json | 4 ++-- plugin.video.alfa/servers/youtube.json | 4 ++-- plugin.video.alfa/servers/youwatch.json | 4 ++-- plugin.video.alfa/servers/zippyshare.json | 4 ++-- 110 files changed, 220 insertions(+), 220 deletions(-) diff --git a/plugin.video.alfa/servers/adnstream.json b/plugin.video.alfa/servers/adnstream.json index 7a227b97..1f601daa 100755 --- a/plugin.video.alfa/servers/adnstream.json +++ b/plugin.video.alfa/servers/adnstream.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/animeid.json b/plugin.video.alfa/servers/animeid.json index 73283539..f4137c72 100644 --- a/plugin.video.alfa/servers/animeid.json +++ b/plugin.video.alfa/servers/animeid.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/auroravid.json b/plugin.video.alfa/servers/auroravid.json index 73c1928a..4966911a 100755 --- a/plugin.video.alfa/servers/auroravid.json +++ b/plugin.video.alfa/servers/auroravid.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/backin.json b/plugin.video.alfa/servers/backin.json index 671f4f77..6f634ee9 100755 --- a/plugin.video.alfa/servers/backin.json +++ b/plugin.video.alfa/servers/backin.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bdupload.json b/plugin.video.alfa/servers/bdupload.json index 8a900b30..02f24040 100644 --- a/plugin.video.alfa/servers/bdupload.json +++ b/plugin.video.alfa/servers/bdupload.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bigfile.json b/plugin.video.alfa/servers/bigfile.json index 74f2c2bf..a06452f0 100755 --- a/plugin.video.alfa/servers/bigfile.json +++ b/plugin.video.alfa/servers/bigfile.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bitertv.json b/plugin.video.alfa/servers/bitertv.json index 1c844819..568bb1ae 100644 --- a/plugin.video.alfa/servers/bitertv.json +++ b/plugin.video.alfa/servers/bitertv.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bitp.json b/plugin.video.alfa/servers/bitp.json index 0166dd21..88ef1706 100644 --- a/plugin.video.alfa/servers/bitp.json +++ b/plugin.video.alfa/servers/bitp.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bitshare.json b/plugin.video.alfa/servers/bitshare.json index 4d4586d1..52d1cae9 100755 --- a/plugin.video.alfa/servers/bitshare.json +++ b/plugin.video.alfa/servers/bitshare.json @@ -29,7 +29,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -37,7 +37,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/bitvidsx.json b/plugin.video.alfa/servers/bitvidsx.json index 85f25230..ea44abcc 100755 --- a/plugin.video.alfa/servers/bitvidsx.json +++ b/plugin.video.alfa/servers/bitvidsx.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/clicknupload.json b/plugin.video.alfa/servers/clicknupload.json index d2c4ecf1..f8fe6556 100755 --- a/plugin.video.alfa/servers/clicknupload.json +++ b/plugin.video.alfa/servers/clicknupload.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/clipwatching.json b/plugin.video.alfa/servers/clipwatching.json index 8fceac73..068a163a 100644 --- a/plugin.video.alfa/servers/clipwatching.json +++ b/plugin.video.alfa/servers/clipwatching.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/cloudsany.json b/plugin.video.alfa/servers/cloudsany.json index 25302975..75c373ca 100644 --- a/plugin.video.alfa/servers/cloudsany.json +++ b/plugin.video.alfa/servers/cloudsany.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/cloudvideo.json b/plugin.video.alfa/servers/cloudvideo.json index bdb34dfb..af006aff 100644 --- a/plugin.video.alfa/servers/cloudvideo.json +++ b/plugin.video.alfa/servers/cloudvideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/cloudy.json b/plugin.video.alfa/servers/cloudy.json index c1509969..08aa819c 100755 --- a/plugin.video.alfa/servers/cloudy.json +++ b/plugin.video.alfa/servers/cloudy.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/cnubis.json b/plugin.video.alfa/servers/cnubis.json index 62fe1901..6b7374e0 100755 --- a/plugin.video.alfa/servers/cnubis.json +++ b/plugin.video.alfa/servers/cnubis.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/crunchyroll.json b/plugin.video.alfa/servers/crunchyroll.json index f3b0961e..815a2ed7 100755 --- a/plugin.video.alfa/servers/crunchyroll.json +++ b/plugin.video.alfa/servers/crunchyroll.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/cumlouder.json b/plugin.video.alfa/servers/cumlouder.json index 0ff53cc2..74b04ab6 100755 --- a/plugin.video.alfa/servers/cumlouder.json +++ b/plugin.video.alfa/servers/cumlouder.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/dailymotion.json b/plugin.video.alfa/servers/dailymotion.json index d94a44fe..25e8b935 100755 --- a/plugin.video.alfa/servers/dailymotion.json +++ b/plugin.video.alfa/servers/dailymotion.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/datoporn.json b/plugin.video.alfa/servers/datoporn.json index 30df1f6d..ea87894b 100755 --- a/plugin.video.alfa/servers/datoporn.json +++ b/plugin.video.alfa/servers/datoporn.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/directo.json b/plugin.video.alfa/servers/directo.json index 99e6e220..abe594fd 100755 --- a/plugin.video.alfa/servers/directo.json +++ b/plugin.video.alfa/servers/directo.json @@ -41,7 +41,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -49,7 +49,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/documentary.json b/plugin.video.alfa/servers/documentary.json index 3a6056ab..d4c97bc2 100755 --- a/plugin.video.alfa/servers/documentary.json +++ b/plugin.video.alfa/servers/documentary.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/dostream.json b/plugin.video.alfa/servers/dostream.json index af134521..dfffeec7 100644 --- a/plugin.video.alfa/servers/dostream.json +++ b/plugin.video.alfa/servers/dostream.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/downace.json b/plugin.video.alfa/servers/downace.json index 47a751ed..c175ca0c 100644 --- a/plugin.video.alfa/servers/downace.json +++ b/plugin.video.alfa/servers/downace.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/eroshare.json b/plugin.video.alfa/servers/eroshare.json index 0508ff17..6d169ea1 100755 --- a/plugin.video.alfa/servers/eroshare.json +++ b/plugin.video.alfa/servers/eroshare.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/estream.json b/plugin.video.alfa/servers/estream.json index 46e1400c..5f2b84c4 100644 --- a/plugin.video.alfa/servers/estream.json +++ b/plugin.video.alfa/servers/estream.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/facebook.json b/plugin.video.alfa/servers/facebook.json index ad1c5b43..9a6f54f1 100755 --- a/plugin.video.alfa/servers/facebook.json +++ b/plugin.video.alfa/servers/facebook.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/fakingstv.json b/plugin.video.alfa/servers/fakingstv.json index f668b2fc..7da9bb0d 100755 --- a/plugin.video.alfa/servers/fakingstv.json +++ b/plugin.video.alfa/servers/fakingstv.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/fastplay.json b/plugin.video.alfa/servers/fastplay.json index 7369a7e4..63b6de23 100755 --- a/plugin.video.alfa/servers/fastplay.json +++ b/plugin.video.alfa/servers/fastplay.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filebebo.json b/plugin.video.alfa/servers/filebebo.json index 906fa4fe..e9cd089e 100644 --- a/plugin.video.alfa/servers/filebebo.json +++ b/plugin.video.alfa/servers/filebebo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filefactory.json b/plugin.video.alfa/servers/filefactory.json index 0d81c54d..277e1f52 100755 --- a/plugin.video.alfa/servers/filefactory.json +++ b/plugin.video.alfa/servers/filefactory.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/fileflyer.json b/plugin.video.alfa/servers/fileflyer.json index 7f3a6f18..7fa3dba7 100755 --- a/plugin.video.alfa/servers/fileflyer.json +++ b/plugin.video.alfa/servers/fileflyer.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filescdn.json b/plugin.video.alfa/servers/filescdn.json index a0bb3573..273cd598 100755 --- a/plugin.video.alfa/servers/filescdn.json +++ b/plugin.video.alfa/servers/filescdn.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filesmonster.json b/plugin.video.alfa/servers/filesmonster.json index 92c52197..19408a7f 100755 --- a/plugin.video.alfa/servers/filesmonster.json +++ b/plugin.video.alfa/servers/filesmonster.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filevideo.json b/plugin.video.alfa/servers/filevideo.json index 9098f191..b3235f8c 100644 --- a/plugin.video.alfa/servers/filevideo.json +++ b/plugin.video.alfa/servers/filevideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/filez.json b/plugin.video.alfa/servers/filez.json index 925f1afe..2f0e61d2 100755 --- a/plugin.video.alfa/servers/filez.json +++ b/plugin.video.alfa/servers/filez.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/flashx.json b/plugin.video.alfa/servers/flashx.json index 1a1972f2..20c5e9ff 100644 --- a/plugin.video.alfa/servers/flashx.json +++ b/plugin.video.alfa/servers/flashx.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/fourshared.json b/plugin.video.alfa/servers/fourshared.json index c28126ef..2ae11d2b 100755 --- a/plugin.video.alfa/servers/fourshared.json +++ b/plugin.video.alfa/servers/fourshared.json @@ -31,7 +31,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -39,7 +39,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/freakshare.json b/plugin.video.alfa/servers/freakshare.json index 46eebd5e..4b2575b0 100755 --- a/plugin.video.alfa/servers/freakshare.json +++ b/plugin.video.alfa/servers/freakshare.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/gamovideo.json b/plugin.video.alfa/servers/gamovideo.json index 44144414..46a93854 100755 --- a/plugin.video.alfa/servers/gamovideo.json +++ b/plugin.video.alfa/servers/gamovideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/gigasize.json b/plugin.video.alfa/servers/gigasize.json index 1f2c3e8f..605c7826 100755 --- a/plugin.video.alfa/servers/gigasize.json +++ b/plugin.video.alfa/servers/gigasize.json @@ -25,7 +25,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -33,7 +33,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/googlevideo.json b/plugin.video.alfa/servers/googlevideo.json index 55a010be..8709259c 100755 --- a/plugin.video.alfa/servers/googlevideo.json +++ b/plugin.video.alfa/servers/googlevideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/gounlimited.json b/plugin.video.alfa/servers/gounlimited.json index d4d4cd86..7b66129f 100644 --- a/plugin.video.alfa/servers/gounlimited.json +++ b/plugin.video.alfa/servers/gounlimited.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json index d5975909..5598512d 100644 --- a/plugin.video.alfa/servers/gvideo.json +++ b/plugin.video.alfa/servers/gvideo.json @@ -29,7 +29,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -37,7 +37,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/hugefiles.json b/plugin.video.alfa/servers/hugefiles.json index 1a76509a..4656c17e 100755 --- a/plugin.video.alfa/servers/hugefiles.json +++ b/plugin.video.alfa/servers/hugefiles.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/kbagi.json b/plugin.video.alfa/servers/kbagi.json index 9276fb05..0d2e7386 100644 --- a/plugin.video.alfa/servers/kbagi.json +++ b/plugin.video.alfa/servers/kbagi.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/mailru.json b/plugin.video.alfa/servers/mailru.json index dd2db770..655860c2 100755 --- a/plugin.video.alfa/servers/mailru.json +++ b/plugin.video.alfa/servers/mailru.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/mediafire.json b/plugin.video.alfa/servers/mediafire.json index fbc87878..0af59303 100755 --- a/plugin.video.alfa/servers/mediafire.json +++ b/plugin.video.alfa/servers/mediafire.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/mega.json b/plugin.video.alfa/servers/mega.json index 040f56c5..dc6df624 100755 --- a/plugin.video.alfa/servers/mega.json +++ b/plugin.video.alfa/servers/mega.json @@ -32,7 +32,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -40,7 +40,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/movshare.json b/plugin.video.alfa/servers/movshare.json index 2b8a9c19..03b4a99f 100755 --- a/plugin.video.alfa/servers/movshare.json +++ b/plugin.video.alfa/servers/movshare.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/mp4upload.json b/plugin.video.alfa/servers/mp4upload.json index 79b26695..b3d68c38 100755 --- a/plugin.video.alfa/servers/mp4upload.json +++ b/plugin.video.alfa/servers/mp4upload.json @@ -19,7 +19,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -27,7 +27,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/netutv.json b/plugin.video.alfa/servers/netutv.json index d989225d..043db086 100755 --- a/plugin.video.alfa/servers/netutv.json +++ b/plugin.video.alfa/servers/netutv.json @@ -32,7 +32,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -40,7 +40,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/nowvideo.json b/plugin.video.alfa/servers/nowvideo.json index 389d0067..c7298a48 100755 --- a/plugin.video.alfa/servers/nowvideo.json +++ b/plugin.video.alfa/servers/nowvideo.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/oboom.json b/plugin.video.alfa/servers/oboom.json index 8ce1945e..13708a42 100755 --- a/plugin.video.alfa/servers/oboom.json +++ b/plugin.video.alfa/servers/oboom.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/okru.json b/plugin.video.alfa/servers/okru.json index b1908ce1..ef3a673a 100755 --- a/plugin.video.alfa/servers/okru.json +++ b/plugin.video.alfa/servers/okru.json @@ -22,7 +22,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -30,7 +30,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/onefichier.json b/plugin.video.alfa/servers/onefichier.json index 5e71cb9c..44efe860 100755 --- a/plugin.video.alfa/servers/onefichier.json +++ b/plugin.video.alfa/servers/onefichier.json @@ -26,7 +26,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -34,7 +34,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/openload.json b/plugin.video.alfa/servers/openload.json index 4616df8a..bfa940c2 100755 --- a/plugin.video.alfa/servers/openload.json +++ b/plugin.video.alfa/servers/openload.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/pelismundo.json b/plugin.video.alfa/servers/pelismundo.json index 9a013955..54893fcc 100644 --- a/plugin.video.alfa/servers/pelismundo.json +++ b/plugin.video.alfa/servers/pelismundo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/playwatch.json b/plugin.video.alfa/servers/playwatch.json index 20a6bc40..48a0ed1a 100755 --- a/plugin.video.alfa/servers/playwatch.json +++ b/plugin.video.alfa/servers/playwatch.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/playwire.json b/plugin.video.alfa/servers/playwire.json index 9b4d915c..f05e2a8b 100755 --- a/plugin.video.alfa/servers/playwire.json +++ b/plugin.video.alfa/servers/playwire.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/powvideo.json b/plugin.video.alfa/servers/powvideo.json index 03dff2e3..9d056ace 100755 --- a/plugin.video.alfa/servers/powvideo.json +++ b/plugin.video.alfa/servers/powvideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/rapidgator.json b/plugin.video.alfa/servers/rapidgator.json index baddc1fa..48f3a43e 100755 --- a/plugin.video.alfa/servers/rapidgator.json +++ b/plugin.video.alfa/servers/rapidgator.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/rapidvideo.json b/plugin.video.alfa/servers/rapidvideo.json index 74077dfe..67c548f6 100755 --- a/plugin.video.alfa/servers/rapidvideo.json +++ b/plugin.video.alfa/servers/rapidvideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/rutube.json b/plugin.video.alfa/servers/rutube.json index 17554bcb..4dc196b2 100755 --- a/plugin.video.alfa/servers/rutube.json +++ b/plugin.video.alfa/servers/rutube.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/sendvid.json b/plugin.video.alfa/servers/sendvid.json index 5f2713fa..c99efe55 100755 --- a/plugin.video.alfa/servers/sendvid.json +++ b/plugin.video.alfa/servers/sendvid.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/speedvideo.json b/plugin.video.alfa/servers/speedvideo.json index d9bffbb3..da4c68db 100755 --- a/plugin.video.alfa/servers/speedvideo.json +++ b/plugin.video.alfa/servers/speedvideo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streamango.json b/plugin.video.alfa/servers/streamango.json index ef6a2dc0..ec818b2f 100755 --- a/plugin.video.alfa/servers/streamango.json +++ b/plugin.video.alfa/servers/streamango.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streamcherry.json b/plugin.video.alfa/servers/streamcherry.json index a2783201..45febb51 100644 --- a/plugin.video.alfa/servers/streamcherry.json +++ b/plugin.video.alfa/servers/streamcherry.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streamcloud.json b/plugin.video.alfa/servers/streamcloud.json index e19e4da0..93ae25fe 100755 --- a/plugin.video.alfa/servers/streamcloud.json +++ b/plugin.video.alfa/servers/streamcloud.json @@ -31,7 +31,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -39,7 +39,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streame.json b/plugin.video.alfa/servers/streame.json index 851bbbaa..4aa906de 100755 --- a/plugin.video.alfa/servers/streame.json +++ b/plugin.video.alfa/servers/streame.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streaminto.json b/plugin.video.alfa/servers/streaminto.json index e9857ac2..77c0ad5f 100755 --- a/plugin.video.alfa/servers/streaminto.json +++ b/plugin.video.alfa/servers/streaminto.json @@ -33,7 +33,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -41,7 +41,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streamixcloud.json b/plugin.video.alfa/servers/streamixcloud.json index 2b67a81e..636debad 100755 --- a/plugin.video.alfa/servers/streamixcloud.json +++ b/plugin.video.alfa/servers/streamixcloud.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/streamplay.json b/plugin.video.alfa/servers/streamplay.json index 67efb9f8..eec0fb52 100755 --- a/plugin.video.alfa/servers/streamplay.json +++ b/plugin.video.alfa/servers/streamplay.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/thevideome.json b/plugin.video.alfa/servers/thevideome.json index 0f1fb016..d318af0c 100755 --- a/plugin.video.alfa/servers/thevideome.json +++ b/plugin.video.alfa/servers/thevideome.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/thevideos.json b/plugin.video.alfa/servers/thevideos.json index bbb93320..7776a6ac 100755 --- a/plugin.video.alfa/servers/thevideos.json +++ b/plugin.video.alfa/servers/thevideos.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/torrent.json b/plugin.video.alfa/servers/torrent.json index 698c5db3..79e12a9f 100644 --- a/plugin.video.alfa/servers/torrent.json +++ b/plugin.video.alfa/servers/torrent.json @@ -62,7 +62,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -70,7 +70,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/tunepk.json b/plugin.video.alfa/servers/tunepk.json index 4c08bec0..3d3452ce 100755 --- a/plugin.video.alfa/servers/tunepk.json +++ b/plugin.video.alfa/servers/tunepk.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/turbobit.json b/plugin.video.alfa/servers/turbobit.json index 89a37aba..a5ae92f5 100755 --- a/plugin.video.alfa/servers/turbobit.json +++ b/plugin.video.alfa/servers/turbobit.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/tusfiles.json b/plugin.video.alfa/servers/tusfiles.json index 749732b0..a6fda066 100755 --- a/plugin.video.alfa/servers/tusfiles.json +++ b/plugin.video.alfa/servers/tusfiles.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/tutv.json b/plugin.video.alfa/servers/tutv.json index 6d3b260a..e7c11eff 100755 --- a/plugin.video.alfa/servers/tutv.json +++ b/plugin.video.alfa/servers/tutv.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/uploadedto.json b/plugin.video.alfa/servers/uploadedto.json index 773c2770..9d893f98 100755 --- a/plugin.video.alfa/servers/uploadedto.json +++ b/plugin.video.alfa/servers/uploadedto.json @@ -34,7 +34,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -42,7 +42,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/uptobox.json b/plugin.video.alfa/servers/uptobox.json index 34781cb8..32d5e308 100755 --- a/plugin.video.alfa/servers/uptobox.json +++ b/plugin.video.alfa/servers/uptobox.json @@ -25,7 +25,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -33,7 +33,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/upvid.json b/plugin.video.alfa/servers/upvid.json index 058fae74..6476fa70 100644 --- a/plugin.video.alfa/servers/upvid.json +++ b/plugin.video.alfa/servers/upvid.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/userscloud.json b/plugin.video.alfa/servers/userscloud.json index f3da7dd7..a52644ee 100755 --- a/plugin.video.alfa/servers/userscloud.json +++ b/plugin.video.alfa/servers/userscloud.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/veoh.json b/plugin.video.alfa/servers/veoh.json index 70b5dd7b..4ee14cb7 100755 --- a/plugin.video.alfa/servers/veoh.json +++ b/plugin.video.alfa/servers/veoh.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidabc.json b/plugin.video.alfa/servers/vidabc.json index c2a8e2a3..58201916 100755 --- a/plugin.video.alfa/servers/vidabc.json +++ b/plugin.video.alfa/servers/vidabc.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/videowood.json b/plugin.video.alfa/servers/videowood.json index 0bd5bb09..80c1d189 100755 --- a/plugin.video.alfa/servers/videowood.json +++ b/plugin.video.alfa/servers/videowood.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidgg.json b/plugin.video.alfa/servers/vidgg.json index eab438c2..37e9820f 100755 --- a/plugin.video.alfa/servers/vidgg.json +++ b/plugin.video.alfa/servers/vidgg.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidgot.json b/plugin.video.alfa/servers/vidgot.json index 4321ea51..407ef006 100755 --- a/plugin.video.alfa/servers/vidgot.json +++ b/plugin.video.alfa/servers/vidgot.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidlox.json b/plugin.video.alfa/servers/vidlox.json index 5c456ed3..e5774ed9 100644 --- a/plugin.video.alfa/servers/vidlox.json +++ b/plugin.video.alfa/servers/vidlox.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidoza.json b/plugin.video.alfa/servers/vidoza.json index 19e42f98..5c4d9ffa 100755 --- a/plugin.video.alfa/servers/vidoza.json +++ b/plugin.video.alfa/servers/vidoza.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidspot.json b/plugin.video.alfa/servers/vidspot.json index df67a563..e19002e8 100755 --- a/plugin.video.alfa/servers/vidspot.json +++ b/plugin.video.alfa/servers/vidspot.json @@ -48,7 +48,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -56,7 +56,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidtodo.json b/plugin.video.alfa/servers/vidtodo.json index 5accb58b..82b81fa1 100755 --- a/plugin.video.alfa/servers/vidtodo.json +++ b/plugin.video.alfa/servers/vidtodo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidtome.json b/plugin.video.alfa/servers/vidtome.json index bf3eb839..f6bb5618 100755 --- a/plugin.video.alfa/servers/vidtome.json +++ b/plugin.video.alfa/servers/vidtome.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidup.json b/plugin.video.alfa/servers/vidup.json index 62ec188d..39f7ddd3 100755 --- a/plugin.video.alfa/servers/vidup.json +++ b/plugin.video.alfa/servers/vidup.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidzella.json b/plugin.video.alfa/servers/vidzella.json index 6d86d508..e84d80bf 100644 --- a/plugin.video.alfa/servers/vidzella.json +++ b/plugin.video.alfa/servers/vidzella.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vidzi.json b/plugin.video.alfa/servers/vidzi.json index 3f0e342a..a2ab07cd 100755 --- a/plugin.video.alfa/servers/vidzi.json +++ b/plugin.video.alfa/servers/vidzi.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vimeo.json b/plugin.video.alfa/servers/vimeo.json index abef9cd8..8bd56135 100755 --- a/plugin.video.alfa/servers/vimeo.json +++ b/plugin.video.alfa/servers/vimeo.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vimpleru.json b/plugin.video.alfa/servers/vimpleru.json index b196c7de..15b082e5 100755 --- a/plugin.video.alfa/servers/vimpleru.json +++ b/plugin.video.alfa/servers/vimpleru.json @@ -22,7 +22,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -30,7 +30,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vivo.json b/plugin.video.alfa/servers/vivo.json index 3b308512..7183ea8b 100644 --- a/plugin.video.alfa/servers/vivo.json +++ b/plugin.video.alfa/servers/vivo.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vk.json b/plugin.video.alfa/servers/vk.json index 7c6560f1..63b379b7 100755 --- a/plugin.video.alfa/servers/vk.json +++ b/plugin.video.alfa/servers/vk.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/vshare.json b/plugin.video.alfa/servers/vshare.json index 94a409eb..7ada69e3 100644 --- a/plugin.video.alfa/servers/vshare.json +++ b/plugin.video.alfa/servers/vshare.json @@ -22,7 +22,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -30,7 +30,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/watchers.json b/plugin.video.alfa/servers/watchers.json index 259de9ec..726b6510 100755 --- a/plugin.video.alfa/servers/watchers.json +++ b/plugin.video.alfa/servers/watchers.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/watchvideo.json b/plugin.video.alfa/servers/watchvideo.json index 60ff614a..c865296a 100755 --- a/plugin.video.alfa/servers/watchvideo.json +++ b/plugin.video.alfa/servers/watchvideo.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/wholecloud.json b/plugin.video.alfa/servers/wholecloud.json index 693176ae..1faa1ab1 100755 --- a/plugin.video.alfa/servers/wholecloud.json +++ b/plugin.video.alfa/servers/wholecloud.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/xvideos.json b/plugin.video.alfa/servers/xvideos.json index dd1c309b..fc9661e1 100755 --- a/plugin.video.alfa/servers/xvideos.json +++ b/plugin.video.alfa/servers/xvideos.json @@ -17,7 +17,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -25,7 +25,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/yourupload.json b/plugin.video.alfa/servers/yourupload.json index dd920bd5..93435534 100755 --- a/plugin.video.alfa/servers/yourupload.json +++ b/plugin.video.alfa/servers/yourupload.json @@ -27,7 +27,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -35,7 +35,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/youtube.json b/plugin.video.alfa/servers/youtube.json index 4c12dd1c..c8e0bb0c 100755 --- a/plugin.video.alfa/servers/youtube.json +++ b/plugin.video.alfa/servers/youtube.json @@ -29,7 +29,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -37,7 +37,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/youwatch.json b/plugin.video.alfa/servers/youwatch.json index 9bdd8ef4..43644659 100755 --- a/plugin.video.alfa/servers/youwatch.json +++ b/plugin.video.alfa/servers/youwatch.json @@ -20,7 +20,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -28,7 +28,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", diff --git a/plugin.video.alfa/servers/zippyshare.json b/plugin.video.alfa/servers/zippyshare.json index 387b997a..dbf11475 100755 --- a/plugin.video.alfa/servers/zippyshare.json +++ b/plugin.video.alfa/servers/zippyshare.json @@ -21,7 +21,7 @@ "default": false, "enabled": true, "id": "black_list", - "label": "Incluir en lista negra", + "label": "@60654", "type": "bool", "visible": true }, @@ -29,7 +29,7 @@ "default": 0, "enabled": true, "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", + "label": "@60655", "lvalues": [ "No", "1", From d120d50f7db2d75e60bc79c859551adc63b55550 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 26 Jul 2018 21:52:11 +0200 Subject: [PATCH 05/15] Cambios internos --- plugin.video.alfa/channels/alltorrent.py | 5 +- plugin.video.alfa/channels/mejortorrent.json | 128 +++++++++---------- 2 files changed, 68 insertions(+), 65 deletions(-) diff --git a/plugin.video.alfa/channels/alltorrent.py b/plugin.video.alfa/channels/alltorrent.py index 505f5059..4d8d78f8 100755 --- a/plugin.video.alfa/channels/alltorrent.py +++ b/plugin.video.alfa/channels/alltorrent.py @@ -61,10 +61,12 @@ def listado(item): except: pass - if not data: #Si la web está caída salimos sin dar error + if not data and item.extra != "año": #Si la web está caída salimos sin dar error logger.error("ERROR 01: LISTADO: La Web no responde o ha cambiado de URL: " + item.url + " / DATA: " + data) itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: LISTADO:. La Web no responde o ha cambiado de URL. Si la Web está activa, reportar el error con el log')) return itemlist #si no hay más datos, algo no funciona, pintamos lo que tenemos + elif not data and item.extra == "año": #cuando no hay datos para un año, da error. Tratamos de evitar el error + return itemlist patron = '
([^"]+)<\/a>\s?<\/div>
(.*?)<\/div><\/div><\/div>' #data = scrapertools.find_single_match(data, patron) @@ -283,6 +285,7 @@ def newest(categoria): if categoria == 'torrent': item.url = host item.extra = "peliculas" + item.channel = "alltorrents" itemlist = listado(item) if itemlist[-1].title == "Página siguiente >>": diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json index 7cc93f83..aab7f041 100755 --- a/plugin.video.alfa/channels/mejortorrent.json +++ b/plugin.video.alfa/channels/mejortorrent.json @@ -1,65 +1,65 @@ -{ - "id": "mejortorrent", - "name": "Mejor Torrent", - "active": true, - "adult": false, - "language": ["*"], - "thumbnail": "thumb_intervenido_pn.jpeg", - "banner": "mejortorrent.png", - "categories": [ - "torrent", - "movie", - "tvshow", - "documentary" - ], - "settings": [ - { - "default": "http://www.mejortorrent.com/", - "enabled": true, - "id": "domain_name", - "label": "URL actual de la Web Mejor Torrent", - "type": "text", - "visible": true - }, - { - "default": true, - "enabled": true, - "id": "include_in_global_search", - "label": "Incluir en busqueda global", - "type": "bool", - "visible": true - }, - { - "default": true, - "enabled": true, - "id": "modo_grafico", - "label": "Buscar información extra (TMDB)", - "type": "bool", - "visible": true - }, - { - "default": true, - "enabled": true, - "id": "seleccionar_ult_temporadda_activa", - "label": "Seleccionar para Videoteca si estará activa solo la última Temporada", - "type": "bool", - "visible": true - }, - { - "default": true, - "enabled": true, - "id": "include_in_newest_peliculas", - "label": "Incluir en Novedades - Peliculas", - "type": "bool", - "visible": true - }, - { - "default": true, - "enabled": true, - "id": "include_in_newest_documentales", - "label": "Incluir en Novedades - Documentales", - "type": "bool", - "visible": true - } - ] +{ + "id": "mejortorrent", + "name": "Mejor Torrent", + "active": true, + "adult": false, + "language": ["*"], + "thumbnail": "mejortorrent.png", + "banner": "mejortorrent.png", + "categories": [ + "torrent", + "movie", + "tvshow", + "documentary" + ], + "settings": [ + { + "id": "domain_name", + "type": "text", + "label": "URL actual de la Web Mejor Torrent", + "default": "http://www.mejortorrent.com/", + "enabled": true, + "visible": true + }, + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": false, + "enabled": true, + "visible": true + }, + { + "id": "modo_grafico", + "type": "bool", + "label": "Buscar información extra (TMDB)", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "seleccionar_ult_temporadda_activa", + "type": "bool", + "label": "Seleccionar para Videoteca si estará activa solo la última Temporada", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_documentales", + "type": "bool", + "label": "Incluir en Novedades - Documentales", + "default": true, + "enabled": true, + "visible": true + } + ] } \ No newline at end of file From bcdebda846ab622600867115472bc65d0d5c4408 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 26 Jul 2018 21:58:19 +0200 Subject: [PATCH 06/15] Cambios internos --- plugin.video.alfa/channels/alltorrent.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin.video.alfa/channels/alltorrent.py b/plugin.video.alfa/channels/alltorrent.py index 4d8d78f8..89015faf 100755 --- a/plugin.video.alfa/channels/alltorrent.py +++ b/plugin.video.alfa/channels/alltorrent.py @@ -224,6 +224,8 @@ def findvideos(item): #Ahora tratamos el servidor directo item_local = item.clone() servidor = 'openload' + if item.infoLabels['duration']: + item_local.quality = scrapertools.find_single_match(item.quality, '(\s\[.*?\])') #Copiamos la duración enlace = scrapertools.find_single_match(data, 'button-green-download-big".*?href="([^"]+)">') if enlace: try: From 326281b7c5080d5ecf265b7e7a0b865cfacf2a27 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 26 Jul 2018 22:00:46 +0200 Subject: [PATCH 07/15] Mejoras internas --- plugin.video.alfa/channels/alltorrent.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.video.alfa/channels/alltorrent.py b/plugin.video.alfa/channels/alltorrent.py index 89015faf..d982c347 100755 --- a/plugin.video.alfa/channels/alltorrent.py +++ b/plugin.video.alfa/channels/alltorrent.py @@ -224,6 +224,7 @@ def findvideos(item): #Ahora tratamos el servidor directo item_local = item.clone() servidor = 'openload' + item_local.quality = '' if item.infoLabels['duration']: item_local.quality = scrapertools.find_single_match(item.quality, '(\s\[.*?\])') #Copiamos la duración enlace = scrapertools.find_single_match(data, 'button-green-download-big".*?href="([^"]+)">') From 4489083254a79626587348349369ffc8a20d2326 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 27 Jul 2018 16:11:05 -0300 Subject: [PATCH 08/15] listo para 2.6 --- plugin.video.alfa/channels/goovie.json | 79 +++ plugin.video.alfa/channels/goovie.py | 329 ++++++++++ plugin.video.alfa/channels/pelisr.json | 79 +++ plugin.video.alfa/channels/pelisr.py | 366 +++++++++++ plugin.video.alfa/channels/retroseriestv.json | 22 + plugin.video.alfa/channels/retroseriestv.py | 213 +++++++ plugin.video.alfa/channels/search.py | 24 +- plugin.video.alfa/channels/seriesblanco.json | 49 +- plugin.video.alfa/channels/seriesblanco.py | 574 +++++++++--------- plugin.video.alfa/channels/veseriesonline.py | 88 +-- plugin.video.alfa/channelselector.py | 16 + .../media/themes/default/thumb_genres.png | Bin 0 -> 24958 bytes .../themes/default/thumb_now_playing.png | Bin 0 -> 48525 bytes .../media/themes/default/thumb_on_the_air.png | Bin 0 -> 34596 bytes .../media/themes/default/thumb_popular.png | Bin 0 -> 38774 bytes .../media/themes/default/thumb_top_rated.png | Bin 0 -> 34096 bytes 16 files changed, 1455 insertions(+), 384 deletions(-) create mode 100644 plugin.video.alfa/channels/goovie.json create mode 100644 plugin.video.alfa/channels/goovie.py create mode 100644 plugin.video.alfa/channels/pelisr.json create mode 100644 plugin.video.alfa/channels/pelisr.py create mode 100644 plugin.video.alfa/channels/retroseriestv.json create mode 100644 plugin.video.alfa/channels/retroseriestv.py mode change 100755 => 100644 plugin.video.alfa/channels/seriesblanco.json create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_genres.png create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_now_playing.png create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_on_the_air.png create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_popular.png create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_top_rated.png diff --git a/plugin.video.alfa/channels/goovie.json b/plugin.video.alfa/channels/goovie.json new file mode 100644 index 00000000..1825251d --- /dev/null +++ b/plugin.video.alfa/channels/goovie.json @@ -0,0 +1,79 @@ +{ +"id": "goovie", + "name": "Goovie", + "active": true, + "adult": false, + "language": ["cast", "lat"], + "thumbnail": "https://s15.postimg.cc/n9wp4nnzv/goovie.png", + "banner": "", + "categories": [ + "movie", + "tvshow" + ], + "settings": [ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "Latino", + "Castellano", + "VOSE", + "VO" + ] + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "comprueba_enlaces", + "type": "bool", + "label": "Verificar si los enlaces existen", + "default": false, + "enabled": true, + "visible": true + }, + { + "id": "comprueba_enlaces_num", + "type": "list", + "label": "Número de enlaces a verificar", + "default": 1, + "enabled": true, + "visible": "eq(-1,true)", + "lvalues": [ "5", "10", "15", "20" ] + } + ] +} diff --git a/plugin.video.alfa/channels/goovie.py b/plugin.video.alfa/channels/goovie.py new file mode 100644 index 00000000..2948cf73 --- /dev/null +++ b/plugin.video.alfa/channels/goovie.py @@ -0,0 +1,329 @@ +# -*- coding: utf-8 -*- +# -*- Channel Goovie -*- +# -*- Created for Alfa-addon -*- +# -*- By the Alfa Develop Group -*- + +import re +import urllib +from channelselector import get_thumb +from core import httptools +from core import jsontools +from core import scrapertools +from core import servertools +from core import tmdb +from core.item import Item +from channels import filtertools +from channels import autoplay +from platformcode import config, logger + + +IDIOMAS = {'1':'Cast', '2':'Lat', '3':'VOSE', '4':'VO'} +list_language = IDIOMAS.values() + +CALIDADES = {'1':'1080','2':'720','3':'480','4':'360'} + +list_quality = ['1080', '720', '480', '360'] + +list_servers = [ + 'powvideo' +] + +__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'goovie') +__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'goovie') + +host = 'https://goovie.co/' + +def mainlist(item): + logger.info() + + autoplay.init(item.channel, list_servers, list_quality) + + itemlist = [] + + itemlist.append(Item(channel=item.channel, title='Peliculas', action='sub_menu', type='peliculas', + thumbnail= get_thumb('movies', auto=True))) + itemlist.append(Item(channel=item.channel, title='Series', action='sub_menu', type='series', + thumbnail= get_thumb('tvshows', auto=True))) + itemlist.append( + item.clone(title="Buscar", action="search", url=host + 'search?go=', thumbnail=get_thumb("search", auto=True), + extra='movie')) + + autoplay.show_option(item.channel, itemlist) + + return itemlist + +def sub_menu(item): + logger.info() + + itemlist=[] + + itemlist.append(Item(channel=item.channel, title='Todas', url=host + item.type, action='list_all', + thumbnail=get_thumb('all', auto=True), type=item.type)) + itemlist.append(Item(channel=item.channel, title='Genero', action='section', + thumbnail=get_thumb('genres', auto=True), type=item.type)) + itemlist.append(Item(channel=item.channel, title='Por Año', action='section', + thumbnail=get_thumb('year', auto=True), type=item.type)) + + return itemlist + +def get_source(url): + logger.info() + data = httptools.downloadpage(url).data + data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) + return data + + +def get_language(lang_data): + logger.info() + language = [] + + lang_list = scrapertools.find_multiple_matches(lang_data, '/flags/(.*?).png\)') + for lang in lang_list: + if lang == 'en': + lang = 'vose' + if lang not in language: + language.append(lang) + return language + +def section(item): + logger.info() + itemlist=[] + data = get_source(host+item.type) + + if 'Genero' in item.title: + data = scrapertools.find_single_match(data, 'genero.*?') + elif 'Año' in item.title: + data = scrapertools.find_single_match(data, 'año.*?') + patron = '(.*?)' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedtitle in matches: + title = scrapedtitle + itemlist.append(Item(channel=item.channel, url=scrapedurl, title=title, action='list_all', + type=item.type)) + return itemlist + + +def list_all(item): + logger.info() + itemlist = [] + + data = get_source(item.url) + #logger.debug(data) + #return + if item.type == 'peliculas': + patron = '
.*?.*?

(.*?)

.*?' + patron += "

(.*?)

(\d{4}) /.*?.*?'(\d+)'" + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedthumbnail, scrapedurl, scrapedtitle, scrapedplot, year, video_id in matches: + + title = '%s [%s]' % (scrapedtitle, year) + contentTitle = scrapedtitle + thumbnail = scrapedthumbnail + url = scrapedurl + + itemlist.append(item.clone(action='findvideos', + title=title, + url=url, + thumbnail=thumbnail, + contentTitle=contentTitle, + video_id=video_id, + infoLabels={'year':year})) + + elif item.type == 'series': + patron = '
.*?.*?.*?' + patron +='

(.*?)

(.*?)

(\d{4}) /' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot, year in matches: + title = scrapedtitle + contentSerieName = scrapedtitle + thumbnail = scrapedthumbnail + url = scrapedurl + + itemlist.append(item.clone(action='seasons', + title=title, + url=url, + thumbnail=thumbnail, + plot=scrapedplot, + contentSerieName=contentSerieName, + infoLabels={'year':year})) + + tmdb.set_infoLabels(itemlist, seekTmdb=True) + # Paginación + + url_next_page = scrapertools.find_single_match(data,"") + if url_next_page: + itemlist.append(item.clone(title="Siguiente >>", url=url_next_page, action='list_all')) + + return itemlist + +def seasons(item): + logger.info() + + itemlist=[] + + data=get_source(item.url) + patron='
' + matches = re.compile(patron, re.DOTALL).findall(data) + + infoLabels = item.infoLabels + for season in matches: + season = season.lower().replace('temporada','') + infoLabels['season']=season + title = 'Temporada %s' % season + itemlist.append(Item(channel=item.channel, title=title, url=item.url, action='episodesxseasons', + infoLabels=infoLabels)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + if config.get_videolibrary_support() and len(itemlist) > 0: + itemlist.append( + Item(channel=item.channel, title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url, + action="add_serie_to_library", extra="episodios", contentSerieName=item.contentSerieName)) + + return itemlist + +def episodios(item): + logger.info() + itemlist = [] + templist = seasons(item) + for tempitem in templist: + itemlist += episodesxseasons(tempitem) + + return itemlist + +def episodesxseasons(item): + logger.info() + + itemlist = [] + + data=get_source(item.url) + logger.debug(data) + patron= "ViewEpisode\('(\d+)', this\)>
%s - (\d+)
" % item.infoLabels['season'] + patron += ".*?src=(.*?) />.*?namep>(.*?)" + + matches = re.compile(patron, re.DOTALL).findall(data) + + infoLabels = item.infoLabels + + for video_id, scrapedepisode, scrapedthumbnail, scrapedtitle in matches: + + infoLabels['episode'] = scrapedepisode + title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle) + + itemlist.append(Item(channel=item.channel, title= title, url=item.url, thumbnail=scrapedthumbnail, + action='findvideos', video_id=video_id, infoLabels=infoLabels)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist + + +def findvideos(item): + logger.info() + from lib import jsunpack + itemlist = [] + headers = {'referer':item.url} + if item.video_id == '': + find_id = get_source(item.url) + #logger.debug(find_id) + #return + item.video_id = scrapertools.find_single_match(find_id, 'var centerClick = (\d+);') + url = 'https://goovie.co/api/links/%s' % item.video_id + data = httptools.downloadpage(url, headers=headers).data + video_list = jsontools.load(data) + for video_info in video_list: + logger.debug(video_info) + url = video_info['visor'] + plot = 'idioma: %s calidad: %s' % (video_info['idioma'], video_info['calidad']) + data = httptools.downloadpage(url, headers=headers, follow_redirects=False).data + data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) + packed = scrapertools.find_single_match(data, '(eval\(.*?);var') + unpacked = jsunpack.unpack(packed) + logger.debug('unpacked %s' % unpacked) + server = scrapertools.find_single_match(unpacked, "src:.'(http://\D+)/") + id = scrapertools.find_single_match(unpacked, "src:.'http://\D+/.*?description:.'(.*?).'") + if server == '': + if 'powvideo' in unpacked: + id = scrapertools.find_single_match(unpacked ,",description:.'(.*?).'") + server= 'https://powvideo.net' + url = '%s/%s' % (server, id) + if server != '' and id != '': + language = IDIOMAS[video_info['idioma']] + quality = CALIDADES[video_info['calidad']] + title = ' [%s] [%s]' % (language, quality) + itemlist.append(Item(channel=item.channel, title='%s'+title, url=url, action='play', language=language, + quality=quality)) + + itmelist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + return sorted(itemlist, key=lambda i: i.language) + + +def search(item, texto): + logger.info() + texto = texto.replace(" ", "+") + item.url = item.url + texto + item.type = 'peliculas' + if texto != '': + return search_results(item) + else: + return [] + +def search_results(item): + logger.info() + + itemlist=[] + + data=get_source(item.url) + logger.debug(data) + patron = '
.*?href=(.*?)>.*?typeContent>(.*?)<.*?' + patron += '.*?

(.*?)

(.*?)

(\d{4})<' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, content_type ,scrapedthumb, scrapedtitle, scrapedplot, year in matches: + + title = scrapedtitle + url = scrapedurl + thumbnail = scrapedthumb + plot = scrapedplot + if content_type != 'Serie': + action = 'findvideos' + else: + action = 'seasons' + + new_item=Item(channel=item.channel, title=title, url=url, thumbnail=thumbnail, plot=plot, + action=action, type=content_type, infoLabels={'year':year}) + if new_item.action == 'findvideos': + new_item.contentTitle = new_item.title + else: + new_item.contentSerieName = new_item.title + + itemlist.append(new_item) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria in ['peliculas']: + item.url = host + 'peliculas' + elif categoria == 'infantiles': + item.url = host + 'peliculas/generos/animación' + elif categoria == 'terror': + item.url = host + 'peliculas/generos/terror' + item.type='peliculas' + itemlist = list_all(item) + if itemlist[-1].title == 'Siguiente >>': + itemlist.pop() + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + + return itemlist diff --git a/plugin.video.alfa/channels/pelisr.json b/plugin.video.alfa/channels/pelisr.json new file mode 100644 index 00000000..92257e9e --- /dev/null +++ b/plugin.video.alfa/channels/pelisr.json @@ -0,0 +1,79 @@ +{ +"id": "pelisr", + "name": "PelisR", + "active": true, + "adult": false, + "language": ["lat", "cast", "vose"], + "thumbnail": "https://s22.postimg.cc/gcp2jqbs1/pelisr.png", + "banner": "", + "categories": [ + "movie", + "tvshow", + "direct" + ], + "settings": [ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "Latino", + "Castellano", + "VOSE" + ] + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "comprueba_enlaces", + "type": "bool", + "label": "Verificar si los enlaces existen", + "default": false, + "enabled": true, + "visible": true + }, + { + "id": "comprueba_enlaces_num", + "type": "list", + "label": "Número de enlaces a verificar", + "default": 1, + "enabled": true, + "visible": "eq(-1,true)", + "lvalues": [ "5", "10", "15", "20" ] + } + ] +} diff --git a/plugin.video.alfa/channels/pelisr.py b/plugin.video.alfa/channels/pelisr.py new file mode 100644 index 00000000..7d826449 --- /dev/null +++ b/plugin.video.alfa/channels/pelisr.py @@ -0,0 +1,366 @@ +# -*- coding: utf-8 -*- +# -*- Channel PoseidonHD -*- +# -*- Created for Alfa-addon -*- +# -*- By the Alfa Develop Group -*- + +import re +import urllib +import base64 + +from channelselector import get_thumb +from core import httptools +from core import jsontools +from core import scrapertools +from core import servertools +from core import tmdb +from lib import jsunpack +from core.item import Item +from channels import filtertools +from channels import autoplay +from platformcode import config, logger + + +IDIOMAS = {'mx': 'Latino', 'dk':'Latino', 'es': 'Castellano', 'en': 'VOSE', 'gb':'VOSE'} +list_language = IDIOMAS.values() + +list_quality = ['360P', '480P', '720P', '1080P'] + +list_servers = [ + 'directo', + 'openload', + 'rapidvideo' +] + +__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'poseidonhd') +__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'poseidonhd') + +host = 'https://pelisr.com/' + +def mainlist(item): + logger.info() + + autoplay.init(item.channel, list_servers, list_quality) + + itemlist = [] + + itemlist.append(Item(channel=item.channel, title='Peliculas', action='menu_movies', + thumbnail= get_thumb('movies', auto=True))) + itemlist.append(Item(channel=item.channel, title='Series', url=host+'tvshows', action='list_all', type='tvshows', + thumbnail= get_thumb('tvshows', auto=True))) + itemlist.append( + item.clone(title="Buscar", action="search", url=host + '?s=', thumbnail=get_thumb("search", auto=True), + extra='movie')) + + autoplay.show_option(item.channel, itemlist) + + return itemlist + +def menu_movies(item): + logger.info() + + itemlist=[] + + itemlist.append(Item(channel=item.channel, title='Todas', url=host + 'movies', action='list_all', + thumbnail=get_thumb('all', auto=True), type='movies')) + itemlist.append(Item(channel=item.channel, title='Genero', action='section', + thumbnail=get_thumb('genres', auto=True), type='movies')) + itemlist.append(Item(channel=item.channel, title='Por Año', action='section', + thumbnail=get_thumb('year', auto=True), type='movies')) + + return itemlist + +def get_source(url): + logger.info() + data = httptools.downloadpage(url).data + data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) + return data + + +def get_language(lang_data): + logger.info() + language = [] + logger.debug(lang_data) + lang_list = scrapertools.find_multiple_matches(lang_data, '/flags/(.*?).png\)') + for lang in lang_list: + if lang == 'en': + lang = 'vose' + if lang not in language: + language.append(lang) + return language + +def section(item): + logger.info() + itemlist=[] + duplicados=[] + data = get_source(host+'/'+item.type) + if 'Genero' in item.title: + patron = '
  • (.*?)/i>' + elif 'Año' in item.title: + patron = '
  • (.*?)' + elif 'Calidad' in item.title: + patron = 'menu-item-object-dtquality menu-item-\d+>(.*?)' + + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedtitle in matches: + title = scrapedtitle + plot='' + if 'Genero' in item.title: + quantity = scrapertools.find_single_match(scrapedtitle,' (.*?)<') + title = scrapertools.find_single_match(scrapedtitle,'(.*?)
    (.*?).*?quality>(.*?)' + patron += '<\/div>.*?<\/h3>(.*?)<\/span><\/div>.*?flags(.*?)metadata' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedthumbnail, scrapedtitle, quality, scrapedurl, year, lang_data in matches: + + + title = '%s [%s] [%s]' % (scrapedtitle, year, quality) + contentTitle = scrapedtitle + thumbnail = scrapedthumbnail + url = scrapedurl + language = get_language(lang_data) + + itemlist.append(item.clone(action='findvideos', + title=title, + url=url, + thumbnail=thumbnail, + contentTitle=contentTitle, + language=language, + quality=quality, + infoLabels={'year':year})) + + elif item.type == 'tvshows': + patron = '
    (.*?).*?' + patron += '.*?<\/h3>(.*?)<\/span><\/div>' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedthumbnail, scrapedtitle, scrapedurl, year in matches: + title = scrapedtitle + contentSerieName = scrapedtitle + thumbnail = scrapedthumbnail + url = scrapedurl + + itemlist.append(item.clone(action='seasons', + title=title, + url=url, + thumbnail=thumbnail, + contentSerieName=contentSerieName, + infoLabels={'year':year})) + + tmdb.set_infoLabels(itemlist, seekTmdb=True) + # Paginación + + #url_next_page = scrapertools.find_single_match(data,"]+)>