diff --git a/.gitignore b/.gitignore index bac54407..bd02e367 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ *.pyc .DS_Store .idea/ +.dev +.directory +__pycache__/ diff --git a/README.md b/README.md index 3b978d6c..9b2d921b 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,23 @@ ### Un fork italiano di [Alfa](https://github.com/alfa-addon) Ognuno è libero (anzi, invitato!) a collaborare, per farlo è possibile utilizzare i pull request. -KOD come Alfa è sotto licenza GPL v3, pertanto, siete liberi di utilizzare parte del codice, a patto di rispettare i termini di suddetta licenza, che si possono riassumere in: +KOD, come Alfa, è sotto licenza GPL v3, pertanto siete liberi di utilizzare parte del codice, a patto di rispettare i termini di suddetta licenza, che si possono riassumere in: - Il tuo addon deve essere rilasciando secondo la stessa licenza, ovvero essere open source (il fatto che lo zip sia visibile da chiunque non ha importanza, è necessario avere un repository git come questo) -- Aggiungere i crediti a tutto ciò che copiate/modificate, ad esempio aggiungendo un commento nel file in questione o meglio facendo un cherry-pick (in modo da preservare lo storico) +- Aggiungere i crediti a tutto ciò che copiate/modificate, ad esempio aggiungendo un commento nel file in questione o, meglio, facendo un cherry-pick (in modo da preservarnee lo storico) ### Come contribuire? -- Forka il repository. -- Effettua tutte le modifiche e pusha nel tuo repository remoto. +- Fai un Fork del repository. +- Effettua tutte le modifiche e fai un push nel tuo repository remoto. - Testa tutte le funzioni principali (videoteca, autoplay, scraper web) o eventuali aggiunte extra. - Apri una pull request. -### Qualcosa non funziona -Sentiti pure libero di segnalarlo al team [qui](https://github.com/kodiondemand/addon/issues) +Regole per le collaborazioni: +- Se si riutilizza codice proveniente da altri addon è necessario citarne la fonte, per rispetto di chi ci ha lavorato, in caso contrario il pull request verrà respinto. +- Ogni modifica o novità inviata dev'essere testata, può capitare che vi sia sfuggito qualche bug (è normale), ma l'invio di materiale senza preventivi controlli non è gradito. +- I nuovi canali devono essere funzionanti e completi di tutte le feature, comprese videoteca ed autoplay, non verranno accettati finchè non lo saranno. + +Se parte del codice di un tuo addon è stato incluso in questo progetto e ne desideri l'eliminazione, crea una issue portando le prove di essere veramente uno dei dev e lo elimineremo. + +### Qualcosa non funziona? +Sentiti libero di segnalarlo al team [qui](https://github.com/kodiondemand/addon/issues) diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py index 2d40139a..66373661 100644 --- a/channels/altadefinizioneclick.py +++ b/channels/altadefinizioneclick.py @@ -14,7 +14,7 @@ host = "https://altadefinizione.center" ### <- cambio Host da .fm a .center IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube'] +list_servers = ['verystream', 'openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube'] list_quality = ['1080p'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'altadefinizioneclick') diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index cafadb64..11fdfe01 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -17,7 +17,7 @@ host = "https://animepertutti.com" # Richiesto per Autoplay IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango'] +list_servers = ['verystream', 'openload', 'streamango'] list_quality = ['default'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeleggendari') diff --git a/channels/autoplay.py b/channels/autoplay.py index 3a3af8ce..80d5d33f 100644 --- a/channels/autoplay.py +++ b/channels/autoplay.py @@ -163,7 +163,7 @@ def start(itemlist, item): if len(quality_list) == 0: quality_list =['default'] - # Se guardan los textos de cada servidor y calidad en listas p.e. favorite_servers = ['openload', + # Se guardan los textos de cada servidor y calidad en listas p.e. favorite_servers = ['verystream', 'openload', # 'streamcloud'] for num in range(1, 4): favorite_servers.append(channel_node['servers'][settings_node['server_%s' % num]].lower()) diff --git a/channels/casacinema.py b/channels/casacinema.py index 7c93ef06..2c299acf 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -16,7 +16,7 @@ host = 'https://www.casacinema.site' IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'wstream', 'speedvideo'] +list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] list_quality = ['HD', 'SD'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'casacinema') diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index e82820bd..1c198b7d 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -14,7 +14,7 @@ host = 'https://casacinema.info' IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'wstream', 'speedvideo'] +list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] list_quality = ['1080p', '720', '480p', '360p'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'casacinema') diff --git a/channels/cineblog01.py b/channels/cineblog01.py index b5d470a7..ec7f3614 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -24,7 +24,7 @@ def findhost(): IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'wstream'] +list_servers = ['verystream', 'openload', 'streamango', 'wstream'] list_quality = ['HD', 'default'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cineblog01') diff --git a/channels/cinehindi.py b/channels/cinehindi.py index ce7f8594..20f3ac0d 100644 --- a/channels/cinehindi.py +++ b/channels/cinehindi.py @@ -16,7 +16,7 @@ from platformcode import config, logger IDIOMAS = {'Hindi': 'Hindi'} list_language = IDIOMAS.values() list_quality = [] -list_servers = ['openload', 'netutv'] +list_servers = ['verystream', 'openload', 'netutv'] host = "http://www.cinehindi.com/" diff --git a/channels/doramasmp4.py b/channels/doramasmp4.py index 2de827ee..2ab0d6c5 100644 --- a/channels/doramasmp4.py +++ b/channels/doramasmp4.py @@ -21,7 +21,7 @@ host = 'https://www4.doramasmp4.com/' IDIOMAS = {'sub': 'VOSE', 'VO': 'VO'} list_language = IDIOMAS.values() list_quality = [] -list_servers = ['openload', 'streamango', 'netutv', 'okru', 'directo', 'mp4upload'] +list_servers = ['verystream', 'openload', 'streamango', 'netutv', 'okru', 'directo', 'mp4upload'] def get_source(url, referer=None): logger.info() diff --git a/channels/estrenosdoramas.py b/channels/estrenosdoramas.py index 90331adc..0566a1b9 100644 --- a/channels/estrenosdoramas.py +++ b/channels/estrenosdoramas.py @@ -23,7 +23,7 @@ IDIOMAS = {'Latino': 'LAT', 'Vo':'VO', 'Vose': 'VOSE'} IDIOMA = "no filtrar" list_language = IDIOMAS.values() list_quality = [] -list_servers = ['openload', 'streamango', 'netutv', 'okru', 'mp4upload'] +list_servers = ['verystream', 'openload', 'streamango', 'netutv', 'okru', 'mp4upload'] def get_source(url, referer=None): logger.info() diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 33f83ab0..58a2fe2d 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -13,7 +13,7 @@ from platformcode import logger, config from channelselector import thumb host = "https://eurostreaming.cafe" -list_servers = ['openload', 'speedvideo', 'wstream', 'streamango' 'flashx', 'nowvideo'] +list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'streamango' 'flashx', 'nowvideo'] list_quality = ['default'] diff --git a/channels/fastsubita.py b/channels/fastsubita.py index eb75938b..dc63af08 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -15,7 +15,7 @@ host = "http://fastsubita.com" IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome'] +list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome'] list_quality = ['default'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'fastsubita') diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index e486f9be..646fce27 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -14,7 +14,7 @@ from channelselector import thumb host = "https://www.filmpertutti.club" headers = [['Referer', host]] -list_servers = ['openload', 'streamango', 'wstream', 'akvideo'] +list_servers = ['verystream', 'openload', 'streamango', 'wstream', 'akvideo'] list_quality = ['HD', 'SD'] diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py index 69ddd340..aa024154 100644 --- a/channels/filmsenzalimiti.py +++ b/channels/filmsenzalimiti.py @@ -21,7 +21,7 @@ host = 'https://filmsenzalimiti.space' IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'vidoza', 'okru'] +list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru'] list_quality = ['1080p', '720p', '480p', '360'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmsenzalimiti') diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index 3834741b..befd5c30 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -19,7 +19,7 @@ __channel__ = 'filmsenzalimiticc' IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'vidlox', 'youtube'] +list_servers = ['verystream', 'openload', 'vidlox', 'youtube'] list_quality = ['default'] # Necessario per Verifica Link diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index df7e2e57..187bec65 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -18,7 +18,7 @@ host = "https://ilgeniodellostreaming.pw" IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'youtube'] +list_servers = ['verystream', 'openload', 'streamango', 'youtube'] list_quality = ['default'] diff --git a/channels/infoplus.py b/channels/infoplus.py index 63d4da80..77fdcea5 100644 --- a/channels/infoplus.py +++ b/channels/infoplus.py @@ -16,6 +16,10 @@ from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger from platformcode import platformtools +import xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + global mainWindow mainWindow = list() ActoresWindow = None @@ -1509,10 +1513,10 @@ class ActorInfo(xbmcgui.WindowDialog): self.dialog = kwargs.get('dialog') if self.item.contentType == "movie": tipo = "movie" - search = {'url': 'person/%s' % self.id, 'language': 'es', 'append_to_response': 'movie_credits,images'} + search = {'url': 'person/%s' % self.id, 'language': def_lang, 'append_to_response': 'movie_credits,images'} else: tipo = "tv" - search = {'url': 'person/%s' % self.id, 'language': 'es', 'append_to_response': 'tv_credits,images'} + search = {'url': 'person/%s' % self.id, 'language': def_lang, 'append_to_response': 'tv_credits,images'} actor_tmdb = tmdb.Tmdb(discover=search) if not actor_tmdb.result.get("biography") and actor_tmdb.result.get("imdb_id"): @@ -2249,7 +2253,7 @@ def get_recomendations(item, infoLabels, recomendaciones): tipo = item.contentType if tipo != "movie": tipo = "tv" - search = {'url': '%s/%s/recommendations' % (tipo, infoLabels['tmdb_id']), 'language': 'es', 'page': 1} + search = {'url': '%s/%s/recommendations' % (tipo, infoLabels['tmdb_id']), 'language': def_lang, 'page': 1} reco_tmdb = tmdb.Tmdb(discover=search, tipo=tipo, idioma_busqueda="es") for i in range(0, len(reco_tmdb.results)): @@ -2307,8 +2311,8 @@ def fanartv(item, infoLabels, images={}): headers = [['Content-Type', 'application/json']] id_search = infoLabels.get('tvdb_id') if item.contentType != "movie" and not id_search: - search = {'url': 'tv/%s/external_ids' % infoLabels['tmdb_id'], 'language': 'es'} - ob_tmdb = tmdb.Tmdb(discover=search, idioma_busqueda='es') + search = {'url': 'tv/%s/external_ids' % infoLabels['tmdb_id'], 'language': def_lang} + ob_tmdb = tmdb.Tmdb(discover=search, idioma_busqueda=def_lang) id_search = ob_tmdb.result.get("tvdb_id") elif item.contentType == "movie": id_search = infoLabels.get('tmdb_id') diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py index 4f8ee62c..ceb38433 100644 --- a/channels/italiafilmhd.py +++ b/channels/italiafilmhd.py @@ -16,7 +16,7 @@ from platformcode import logger, config IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'youtube'] +list_servers = ['verystream', 'openload', 'youtube'] list_quality = ['default'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'italiafilmhd') diff --git a/channels/playview.py b/channels/playview.py index ed093f00..9e9c02ef 100644 --- a/channels/playview.py +++ b/channels/playview.py @@ -19,7 +19,7 @@ from channelselector import get_thumb IDIOMAS = {'Latino':'Lat', 'Español':'Cast', 'Subtitulado':'VOSE'} list_language = IDIOMAS.values() list_quality = ['HD 1080p', 'HD 720p', 'DVDRIP', 'CAM'] -list_servers = ['openload', 'vidoza', 'clipwatching', 'fastplay', 'flashx', 'gamovideo', 'powvideo', 'streamango', +list_servers = ['verystream', 'openload', 'vidoza', 'clipwatching', 'fastplay', 'flashx', 'gamovideo', 'powvideo', 'streamango', 'streamcherry', 'rapidvideo'] host = 'https://playview.io/' diff --git a/channels/search.py b/channels/search.py index f8242748..5c15661e 100644 --- a/channels/search.py +++ b/channels/search.py @@ -14,6 +14,10 @@ from platformcode import config, logger from platformcode import platformtools from core import tmdb +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + link_list = [] max_links = 30 @@ -92,7 +96,7 @@ def sub_menu(item): thumbnail = get_thumb("search_star.png") itemlist.append(Item(channel='tvmoviedb', title=config.get_localized_string(70036), action="search_", - search={'url': 'search/person', 'language': 'es', 'page': 1}, star=True, + search={'url': 'search/person', 'language': def_lang, 'page': 1}, star=True, thumbnail=thumbnail)) itemlist.append(Item(channel=item.channel, action="search", @@ -180,8 +184,8 @@ def setting_channel_new(item): config.get_localized_string(70571), config.get_localized_string(70572), config.get_localized_string(70573), - config.get_localized_string(70574), - config.get_localized_string(70575), + # config.get_localized_string(70574), + # config.get_localized_string(70575), config.get_localized_string(70576) ] presel_values = ['skip', 'actual', 'all', 'none', 'cast', 'lat', 'ita'] @@ -623,7 +627,7 @@ def do_search(item, categories=None): from_action="search", from_channel=element["item"].channel, tecleado=tecleado)) # todos los resultados juntos, en la misma lista else: - title = " [ Resultados del canal %s ] " % channel + title = config.get_localized_string(70697) % channel itemlist.append(Item(title=title, channel="search", action="", folder=False, text_bold=True, from_channel=channel)) for i in element["itemlist"]: @@ -710,7 +714,7 @@ def discover_list(item): tvshow = True new_item = Item(channel='search', title=title, infoLabels=elem, action='search_tmdb', extra=title, - category='Resultados', context ='') + category=config.get_localized_string(70695), context ='') if tvshow: new_item.contentSerieName = title diff --git a/channels/searchall.py b/channels/searchall.py index 82d83ff7..e5339d83 100644 --- a/channels/searchall.py +++ b/channels/searchall.py @@ -283,7 +283,7 @@ def discover_list(item): tvshow = True new_item = Item(channel='searchall', title=title, infoLabels=elem, action='search_tmdb', extra=title, - category='Resultados', context='') + category=config.get_localized_string(70695), context='') if tvshow: new_item.contentSerieName = title diff --git a/channels/seriehd.py b/channels/seriehd.py index d5b41913..440c1651 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -15,7 +15,7 @@ host = "https://seriehd.casa/" IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'thevideome'] +list_servers = ['verystream', 'openload', 'streamango', 'thevideome'] list_quality = ['1080p', '720p', '480p', '360'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'seriehd') diff --git a/channels/side_menu.py b/channels/side_menu.py index 5ee50c5d..d63d59a4 100644 --- a/channels/side_menu.py +++ b/channels/side_menu.py @@ -8,6 +8,10 @@ from platformcode import config, logger from platformcode import launcher import xbmc, xbmcgui, xbmcplugin, xbmcaddon, channelselector +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + media_path = os.path.join(config.get_runtime_path(), "resources/skins/Default/media/side_menu/") menu_settings_path = os.path.join(config.get_data_path(), "settings_channels", 'menu_settings_data.json') @@ -309,7 +313,7 @@ class Main(xbmcgui.WindowXMLDialog): new_item = Item(channel='search', action="search") elif control == config.get_localized_string(70036): new_item = Item(channel='tvmoviedb', title="Buscar actor/actriz", action="search_", - search={'url': 'search/person', 'language': 'es', 'page': 1}, star=True) + search={'url': 'search/person', 'language': def_lang, 'page': 1}, star=True) elif control == config.get_localized_string(70010): new_item = Item(channel='search', action="setting_channel") elif control == '': diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index c6efc954..748c225d 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -3,7 +3,7 @@ from core.item import Item host = 'https://www.streamingaltadefinizione.world/' -list_servers = ['openload', 'wstream'] +list_servers = ['verystream', 'openload', 'wstream'] list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM'] def mainlist(item): diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 6e1a3f74..7d84a445 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -17,7 +17,7 @@ from platformcode import logger IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'vidlox', 'youtube'] +list_servers = ['verystream', 'openload', 'streamango', 'vidlox', 'youtube'] list_quality = ['default'] __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'tantifilm') diff --git a/channels/trailertools.py b/channels/trailertools.py index 17a50200..aa76dad7 100644 --- a/channels/trailertools.py +++ b/channels/trailertools.py @@ -15,6 +15,10 @@ from core.item import Item from platformcode import config, logger from platformcode import platformtools +import xbmc, xbmcaddon +addon = xbmcaddon.Addon('metadata.themoviedb.org') +def_lang = addon.getSetting('language') + result = None window_select = [] # Para habilitar o no la opción de búsqueda manual @@ -128,7 +132,7 @@ def tmdb_trailers(item, tipo="movie"): itemlist = [] tmdb_search = None if item.infoLabels['tmdb_id']: - tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, idioma_busqueda='es') + tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, idioma_busqueda=def_lang) elif item.infoLabels['year']: tmdb_search = Tmdb(texto_buscado=item.contentTitle, tipo=tipo, year=item.infoLabels['year']) diff --git a/channels/tvmoviedb.py b/channels/tvmoviedb.py index 0db4ce3b..24bc74a2 100644 --- a/channels/tvmoviedb.py +++ b/channels/tvmoviedb.py @@ -547,7 +547,7 @@ def detalles(item): title=config.get_localized_string(70070) % item.infoLabels['originaltitle'])) if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: - tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda='es') + tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda=def_lang) if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle \ and tmdb_lang.result["title"] != item.infoLabels['originaltitle']: tmdb_lang = tmdb_lang.result["title"] @@ -1499,7 +1499,7 @@ def detalles_fa(item): title=config.get_localized_string(70070) % item.infoLabels['originaltitle'])) if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: - tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda='es') + tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.extra, idioma_busqueda=def_lang) if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle: tmdb_lang = tmdb_lang.result["title"] itemlist.append(item.clone(action="busqueda", title=config.get_localized_string(70066) % tmdb_lang, diff --git a/channels/vedohd.py b/channels/vedohd.py index 195a2842..a0fc6439 100644 --- a/channels/vedohd.py +++ b/channels/vedohd.py @@ -31,7 +31,7 @@ def findhost(): IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['openload', 'streamango', 'wstream'] +list_servers = ['verystream', 'openload', 'streamango', 'wstream'] list_quality = ['HD', 'SD'] #esclusione degli articoli 'di servizio' diff --git a/channelselector.py b/channelselector.py index d90e39d6..65c454e0 100644 --- a/channelselector.py +++ b/channelselector.py @@ -7,6 +7,9 @@ from core import channeltools from core.item import Item from platformcode.unify import thumb_dict from platformcode import config, logger, unify +import xbmcaddon +addon = xbmcaddon.Addon('plugin.video.kod') +downloadenabled = addon.getSetting('downloadenabled') def getmainlist(view="thumb_"): @@ -44,11 +47,11 @@ def getmainlist(view="thumb_"): category=config.get_localized_string(30119), viewmode="thumbnails", context=[{"title": config.get_localized_string(70287), "channel": "videolibrary", "action": "channel_config"}])) - - itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", - thumbnail=get_thumb("downloads.png", view), viewmode="list", - context=[{"title": config.get_localized_string(70288), "channel": "setting", "config": "downloads", - "action": "channel_config"}])) + if downloadenabled != "false": + itemlist.append(Item(title=config.get_localized_string(30101), channel="downloads", action="mainlist", + thumbnail=get_thumb("downloads.png", view), viewmode="list", + context=[{"title": config.get_localized_string(70288), "channel": "setting", "config": "downloads", + "action": "channel_config"}])) thumb_setting = "setting_%s.png" % 0 # config.get_setting("plugin_updates_available") diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 2272d192..6befc842 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -278,11 +278,11 @@ def render_items(itemlist, parent_item): else: if 'similar' in parent_item.list_type: if parent_item.contentTitle != '': - breadcrumb = 'Similares (%s)' % parent_item.contentTitle + breadcrumb = config.get_localized_string(70693) + parent_item.contentTitle else: - breadcrumb = 'Similares (%s)' % parent_item.contentSerieName + breadcrumb = config.get_localized_string(70693) + parent_item.contentSerieName else: - breadcrumb = 'Busqueda' + breadcrumb = config.get_localized_string(70693) xbmcplugin.setPluginCategory(handle=int(sys.argv[1]), category=breadcrumb) @@ -894,8 +894,12 @@ def get_dialogo_opciones(item, default_action, strm, autoplay): opciones.append(config.get_localized_string(30164)) else: # "Descargar" - opcion = config.get_localized_string(30153) - opciones.append(opcion) + import xbmcaddon + addon = xbmcaddon.Addon('plugin.video.kod') + downloadenabled = addon.getSetting('downloadenabled') + if downloadenabled != "false": + opcion = config.get_localized_string(30153) + opciones.append(opcion) if item.isFavourite: # "Quitar de favoritos" @@ -960,6 +964,15 @@ def set_opcion(item, seleccion, opciones, video_urls): # "Descargar" elif opciones[seleccion] == config.get_localized_string(30153): from channels import downloads + import xbmcaddon + import xbmcgui + __addon__ = xbmcaddon.Addon() + __addonname__ = __addon__.getAddonInfo('name') + line1 = config.get_localized_string(70690) + line2 = config.get_localized_string(70691) + line3 = config.get_localized_string(70692) + xbmcgui.Dialog().ok(__addonname__, line1, line2, line3) + if item.contentType == "list" or item.contentType == "tvshow": item.contentType = "video" item.play_menu = True diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 4da28f65..b8491517 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -10439,4 +10439,35 @@ msgstr "" msgctxt "#70688" msgid "Episode 0 is a special episode, enter the number of this episode" +msgstr "" + +msgctxt "#70689" +msgid "Enable Download" +msgstr "" + +msgctxt "#70690" +msgid "Disclaimer" +msgstr "Disclaimer" + +msgctxt "#70691" +msgid "Using the download function you declare that you have a physical copy and use this function as a backup of the same." +msgstr "" +msgctxt "#70692" +msgid "The KOD team assumes no responsibility for the use that is made of this proposed function" +msgstr "" + +msgctxt "#70693" +msgid "Search" +msgstr "" + +msgctxt "#70694" +msgid "Similar to " +msgstr "" + +msgctxt "#70695" +msgid "Results" +msgstr "" + +msgctxt "#70697" +msgid " [Results of the %s channel] " msgstr "" \ No newline at end of file diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index cd9d969f..58d53ade 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5428,4 +5428,36 @@ msgstr "Inserisci il numero dell'episodio di partenza" msgctxt "#70688" msgid "Episode 0 is a special episode, enter the number of this episode" -msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio" \ No newline at end of file +msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio" + +msgctxt "#70689" +msgid "Enable Download" +msgstr "Abilita Download" + +msgctxt "#70690" +msgid "Disclaimer" +msgstr "Disclaimer" + +msgctxt "#70691" +msgid "Utilizzando la funzione di download dichiari di essere in possesso di una copia fisica e di utilizzare questa funzione come backup dello stesso." +msgstr "Utilizzando la funzione di download dichiari di essere in possesso di una copia fisica e di utilizzare questa funzione come backup dello stesso." + +msgctxt "#70692" +msgid "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" +msgstr "Il team di KOD non si assume alcuna responsabilità dell'uso che viene fatto di questa funzione proposta" + +msgctxt "#70693" +msgid "Search" +msgstr "Ricerca" + +msgctxt "#70694" +msgid "Similar to " +msgstr "Simile a " + +msgctxt "#70695" +msgid "Results" +msgstr "Risultati" + +msgctxt "#70697" +msgid " [Results of the %s channel] " +msgstr " [Risultati del canale %s] " \ No newline at end of file diff --git a/resources/settings.xml b/resources/settings.xml index 9d661291..f2ad2286 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -24,12 +24,16 @@ + + + + + + - -