From 5c9905a0be2aa4e640ba15435f3964c4f3960c07 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 4 Jul 2023 05:51:59 +1000 Subject: [PATCH] add progress bar to snapchat `net tls mozilla` --- libs/tls/locales/i18n.json | 8 ++++++++ libs/tls/src/cmd.rs | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/libs/tls/locales/i18n.json b/libs/tls/locales/i18n.json index e8e85a05c..f3df496ff 100644 --- a/libs/tls/locales/i18n.json +++ b/libs/tls/locales/i18n.json @@ -19,6 +19,14 @@ "en": "trust all Root CA's in webpki-roots", "en-tts": "trust all Root CA's in webpki-roots" }, + "tls.mozilla_progress": { + "en": "trusting Mozilla Root CA's", + "en-tts": "trusting Mozilla Root CA's" + }, + "tls.mozilla_done": { + "en": "trusted Root CA's", + "en-tts": "trusted Root CA's" + }, "tls.probe_cmd": { "en": "save host CA'a if trusted", "en-tts": "save host CA'a if trusted" diff --git a/libs/tls/src/cmd.rs b/libs/tls/src/cmd.rs index d65f86d99..5efe59097 100644 --- a/libs/tls/src/cmd.rs +++ b/libs/tls/src/cmd.rs @@ -1,11 +1,13 @@ use crate::{danger, Tls}; use locales::t; +use modals::Modals; use std::convert::TryInto; use std::io::Read; use std::io::Write; use std::net::TcpStream; use std::str::from_utf8; use std::sync::Arc; +use xous_names::XousNames; pub fn shellchat<'a>( mut tokens: impl Iterator, @@ -39,13 +41,21 @@ pub fn shellchat<'a>( ) }) .collect(); - let mut count = 0; + let mut count:u32 = rotas.len().try_into().unwrap(); + let xns = XousNames::new().unwrap(); + let modals = Modals::new(&xns).unwrap(); + modals + .start_progress(t!("tls.mozilla_progress", locales::LANG), 0, count, 0) + .expect("no progress"); + count = 0; let tls = Tls::new(); for rota in rotas { tls.save_cert(&rota).unwrap_or_else(|e| log::warn!("{e}")); + modals.update_progress(count).expect("no progress"); count += 1; } - write!(ret, "trusted {count} certificates").ok(); + modals.finish_progress().expect("finish progress"); + write!(ret, "{} {}", count, t!("tls.mozilla_done", locales::LANG)).ok(); } // probe establishes a tls connection to the supplied host, extracts the // certificates offered and immediately closes the connection.