From 7d0115541f33d211880f3e376a86252220b5c003 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 15 Oct 2023 22:22:16 +0800 Subject: [PATCH] feat: update progress --- src/cmd_decrypt.rs | 2 +- src/cmd_encrypt.rs | 2 +- src/main.rs | 2 +- src/{util_process.rs => util_progress.rs} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/{util_process.rs => util_progress.rs} (90%) diff --git a/src/cmd_decrypt.rs b/src/cmd_decrypt.rs index 655f31a..8c57cfc 100644 --- a/src/cmd_decrypt.rs +++ b/src/cmd_decrypt.rs @@ -25,7 +25,7 @@ use crate::consts::{ }; use crate::crypto_aes::{aes_gcm_decrypt, try_aes_gcm_decrypt_with_salt}; use crate::spec::{EncEncryptedMeta, TinyEncryptEnvelop, TinyEncryptEnvelopType, TinyEncryptMeta}; -use crate::util_process::Progress; +use crate::util_progress::Progress; use crate::wrap_key::WrapKey; #[derive(Debug, Args)] diff --git a/src/cmd_encrypt.rs b/src/cmd_encrypt.rs index 3d8c9d8..22c673c 100644 --- a/src/cmd_encrypt.rs +++ b/src/cmd_encrypt.rs @@ -24,7 +24,7 @@ use crate::spec::{ EncEncryptedMeta, EncMetadata, TINY_ENCRYPT_VERSION_10, TinyEncryptEnvelop, TinyEncryptEnvelopType, TinyEncryptMeta, }; -use crate::util_process::Progress; +use crate::util_progress::Progress; use crate::wrap_key::{WrapKey, WrapKeyHeader}; #[derive(Debug, Args)] diff --git a/src/main.rs b/src/main.rs index 66cd086..dd5c9cc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ use crate::cmd_version::CmdVersion; mod consts; mod util; -mod util_process; +mod util_progress; mod util_piv; mod util_pgp; mod util_p256; diff --git a/src/util_process.rs b/src/util_progress.rs similarity index 90% rename from src/util_process.rs rename to src/util_progress.rs index d0af3c1..0d55482 100644 --- a/src/util_process.rs +++ b/src/util_progress.rs @@ -1,7 +1,7 @@ use indicatif::{ProgressBar, ProgressStyle}; const PB_PROGRESS: &str = "#-"; -const PB_TEMPLATE: &str = "{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})"; +const PB_TEMPLATE: &str = "{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {bytes}/{total_bytes} {bytes_per_sec} ({eta})"; pub struct Progress {