diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 9ac1bfac..5daa868c 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,8 @@  - + @@ -21,7 +24,4 @@ - - - - + \ No newline at end of file diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json old mode 100644 new mode 100755 diff --git a/plugin.video.alfa/channels/setting.py b/plugin.video.alfa/channels/setting.py index 0f34156f..105d2035 100755 --- a/plugin.video.alfa/channels/setting.py +++ b/plugin.video.alfa/channels/setting.py @@ -56,6 +56,11 @@ def mainlist(item): action="channel_config", folder=True, thumbnail=config.get_thumb("thumb_videolibrary.png"))) + if config.is_xbmc(): + itemlist.append(Item(channel=CHANNELNAME, title=" Ajustes de cliente Torrent", + action="setting_torrent", folder=True, + thumbnail=config.get_thumb("thumb_channels_torrent.png"))) + # itemlist.append(Item(channel=CHANNELNAME, title=" Añadir o Actualizar canal/conector desde una URL", # action="menu_addchannels")) itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, @@ -110,6 +115,36 @@ def channel_config(item): item.config)) +def setting_torrent(item): + logger.info() + + default = config.get_setting("torrent_client", server="torrent", default=0) + + torrent_options = ["Preguntar", "Cliente interno", "Cliente interno - MCT"] + torrent_options.extend(platformtools.torrent_client_installed()) + + list_controls = [ + { + "id": "list_torrent", + "type": "list", + "label": "¿Qué cliente quiere usar para reproducir torrent?", + "default": default, + "enabled": True, + "visible": True, + "lvalues": torrent_options + } + ] + + platformtools.show_channel_settings(list_controls=list_controls, callback='save_setting_torrent', item=item, + caption="configuración -- Torrent", custom_button={'visible': False}) + + +def save_setting_torrent(item, dict_data_saved): + + if dict_data_saved and "list_torrent" in dict_data_saved: + config.set_setting("torrent_client", dict_data_saved["list_torrent"], server="torrent") + + def menu_servers(item): logger.info() itemlist = list() diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py index 1308f1c7..1adb53dc 100755 --- a/plugin.video.alfa/platformcode/platformtools.py +++ b/plugin.video.alfa/platformcode/platformtools.py @@ -821,6 +821,23 @@ def set_player(item, xlistitem, mediaurl, view, strm): xbmc_videolibrary.mark_auto_as_watched(item) +def torrent_client_installed(show_tuple=False): + # Plugins externos se encuentra en servers/torrent.json nodo clients + from core import filetools + from core import jsontools + torrent_clients = jsontools.get_node_from_file("torrent.json", "clients", filetools.join(config.get_runtime_path(), + "servers")) + torrent_options = [] + for client in torrent_clients: + if xbmc.getCondVisibility('System.HasAddon("%s")' % client["id"]): + if show_tuple: + torrent_options.append(["Plugin externo: %s" % client["name"], client["url"]]) + else: + torrent_options.append("Plugin externo: %s" % client["name"]) + logger.debug("lista es %s" % torrent_options) + return torrent_options + + def play_torrent(item, xlistitem, mediaurl): logger.info() # Opciones disponibles para Reproducir torrents @@ -828,20 +845,21 @@ def play_torrent(item, xlistitem, mediaurl): torrent_options.append(["Cliente interno (necesario libtorrent)"]) torrent_options.append(["Cliente interno MCT (necesario libtorrent)"]) - # Plugins externos se encuentra en servers/torrent.json nodo clients - from core import filetools - from core import jsontools - torrent_clients = jsontools.get_node_from_file("torrent.json", "clients", filetools.join(config.get_runtime_path(), - "servers")) - for client in torrent_clients: - if xbmc.getCondVisibility('System.HasAddon("%s")' % client["id"]): - torrent_options.append(["Plugin externo: %s" % client["name"], client["url"]]) + torrent_options.extend(torrent_client_installed(show_tuple=True)) + logger.debug("lista2 es %s" % torrent_options) - # todo permitir elegir opción por defecto - if len(torrent_options) > 1: - seleccion = dialog_select("Abrir torrent con...", [opcion[0] for opcion in torrent_options]) + torrent_client = config.get_setting("torrent_client", server="torrent") + + if torrent_client and torrent_client - 1 <= len(torrent_options): + if torrent_client == 0: + seleccion = dialog_select("Abrir torrent con...", [opcion[0] for opcion in torrent_options]) + else: + seleccion = torrent_client - 1 else: - seleccion = 0 + if len(torrent_options) > 1: + seleccion = dialog_select("Abrir torrent con...", [opcion[0] for opcion in torrent_options]) + else: + seleccion = 0 # Plugins externos if seleccion > 1: diff --git a/plugin.video.alfa/resources/media/general/default/thumb_back.png b/plugin.video.alfa/resources/media/general/default/thumb_back.png index 53f34afe..868e09a3 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_back.png and b/plugin.video.alfa/resources/media/general/default/thumb_back.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels.png b/plugin.video.alfa/resources/media/general/default/thumb_channels.png index 33931513..dac93cb3 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_adult.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_adult.png index 4872529b..a61626d0 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_adult.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_adult.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_all.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_all.png index 3fd1bcf1..23dd98da 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_all.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_all.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_anime.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_anime.png index 4bd33d95..030d3ca7 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_anime.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_anime.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_children.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_children.png index e9f99827..fea0c50f 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_children.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_children.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_documentary.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_documentary.png index 8e15f288..cab426d1 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_documentary.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_documentary.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_latino.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_latino.png index 234eed72..63135517 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_latino.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_latino.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie.png index 306e0863..a4dd2fb6 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_az.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_az.png index 8a6feb48..4a5550e8 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_az.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_az.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_hd.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_hd.png index df7b7743..e8cf4b67 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_hd.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_movie_hd.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_torrent.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_torrent.png index 9d353d0e..a7fc417f 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_torrent.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_torrent.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow.png index 07a76f0d..ef595676 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_az.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_az.png index a1c0641c..20252929 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_az.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_az.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_hd.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_hd.png index 5da946c1..e84ced7d 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_hd.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_tvshow_hd.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_channels_vos.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_vos.png index 39d0fc66..82b2cfe3 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_vos.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_vos.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_downloads.png b/plugin.video.alfa/resources/media/general/default/thumb_downloads.png index 14082cb9..0df03f3a 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_downloads.png and b/plugin.video.alfa/resources/media/general/default/thumb_downloads.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_error.png b/plugin.video.alfa/resources/media/general/default/thumb_error.png index c5525c44..7975e145 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_error.png and b/plugin.video.alfa/resources/media/general/default/thumb_error.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_favorites.png b/plugin.video.alfa/resources/media/general/default/thumb_favorites.png index 926d9261..a858457b 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_favorites.png and b/plugin.video.alfa/resources/media/general/default/thumb_favorites.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_folder.png b/plugin.video.alfa/resources/media/general/default/thumb_folder.png index ee4fb28c..200b9555 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_folder.png and b/plugin.video.alfa/resources/media/general/default/thumb_folder.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_help.png b/plugin.video.alfa/resources/media/general/default/thumb_help.png index 74bf65b6..6a706bfe 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_help.png and b/plugin.video.alfa/resources/media/general/default/thumb_help.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_news.png b/plugin.video.alfa/resources/media/general/default/thumb_news.png index 4544474e..888b8fa7 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_news.png and b/plugin.video.alfa/resources/media/general/default/thumb_news.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_next.png b/plugin.video.alfa/resources/media/general/default/thumb_next.png index 6b6f77ef..a2035b8e 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_next.png and b/plugin.video.alfa/resources/media/general/default/thumb_next.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_nofolder.png b/plugin.video.alfa/resources/media/general/default/thumb_nofolder.png index 60a38b02..b1903c50 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_nofolder.png and b/plugin.video.alfa/resources/media/general/default/thumb_nofolder.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_search.png b/plugin.video.alfa/resources/media/general/default/thumb_search.png index 8e009c5a..dae665b3 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_search.png and b/plugin.video.alfa/resources/media/general/default/thumb_search.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_setting_0.png b/plugin.video.alfa/resources/media/general/default/thumb_setting_0.png index 4508c9b6..b6e3d3be 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_setting_0.png and b/plugin.video.alfa/resources/media/general/default/thumb_setting_0.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_setting_1.png b/plugin.video.alfa/resources/media/general/default/thumb_setting_1.png index 6ed700e3..99874f9c 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_setting_1.png and b/plugin.video.alfa/resources/media/general/default/thumb_setting_1.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_setting_2.png b/plugin.video.alfa/resources/media/general/default/thumb_setting_2.png index 5641e7c9..0783ab5f 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_setting_2.png and b/plugin.video.alfa/resources/media/general/default/thumb_setting_2.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_setting_3.png b/plugin.video.alfa/resources/media/general/default/thumb_setting_3.png index 5b9e6427..61586bcf 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_setting_3.png and b/plugin.video.alfa/resources/media/general/default/thumb_setting_3.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_setting_4.png b/plugin.video.alfa/resources/media/general/default/thumb_setting_4.png index bd3c6731..bc162849 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_setting_4.png and b/plugin.video.alfa/resources/media/general/default/thumb_setting_4.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_update.png b/plugin.video.alfa/resources/media/general/default/thumb_update.png index 86f20592..f8619221 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_update.png and b/plugin.video.alfa/resources/media/general/default/thumb_update.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary.png b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary.png index 4e5feca6..3b04d163 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary.png and b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_movie.png b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_movie.png index f91a0379..6eb15923 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_movie.png and b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_movie.png differ diff --git a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_tvshow.png b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_tvshow.png index e1a6d953..a1a2447f 100755 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_tvshow.png and b/plugin.video.alfa/resources/media/general/default/thumb_videolibrary_tvshow.png differ diff --git a/plugin.video.alfa/servers/torrent.json b/plugin.video.alfa/servers/torrent.json index 9bdf6e57..00a797e3 100755 --- a/plugin.video.alfa/servers/torrent.json +++ b/plugin.video.alfa/servers/torrent.json @@ -1,84 +1,84 @@ -{ - "active": true, - "clients": [ - { - "id": "plugin.video.xbmctorrent", - "name": "xbmctorrent", - "url": "plugin://plugin.video.xbmctorrent/play/%s" - }, - { - "id": "plugin.video.pulsar", - "name": "pulsar", - "url": "plugin://plugin.video.pulsar/play?uri=%s" - }, - { - "id": "plugin.video.quasar", - "name": "quasar", - "url": "plugin://plugin.video.quasar/play?uri=%s" - }, - { - "id": "plugin.video.stream", - "name": "stream", - "url": "plugin://plugin.video.stream/play/%s" - }, - { - "id": "plugin.video.torrenter", - "name": "torrenter", - "url": "plugin://plugin.video.torrenter/?action=playSTRM&url=%s" - }, - { - "id": "plugin.video.torrentin", - "name": "torrentin", - "url": "plugin://plugin.video.torrentin/?uri=%s&image=" - } - ], - "changes": [ - { - "date": "25/03/2016", - "description": "Versión incial" - } - ], - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(http:\\/\\/(?:.*?)\\.torrent)", - "url": "\\1" - }, - { - "pattern": "(magnet:\\?xt=urn:[^\"]+)", - "url": "\\1" - } - ] - }, - "free": true, - "id": "torrent", - "name": "torrent", - "settings": [ - { - "default": false, - "enabled": true, - "id": "black_list", - "label": "Incluir en lista negra", - "type": "bool", - "visible": true - }, - { - "default": 0, - "enabled": true, - "id": "favorites_servers_list", - "label": "Incluir en lista de favoritos", - "lvalues": [ - "No", - "1", - "2", - "3", - "4", - "5" - ], - "type": "list", - "visible": false - } - ], - "version": 1 +{ + "active": true, + "clients": [ + { + "id": "plugin.video.xbmctorrent", + "name": "xbmctorrent", + "url": "plugin://plugin.video.xbmctorrent/play/%s" + }, + { + "id": "plugin.video.pulsar", + "name": "pulsar", + "url": "plugin://plugin.video.pulsar/play?uri=%s" + }, + { + "id": "plugin.video.quasar", + "name": "quasar", + "url": "plugin://plugin.video.quasar/play?uri=%s" + }, + { + "id": "plugin.video.stream", + "name": "stream", + "url": "plugin://plugin.video.stream/play/%s" + }, + { + "id": "plugin.video.torrenter", + "name": "torrenter", + "url": "plugin://plugin.video.torrenter/?action=playSTRM&url=%s" + }, + { + "id": "plugin.video.torrentin", + "name": "torrentin", + "url": "plugin://plugin.video.torrentin/?uri=%s&image=" + } + ], + "changes": [ + { + "date": "25/03/2016", + "description": "Versión incial" + } + ], + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "(http:\\/\\/(?:.*?)\\.torrent)", + "url": "\\1" + }, + { + "pattern": "(magnet:\\?xt=urn:[^\"]+)", + "url": "\\1" + } + ] + }, + "free": true, + "id": "torrent", + "name": "torrent", + "settings": [ + { + "default": false, + "enabled": true, + "id": "black_list", + "label": "Incluir en lista negra", + "type": "bool", + "visible": true + }, + { + "default": 0, + "enabled": true, + "id": "favorites_servers_list", + "label": "Incluir en lista de favoritos", + "lvalues": [ + "No", + "1", + "2", + "3", + "4", + "5" + ], + "type": "list", + "visible": false + } + ], + "version": 1 } \ No newline at end of file