diff --git a/src/cards.rs b/src/cards.rs index 3797b56..4f0a39b 100644 --- a/src/cards.rs +++ b/src/cards.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use reqwest; -use prometheus::{GaugeVec, Opts}; -use std::{env, fs::File, fs::OpenOptions, io::BufReader, collections::HashMap}; +use prometheus::{GaugeVec, Opts, Registry}; +use std::{env, fs::File, fs::OpenOptions, io::BufReader, collections::HashMap,sync::Arc}; use crate::util; lazy_static::lazy_static! { @@ -88,8 +88,8 @@ pub async fn process_cards(interval: &mut tokio::time::Interval) -> Result<(), B for card_from_file in &mut cards_data.cards { process_card(card_from_file).await?; pb.inc(1); - interval.tick().await; } + interval.tick().await; process_export_data(&mut cards_data.cards); pb.finish_with_message("Completed!"); @@ -101,4 +101,10 @@ pub async fn process_cards(interval: &mut tokio::time::Interval) -> Result<(), B serde_json::to_writer_pretty(file, &cards_data)?; Ok(()) +} + +pub fn setup_registry() -> Result, Box> { + let registry = Arc::new(Registry::new()); + registry.register(Box::new(CARD_VALUES.clone())).unwrap(); + Ok(registry) } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 5846e91..ad3e5c0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,6 @@ use dotenv; use tokio::time::Duration; -use prometheus::Registry; use tracing::info; -use std::sync::Arc; mod server; mod cards; @@ -11,7 +9,7 @@ mod handlers; mod util; use server::run_server; -use cards::{CARD_VALUES,get_data_update_interval}; +use cards::{setup_registry, get_data_update_interval}; #[tokio::main] async fn main() -> Result<(), Box> { @@ -33,9 +31,3 @@ async fn main() -> Result<(), Box> { cards::process_cards(&mut interval).await?; } } - -fn setup_registry() -> Result, Box> { - let registry = Arc::new(Registry::new()); - registry.register(Box::new(CARD_VALUES.clone())).unwrap(); - Ok(registry) -} diff --git a/src/util.rs b/src/util.rs index 8f18a87..f1684e3 100644 --- a/src/util.rs +++ b/src/util.rs @@ -32,7 +32,7 @@ pub fn setup_progress_bar(len: u64) -> ProgressBar { let style = ProgressStyle::default_bar() .template("{spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {pos}/{len} ({eta})") .unwrap() - .progress_chars("#|."); + .progress_chars("#>."); pb.set_style(style); pb }