From 4e99f6ca2016dcc2ff23160b5d245ec41cf80247 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:09:39 +0200 Subject: [PATCH 01/24] update localized strings --- plugin.video.alfa/channels/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py index 0a262ad8..c2fd5e9c 100644 --- a/plugin.video.alfa/channels/search.py +++ b/plugin.video.alfa/channels/search.py @@ -160,7 +160,7 @@ def searchbycat(item): # Only in xbmc/kodi # Abre un cuadro de dialogo con las categorías en las que hacer la búsqueda - categories = ["Películas", "Series", "Anime", "Documentales", "VOS", "Latino"] + categories = [config.get_localized_string(30122), config.get_localized_string(30123), config.get_localized_string(30124), config.get_localized_string(30125), config.get_localized_string(59975), config.get_localized_string(59976)] categories_id = ["movie", "tvshow", "anime", "documentary", "vos", "latino"] list_controls = [] for i, category in enumerate(categories): @@ -416,7 +416,7 @@ def do_search(item, categories=None): percentage = int(math.ceil(index * t)) list_pendent_names = [a.getName() for a in pendent] - mensaje = "Buscando en %s" % (", ".join(list_pendent_names)) + mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names)) progreso.update(percentage, config.get_localized_string(60521) % (len(threads) - len(pendent), len(threads)), mensaje) logger.debug(mensaje) From a62e72e8be94269cb130d0d39b29288a969807b7 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:11:18 +0200 Subject: [PATCH 02/24] update string.po --- .../resources/language/Spanish (Argentina)/strings.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po index 2de12a54..416c0218 100644 --- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po @@ -3821,4 +3821,10 @@ msgctxt "#70280" msgid " - Torrent Links don't work." msgstr " - Los enlaces Torrent no funcionan." +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "¿Desea mostrar estos enlaces?" +msgctxt "#70282" +msgid "Searching in %s" +msgstr "Buscando en %s" From 4449b5416e6467fff04df544221042787e81060e Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:12:18 +0200 Subject: [PATCH 03/24] Update strings.po --- .../resources/language/Spanish (Mexico)/strings.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po index 2de12a54..416c0218 100644 --- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po @@ -3821,4 +3821,10 @@ msgctxt "#70280" msgid " - Torrent Links don't work." msgstr " - Los enlaces Torrent no funcionan." +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "¿Desea mostrar estos enlaces?" +msgctxt "#70282" +msgid "Searching in %s" +msgstr "Buscando en %s" From 64ba34f3ba9fd75a70d581a1e1ca1dd7276d2b2a Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:13:15 +0200 Subject: [PATCH 04/24] Update strings.po --- plugin.video.alfa/resources/language/Spanish/strings.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po index 2de12a54..416c0218 100644 --- a/plugin.video.alfa/resources/language/Spanish/strings.po +++ b/plugin.video.alfa/resources/language/Spanish/strings.po @@ -3821,4 +3821,10 @@ msgctxt "#70280" msgid " - Torrent Links don't work." msgstr " - Los enlaces Torrent no funcionan." +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "¿Desea mostrar estos enlaces?" +msgctxt "#70282" +msgid "Searching in %s" +msgstr "Buscando en %s" From ed24030b1c64ac122c9434aec16c882a6d13c750 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:16:23 +0200 Subject: [PATCH 05/24] Update strings.po --- plugin.video.alfa/resources/language/Italian/strings.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index e0216715..264b20c5 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -1699,7 +1699,7 @@ msgstr "Altre opzioni" msgctxt "#60421" msgid "Channels included in the global search " -msgstr "Canali inclusi nella ricerca globale " +msgstr "Canali inclusi nella ricerca globale: " msgctxt "#60422" msgid "Search " @@ -3832,5 +3832,11 @@ msgctxt "#70280" msgid " - Torrent Links don't work." msgstr " - I Link Torrent non funzionano." +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "Vuoi vedere questi links" +msgctxt "#70282" +msgid "Searching in %s" +msgstr "Ricerca in %s" From 7efcacae5246a81916baf66b6d1aa8a37bd5a355 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:17:32 +0200 Subject: [PATCH 06/24] Update strings.po --- plugin.video.alfa/resources/language/English/strings.po | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po index f977fbb8..6f1d8607 100644 --- a/plugin.video.alfa/resources/language/English/strings.po +++ b/plugin.video.alfa/resources/language/English/strings.po @@ -3741,6 +3741,14 @@ msgctxt "#70254" msgid "Internal Client" msgstr "" +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "" + +msgctxt "#70282" +msgid "Searching in %s" +msgstr "" + msgctxt "#70255" msgid "Internal client - MCT" msgstr "" From b357e24a9e919bab4d94a32e5b3180c1175b10f3 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:19:05 +0200 Subject: [PATCH 07/24] Update localized strings --- plugin.video.alfa/channels/news.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py index ba1bea37..9085a7c0 100644 --- a/plugin.video.alfa/channels/news.py +++ b/plugin.video.alfa/channels/news.py @@ -612,14 +612,14 @@ def setting_channel(item): list_controls.append(control) - caption = "Canales incluidos en Novedades " + item.title.replace("Canales incluidos en: ", "- ").strip() + caption = config.get_localized_string(60533) + item.title.replace(config.get_localized_string(60525), "- ").strip() if config.get_setting("custom_button_value_news", item.channel): - custom_button_label = "Ninguno" + custom_button_label = config.get_localized_string(59992) else: - custom_button_label = "Todos" + custom_button_label = config.get_localized_string(59991) return platformtools.show_channel_settings(list_controls=list_controls, - caption="Canales incluidos en Novedades", + caption=config.get_localized_string(60533), callback="save_settings", item=item, custom_button={'visible': True, 'function': "cb_custom_button", From b7736ee3c3849d4deb55fb646149345891bfeb0c Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:20:58 +0200 Subject: [PATCH 08/24] Update localized strings --- .../resources/skins/Default/720p/InfoWindow.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/resources/skins/Default/720p/InfoWindow.xml b/plugin.video.alfa/resources/skins/Default/720p/InfoWindow.xml index 53b68f58..96fcb83f 100755 --- a/plugin.video.alfa/resources/skins/Default/720p/InfoWindow.xml +++ b/plugin.video.alfa/resources/skins/Default/720p/InfoWindow.xml @@ -27,7 +27,7 @@ black center center - + 735 @@ -303,7 +303,7 @@ Controls/KeyboardKeyNF.png center center - + 0 @@ -315,7 +315,7 @@ Controls/KeyboardKeyNF.png center center - + 0 @@ -327,7 +327,7 @@ Controls/KeyboardKeyNF.png center center - + 0 @@ -339,7 +339,7 @@ Controls/KeyboardKeyNF.png center center - + 0 @@ -356,4 +356,4 @@ - \ No newline at end of file + From ce2e7a78ee562e400ae7d7db98c6a9e6d6fc9567 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:28:19 +0200 Subject: [PATCH 09/24] Added localized strings --- .../platformcode/xbmc_info_window.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plugin.video.alfa/platformcode/xbmc_info_window.py b/plugin.video.alfa/platformcode/xbmc_info_window.py index b217183a..b7efce30 100755 --- a/plugin.video.alfa/platformcode/xbmc_info_window.py +++ b/plugin.video.alfa/platformcode/xbmc_info_window.py @@ -196,48 +196,48 @@ class InfoWindow(xbmcgui.WindowXMLDialog): # Cargamos los datos para el formato pelicula if self.result.get("mediatype", "movie") == "movie": - self.getControl(10006).setLabel("Título:") + self.getControl(10006).setLabel(config.get_localized_string(60377)) self.getControl(10007).setLabel(self.result.get("title", "N/A")) - self.getControl(10008).setLabel("Título original:") + self.getControl(10008).setLabel(config.get_localized_string(60378)) self.getControl(10009).setLabel(self.result.get("originaltitle", "N/A")) - self.getControl(100010).setLabel("Idioma original:") + self.getControl(100010).setLabel(config.get_localized_string(60379)) self.getControl(100011).setLabel(self.result.get("language", "N/A")) - self.getControl(100012).setLabel("Puntuación:") + self.getControl(100012).setLabel(config.get_localized_string(60380)) self.getControl(100013).setLabel(self.result.get("puntuacion", "N/A")) - self.getControl(100014).setLabel("Lanzamiento:") + self.getControl(100014).setLabel(config.get_localized_string(60381)) self.getControl(100015).setLabel(self.result.get("release_date", "N/A")) - self.getControl(100016).setLabel("Géneros:") + self.getControl(100016).setLabel(config.get_localized_string(60382)) self.getControl(100017).setLabel(self.result.get("genre", "N/A")) # Cargamos los datos para el formato serie else: - self.getControl(10006).setLabel("Serie:") + self.getControl(10006).setLabel(config.get_localized_string(60383)) self.getControl(10007).setLabel(self.result.get("title", "N/A")) - self.getControl(10008).setLabel("Idioma original:") + self.getControl(10008).setLabel(config.get_localized_string(60379)) self.getControl(10009).setLabel(self.result.get("language", "N/A")) - self.getControl(100010).setLabel("Puntuación:") + self.getControl(100010).setLabel(config.get_localized_string(60380)) self.getControl(100011).setLabel(self.result.get("puntuacion", "N/A")) - self.getControl(100012).setLabel("Géneros:") + self.getControl(100012).setLabel(config.get_localized_string(60382) self.getControl(100013).setLabel(self.result.get("genre", "N/A")) if self.result.get("season"): - self.getControl(100014).setLabel("Título temporada:") + self.getControl(100014).setLabel(config.get_localized_string(60384)) self.getControl(100015).setLabel(self.result.get("temporada_nombre", "N/A")) - self.getControl(100016).setLabel("Temporada:") + self.getControl(100016).setLabel(config.get_localized_string(60385)) self.getControl(100017).setLabel(self.result.get("season", "N/A") + " de " + self.result.get("seasons", "N/A")) if self.result.get("episode"): - self.getControl(100014).setLabel("Título:") + self.getControl(100014).setLabel(config.get_localized_string(60377)) self.getControl(100015).setLabel(self.result.get("episode_title", "N/A")) - self.getControl(100018).setLabel("Episodio:") + self.getControl(100018).setLabel(config.get_localized_string(60386)) self.getControl(100019).setLabel(self.result.get("episode", "N/A") + " de " + self.result.get("episodes", "N/A")) - self.getControl(100020).setLabel("Emisión:") + self.getControl(100020).setLabel(config.get_localized_string(60387)) self.getControl(100021).setLabel(self.result.get("date", "N/A")) # Sinopsis if self.result['plot']: - self.getControl(100022).setLabel("Sinopsis:") + self.getControl(100022).setLabel(config.get_localized_string(60388)) self.getControl(100023).setText(self.result.get("plot", "N/A")) else: self.getControl(100022).setLabel("") From 62ed78c12c263203b9fe1a046c618f717f128952 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 17:43:44 +0200 Subject: [PATCH 10/24] Update downloads.json --- plugin.video.alfa/channels/downloads.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin.video.alfa/channels/downloads.json b/plugin.video.alfa/channels/downloads.json index 1412a6d9..6ee0d432 100755 --- a/plugin.video.alfa/channels/downloads.json +++ b/plugin.video.alfa/channels/downloads.json @@ -128,7 +128,7 @@ "label": "@70238", "lvalues": [ "@70244", - "@70245" + "Reordenar" ], "default": 1, "enabled": true, @@ -145,7 +145,7 @@ "Vose, Eng, Sub, Esp, Lat" ], "default": 0, - "enabled": "eq(-1,@70245])", + "enabled": "eq(-1,'Reordenar')", "visible": true }, { @@ -159,7 +159,7 @@ "SD" ], "default": 0, - "enabled": "eq(-2,@70245])", + "enabled": "eq(-2,'Reordenar')", "visible": true }, { @@ -167,8 +167,8 @@ "type": "bool", "label": "@70242", "default": true, - "enabled": "eq(-3,@70245])", + "enabled": "eq(-3,'Reordenar')", "visible": true } ] -} \ No newline at end of file +} From b1ba248e43fe7b673024fde4b1ff3b44a94f55b0 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Thu, 12 Jul 2018 18:52:44 +0200 Subject: [PATCH 11/24] Added localized strings --- plugin.video.alfa/channels/videolibrary.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/videolibrary.py b/plugin.video.alfa/channels/videolibrary.py index 14764ad3..a18e6784 100644 --- a/plugin.video.alfa/channels/videolibrary.py +++ b/plugin.video.alfa/channels/videolibrary.py @@ -16,10 +16,10 @@ def mainlist(item): itemlist = list() itemlist.append(Item(channel=item.channel, action="list_movies", title=config.get_localized_string(60509), - category="Videoteca de películas", + category=config.get_localized_string(70270), thumbnail=get_thumb("videolibrary_movie.png"))) itemlist.append(Item(channel=item.channel, action="list_tvshows", title=config.get_localized_string(60600), - category="Videoteca de series", + category=config.get_localized_string(70271), thumbnail=get_thumb("videolibrary_tvshow.png"))) return itemlist @@ -146,7 +146,7 @@ def list_tvshows(item): "action": "delete", "channel": "videolibrary", "multicanal": multicanal}, - {"title": "Buscar nuevos episodios ahora", + {"title": config.get_localized_string(70269), "action": "update_tvshow", "channel": "videolibrary"}] # ,{"title": "Cambiar contenido (PENDIENTE)", From 600edda4211320a865a0bd67990e1dc7320e4cbb Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Fri, 13 Jul 2018 21:05:20 +0200 Subject: [PATCH 12/24] Newpct1: mejoras internas --- plugin.video.alfa/channels/newpct1.py | 5 ++++- plugin.video.alfa/lib/generictools.py | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py index 7d8cfdcd..b17651bf 100644 --- a/plugin.video.alfa/channels/newpct1.py +++ b/plugin.video.alfa/channels/newpct1.py @@ -98,7 +98,10 @@ def mainlist(item): def settingCanal(item): from platformcode import platformtools - return platformtools.show_channel_settings() + platformtools.show_channel_settings() + platformtools.itemlist_refresh() + return + def submenu(item): diff --git a/plugin.video.alfa/lib/generictools.py b/plugin.video.alfa/lib/generictools.py index 4f8ca78c..a3b85436 100644 --- a/plugin.video.alfa/lib/generictools.py +++ b/plugin.video.alfa/lib/generictools.py @@ -198,6 +198,9 @@ def post_tmdb_listado(item, itemlist): for item_local in itemlist: #Recorremos el Itenlist generado por el canal title = item_local.title #logger.debug(item_local) + + item_local.last_page = 0 + del item_local.last_page #Borramos restos de paginación if item_local.contentSeason_save: #Restauramos el num. de Temporada item_local.contentSeason = item_local.contentSeason_save @@ -710,9 +713,7 @@ def post_tmdb_findvideos(item, itemlist): title_gen = '%s: %s' % (item.category.capitalize(), title_gen) #Pintamos el pseudo-título con toda la información disponible del vídeo - item.action = "" - item.server = "" - itemlist.append(item.clone(title=title_gen)) #Título con todos los datos del vídeo + itemlist.append(item.clone(action="", server = "", title=title_gen)) #Título con todos los datos del vídeo #agregamos la opción de Añadir a Videoteca para péliculas (no series) if item.contentType == 'movie' and item.contentChannel != "videolibrary": From 16c637fc97b6fd7d36b2c919b5a53c08aff3a805 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Fri, 13 Jul 2018 21:05:58 +0200 Subject: [PATCH 13/24] =?UTF-8?q?Quasar:=20Marado=20autom=C3=A1tico=20de?= =?UTF-8?q?=20v=C3=ADdeos=20vistos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/platformcode/platformtools.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugin.video.alfa/platformcode/platformtools.py b/plugin.video.alfa/platformcode/platformtools.py index eafea016..b928e2db 100644 --- a/plugin.video.alfa/platformcode/platformtools.py +++ b/plugin.video.alfa/platformcode/platformtools.py @@ -1048,6 +1048,21 @@ def play_torrent(item, xlistitem, mediaurl): if seleccion > 1: mediaurl = urllib.quote_plus(item.url) xbmc.executebuiltin("PlayMedia(" + torrent_options[seleccion][1] % mediaurl + ")") + + if "quasar" in torrent_options[seleccion][1]: #Seleccionamos que clientes torrent soportamos + if item.strm_path: #Sólo si es de Videoteca + import time + time_limit = time.time() + 150 #Marcamos el timepo máx. de buffering + while not is_playing() and time.time() < time_limit: #Esperamos mientra buffera + time.sleep(5) #Repetimos cada intervalo + logger.debug(str(time_limit)) + + if is_playing(): #Ha terminado de bufferar o ha cancelado + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_auto_as_watched(item) #Marcamos como visto al terminar + logger.debug("Llamado el marcado") + else: + logger.debug("Video cancelado o timeout") if seleccion == 1: from platformcode import mct From 7fa4fe2b01a5b1a8b1b93f3807310e4c4387ac47 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:17:49 +0200 Subject: [PATCH 14/24] Update strings.po --- .../resources/language/Spanish (Mexico)/strings.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po index 416c0218..5fc49016 100644 --- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po @@ -3828,3 +3828,7 @@ msgstr "¿Desea mostrar estos enlaces?" msgctxt "#70282" msgid "Searching in %s" msgstr "Buscando en %s" + +msgctxt "#70283" +msgid "movie" +msgstr "pelicula" From a385a39677587b4eb18c28ee5a269a56d803e2b9 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:19:32 +0200 Subject: [PATCH 15/24] Update strings.po --- plugin.video.alfa/resources/language/Italian/strings.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index 264b20c5..aeecff3f 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -3840,3 +3840,6 @@ msgctxt "#70282" msgid "Searching in %s" msgstr "Ricerca in %s" +msgctxt "#70283" +msgid "movie" +msgstr "film" From 109f2e5962f89dd41d3fb31a3bd25fd41c70ce4b Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:21:50 +0200 Subject: [PATCH 16/24] Update strings.po --- plugin.video.alfa/resources/language/Italian/strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index aeecff3f..d004268d 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -391,7 +391,7 @@ msgstr "Alfa Auto-configurazione" msgctxt "#59972" msgid "Search for: '%s' | Found: %d vídeos | Time: %2.f seconds" -msgstr "Ricerca di: '%s' | Trovati: %d vídeos | Tempo: %2.f secondi" +msgstr "Ricerca di: '%s' | Trovati: %d video | Tempo: %2.f secondi" msgctxt "#59973" msgid "Search Cancelled" @@ -975,7 +975,7 @@ msgstr "Nessuna informazione trovata per: %s" msgctxt "#60229" msgid "Enter the name of %s to search" -msgstr "Inserisci il nome di %s per cercare" +msgstr "Inserisci il titolo del %s per cercare" msgctxt "#60230" msgid "Title:" From 5134245b562a87749b1d32a6a64c57739e8487ec Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:24:01 +0200 Subject: [PATCH 17/24] Update strings.po --- .../resources/language/English/strings.po | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po index 6f1d8607..f1197f0b 100644 --- a/plugin.video.alfa/resources/language/English/strings.po +++ b/plugin.video.alfa/resources/language/English/strings.po @@ -3849,3 +3849,18 @@ msgctxt "#70279" msgid "You can try downloading the 'libtorrent' module from Kodi or installing some addon like 'Quasar' or 'Torrenter', \nwhich will appear among the options in the pop-up \nwhen it appears when clicking on a torrent link. 'Torrenter 'It's more complex but also more complete \nand it always works.'" msgstr "" +msgctxt "#70280" +msgid " - Torrent Links don't work." +msgstr "" + +msgctxt "#70281" +msgid "Do you want to show these links?" +msgstr "" + +msgctxt "#70282" +msgid "Searching in %s" +msgstr "" + +msgctxt "#70283" +msgid "movie" +msgstr "" From 2f839ec29791c8aae1127bc37c66d275916721b9 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:25:36 +0200 Subject: [PATCH 18/24] Update strings.po --- .../resources/language/Spanish (Argentina)/strings.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po index 416c0218..73bd1c80 100644 --- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po @@ -3828,3 +3828,8 @@ msgstr "¿Desea mostrar estos enlaces?" msgctxt "#70282" msgid "Searching in %s" msgstr "Buscando en %s" + +msgctxt "#70283" +msgid "movie" +msgstr "pelicula" + From 8a5356e9a5efe54f31ce09c9f52d085a25da5fe2 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 16:29:18 +0200 Subject: [PATCH 19/24] Update scraper.py --- plugin.video.alfa/core/scraper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/core/scraper.py b/plugin.video.alfa/core/scraper.py index 566fa683..ea229982 100755 --- a/plugin.video.alfa/core/scraper.py +++ b/plugin.video.alfa/core/scraper.py @@ -29,7 +29,7 @@ def find_and_set_infoLabels(item): # Obtener el Scraper por defecto de la configuracion segun el tipo de contenido if item.contentType == "movie": scraper_actual = ['tmdb'][config.get_setting("scraper_movies", "videolibrary")] - tipo_contenido = "película" + tipo_contenido = config.get_localized_string(70283) title = item.contentTitle # Completar lista de opciones para este tipo de contenido list_opciones_cuadro.append(scrapers_disponibles['tmdb']) From a729face6bdd2fe3b235cf3463d9b0dfcbd75193 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 17:00:04 +0200 Subject: [PATCH 20/24] Update search.py --- plugin.video.alfa/channels/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/search.py b/plugin.video.alfa/channels/search.py index 0a262ad8..8de1716d 100644 --- a/plugin.video.alfa/channels/search.py +++ b/plugin.video.alfa/channels/search.py @@ -416,7 +416,7 @@ def do_search(item, categories=None): percentage = int(math.ceil(index * t)) list_pendent_names = [a.getName() for a in pendent] - mensaje = "Buscando en %s" % (", ".join(list_pendent_names)) + mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names)) progreso.update(percentage, config.get_localized_string(60521) % (len(threads) - len(pendent), len(threads)), mensaje) logger.debug(mensaje) From 78b228b657f4bd4957d1b11932502ebbe8f82feb Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 18:57:40 +0200 Subject: [PATCH 21/24] Update download_and_play.py --- plugin.video.alfa/platformcode/download_and_play.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/platformcode/download_and_play.py b/plugin.video.alfa/platformcode/download_and_play.py index 3674eb93..750d2451 100755 --- a/plugin.video.alfa/platformcode/download_and_play.py +++ b/plugin.video.alfa/platformcode/download_and_play.py @@ -37,11 +37,11 @@ def download_and_play(url, file_name, download_path): while True: cancelled = False dialog = xbmcgui.DialogProgress() - dialog.create('Descargando...', 'Cierra esta ventana para empezar la reproducción') + dialog.create(config.get_localized_string(60200), config.get_localized_string(60312)) dialog.update(0) while not cancelled and download_thread.isAlive(): - dialog.update(download_thread.get_progress(), "Cancela esta ventana para empezar la reproducción", + dialog.update(download_thread.get_progress(), config.get_localized_string(60313), "Velocidad: " + str(int(download_thread.get_speed() / 1024)) + " KB/s " + str( download_thread.get_actual_size()) + "MB de " + str( download_thread.get_total_size()) + "MB", From de4952d4d5033950feb4a97fd5a0f0b486c956e2 Mon Sep 17 00:00:00 2001 From: thedoctor66 <37449358+thedoctor66@users.noreply.github.com> Date: Sat, 14 Jul 2018 19:00:45 +0200 Subject: [PATCH 22/24] Update downloadtools.py --- plugin.video.alfa/core/downloadtools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/core/downloadtools.py b/plugin.video.alfa/core/downloadtools.py index 54b0574b..f3653087 100755 --- a/plugin.video.alfa/core/downloadtools.py +++ b/plugin.video.alfa/core/downloadtools.py @@ -812,7 +812,7 @@ def downloadfileGzipped(url, pathfichero): # Crea el diálogo de progreso from platformcode import platformtools - progreso = platformtools.dialog_progress("addon", "Descargando...", url.split("|")[0], nombrefichero) + progreso = platformtools.dialog_progress("addon", config.get_localized_string(60200), url.split("|")[0], nombrefichero) # Timeout del socket a 60 segundos socket.setdefaulttimeout(10) From 376397ebdd599835b73dfbc13adc12ba45cb1646 Mon Sep 17 00:00:00 2001 From: pipcat Date: Tue, 17 Jul 2018 11:15:58 +0200 Subject: [PATCH 23/24] Correcciones powvideo y mega --- plugin.video.alfa/lib/megaserver/client.py | 17 ++++++++++++++--- plugin.video.alfa/servers/powvideo.py | 5 ----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/plugin.video.alfa/lib/megaserver/client.py b/plugin.video.alfa/lib/megaserver/client.py index 41adc3e2..09df12a9 100644 --- a/plugin.video.alfa/lib/megaserver/client.py +++ b/plugin.video.alfa/lib/megaserver/client.py @@ -4,6 +4,7 @@ import random import struct import time import urllib +import requests from threading import Thread from file import File @@ -132,9 +133,19 @@ class Client(object): raise Exception("Enlace no valido") def api_req(self, req, get=""): - seqno = random.randint(0, 0xFFFFFFFF) - url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get) - return json.loads(self.post(url, json.dumps([req])))[0] + seqno = random.randint(0, 0xFFFFFFFF) + url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get) + # ~ return json.loads(self.post(url, json.dumps([req])))[0] + + req = requests.post( + url, + params={'id': seqno}, + data=json.dumps([req]), + timeout=30) + json_resp = json.loads(req.text) + if isinstance(json_resp, int): + raise Exception("MEGA api_req error %d" % json_resp) + return json_resp[0] def base64urldecode(self,data): data += '=='[(2 - len(data) * 3) % 4:] diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index 79991591..2696c972 100755 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -27,11 +27,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= referer = page_url.replace('iframe', 'preview') data = httptools.downloadpage(page_url, headers={'referer': referer}).data - if data == "File was deleted": - return "El archivo no existe o ha sido borrado" - - if 'Video is processing now' in data: - return "El vídeo está siendo procesado, intentalo de nuevo mas tarde" packed = scrapertools.find_single_match(data, "") unpacked = jsunpack.unpack(packed) From 64779236dc40122160946e29dd5330d3df0d743b Mon Sep 17 00:00:00 2001 From: pipcat Date: Tue, 17 Jul 2018 16:32:23 +0200 Subject: [PATCH 24/24] Mega sin rquests --- plugin.video.alfa/lib/megaserver/client.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/plugin.video.alfa/lib/megaserver/client.py b/plugin.video.alfa/lib/megaserver/client.py index 09df12a9..5364edd7 100644 --- a/plugin.video.alfa/lib/megaserver/client.py +++ b/plugin.video.alfa/lib/megaserver/client.py @@ -4,7 +4,7 @@ import random import struct import time import urllib -import requests +from core import httptools from threading import Thread from file import File @@ -135,17 +135,7 @@ class Client(object): def api_req(self, req, get=""): seqno = random.randint(0, 0xFFFFFFFF) url = 'https://g.api.mega.co.nz/cs?id=%d%s' % (seqno, get) - # ~ return json.loads(self.post(url, json.dumps([req])))[0] - - req = requests.post( - url, - params={'id': seqno}, - data=json.dumps([req]), - timeout=30) - json_resp = json.loads(req.text) - if isinstance(json_resp, int): - raise Exception("MEGA api_req error %d" % json_resp) - return json_resp[0] + return json.loads(self.post(url, json.dumps([req])))[0] def base64urldecode(self,data): data += '=='[(2 - len(data) * 3) % 4:] @@ -190,6 +180,7 @@ class Client(object): return sum((self.aes_cbc_decrypt_a32(a[i:i+4], key) for i in xrange(0, len(a), 4)), ()) def post(self, url, data): + return httptools.downloadpage(url, data).data import ssl from functools import wraps def sslwrap(func):