From a4d722762eb90580416fe265a45965b97a70e42a Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 4 Apr 2020 00:29:42 +0200 Subject: [PATCH] fix download videoteca e schermata connessione server in background --- core/servertools.py | 6 ++++-- specials/downloads.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/servertools.py b/core/servertools.py index 2c4b86da..6e6f8a89 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -220,7 +220,7 @@ def get_server_from_url(url): return devuelve -def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialogo=False): +def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialogo=False, background_dialog=False): """ Función para obtener la url real del vídeo @param server: Servidor donde está alojado el vídeo @@ -231,6 +231,8 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo @type video_password: str @param muestra_dialogo: Muestra el diálogo de progreso @type muestra_dialogo: bool + @type background_dialog: bool + @param background_dialog: if progress dialog should be in background @return: devuelve la url del video @rtype: list @@ -261,7 +263,7 @@ def resolve_video_urls_for_playing(server, url, video_password="", muestra_dialo if server_parameters: # Muestra un diágo de progreso if muestra_dialogo: - progreso = platformtools.dialog_progress(config.get_localized_string(20000), + progreso = (platformtools.dialog_progress_bg if background_dialog else platformtools.dialog_progress)(config.get_localized_string(20000), config.get_localized_string(70180) % server_parameters["name"]) # Cuenta las opciones disponibles, para calcular el porcentaje diff --git a/specials/downloads.py b/specials/downloads.py index 3569e4bc..76c7c56c 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -661,7 +661,7 @@ def download_from_server(item): if not item.video_urls: video_urls, puedes, motivo = servertools.resolve_video_urls_for_playing(item.server, item.url, item.password, - True) + True, True) else: video_urls, puedes, motivo = item.video_urls, True, "" @@ -941,9 +941,9 @@ def save_download_background(item): if item.downloadItemlist: # episode parent.downloadItemlist = item.downloadItemlist elif item.unseen: # unseen episodes - parent.downloadItemlist = [i.tourl() for i in videolibrary.get_episodes(parent) if parent.library_playcounts[scrapertools.get_season_and_episode(i.title)] == 0] + parent.downloadItemlist = [i.tourl() for i in videolibrary.get_episodes(parent) if i.action == 'findvideos' and parent.library_playcounts[scrapertools.get_season_and_episode(i.title)] == 0] else: # tvshow or season - parent.downloadItemlist = [i.tourl() for i in videolibrary.get_episodes(parent)] + parent.downloadItemlist = [i.tourl() for i in videolibrary.get_episodes(parent) if i.action == 'findvideos'] if parent.contentType in ["tvshow", "episode", "season"]: if not item.unseen and parent.contentSeason: # if no season, this is episode view, let's download entire serie