From 66bb21ed88046853c91e56bdddaaf473e2cf3f7b Mon Sep 17 00:00:00 2001 From: brotoskyj Date: Wed, 17 Dec 2025 16:38:53 -0500 Subject: [PATCH] Styling - Progress Bar Changed progress bar indicators and added policy name to the progress bar closes #50 --- airlock_libs/Cargo.lock | 2 +- airlock_libs/Cargo.toml | 2 +- airlock_libs/pyproject.toml | 2 +- airlock_libs/src/services.rs | 6 ++++-- requirements.txt | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/airlock_libs/Cargo.lock b/airlock_libs/Cargo.lock index e2386f3..391d9b4 100644 --- a/airlock_libs/Cargo.lock +++ b/airlock_libs/Cargo.lock @@ -26,7 +26,7 @@ dependencies = [ [[package]] name = "airlock_libs" -version = "6.1.1" +version = "6.2.0" dependencies = [ "chrono", "crossbeam", diff --git a/airlock_libs/Cargo.toml b/airlock_libs/Cargo.toml index cf49ac1..888c19c 100644 --- a/airlock_libs/Cargo.toml +++ b/airlock_libs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "airlock_libs" -version = "6.1.1" +version = "6.2.0" edition = "2024" [dependencies] diff --git a/airlock_libs/pyproject.toml b/airlock_libs/pyproject.toml index 5ed6be4..1c2fcd2 100644 --- a/airlock_libs/pyproject.toml +++ b/airlock_libs/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "airlock_libs" -version = "6.1.1" +version = "6.2.0" description = "Airlock Digital API Wrapper" readme = "README.md" license = { text = "AGPL-3.0-only" } diff --git a/airlock_libs/src/services.rs b/airlock_libs/src/services.rs index c567f41..3ddcf1e 100644 --- a/airlock_libs/src/services.rs +++ b/airlock_libs/src/services.rs @@ -73,8 +73,9 @@ pub fn pull_policy_exec_histories( .set_draw_target(ProgressDrawTarget::stderr()); progress_bar.lock().unwrap().set_style( ProgressStyle::default_bar() - .template("Total Completion: {spinner:.green} [{elapsed_precise}] [{bar:40.green/blue}] {pos}/{len} {message}") - .unwrap(), + .template("Total Completion: {spinner:.green} [{elapsed_precise}] [{bar:40.green/cyan}] {pos}/{len} - Current Policy: {msg}") + .unwrap() + .progress_chars("#> ") ); let client: Client = tracer.in_span("Building HTTP Client", |cx| { let client_result: Result = build_client(headers); @@ -108,6 +109,7 @@ pub fn pull_policy_exec_histories( Local::now().naive_local() - chrono::Duration::days(days); let (tx, rx) = unbounded::>(); let pb_clone = progress_bar.clone(); + pb_clone.lock().unwrap().set_message(policy_names.clone()); thread::spawn(move || { let mut seen: HashMap<(String, String, String), Group> = if writeable_filepath.exists() { diff --git a/requirements.txt b/requirements.txt index 30d5f35..83a2071 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyperclip==1.11.0 # Custom/Private packages --extra-index-url https://git.racooncity.org/api/packages/brotoskyj/pypi/simple/ -airlock_libs==6.1.1 \ No newline at end of file +airlock_libs==6.2.0 \ No newline at end of file