Add modules containing helper functions for initializing the logger and checking for updates

Author: jessebraham

Cargo.lock

@@ -33,11 +33,11 @@ pkg-fmt = "zip"
 cargo_metadata = "0.15.0"
 cargo_toml = "0.11.6"
 clap = { version = "3.2.22", features = ["derive", "env"] }
+env_logger = "0.9.0"
 espflash = { version = "=1.7.1-dev", path = "../espflash" }
 log = "0.4.17"
 miette = { version = "5.3.0", features = ["fancy"] }
 serde = { version = "1.0.144", features = ["derive"] }
 strum = "0.24.1"
 thiserror = "1.0.35"
-tracing-subscriber = { version = "0.3.15", features = [ "env-filter" ] }
 toml = "0.5.9"

cargo-espflash/Cargo.toml

@@ -39,6 +39,7 @@ csv = "1.1.6"
 dialoguer = "0.10.2"
 directories-next = "2.0.0"
 espmonitor = "0.10.0"
+env_logger = "0.9.0"
 flate2 = "1.0.24"
 indicatif = "0.17.1"
 log = "0.4.17"
@@ -52,7 +53,6 @@ serde-hex = "0.1.0"
 serde_json = "1.0.85"
 serde_plain = "1.0.0"
 serialport = "4.2.0"
-tracing-subscriber = { version = "0.3.15", features = [ "env-filter" ] }
 sha2 = "0.10.6"
 slip-codec = "0.3.3"
 strum = "0.24.1"

espflash/Cargo.toml

@@ -418,13 +418,3 @@ pub fn write_bin_to_flash(opts: WriteBinToFlashOpts) -> Result<()> {
 
     Ok(())
 }
-
-pub fn check_for_updates(name: &str, version: &str) {
-    const NO_INTERVAL: Duration = Duration::from_secs(0);
-
-    let informer = update_informer::new(registry::Crates, name, version).interval(NO_INTERVAL);
-
-    if let Some(version) = informer.check_version().ok().flatten() {
-        println!("New version of {name} is available: {version}\n");
-    }
-}

espflash/src/cli/mod.rs

@@ -1,12 +1,15 @@
-pub use chip::Chip;
-pub use cli::config::Config;
-pub use elf::{FlashFrequency, FlashMode};
-pub use error::{Error, InvalidPartitionTable, MissingPartitionTable};
-pub use flasher::{FlashSize, Flasher};
-pub use image_format::ImageFormatId;
-pub use partition_table::PartitionTable;
+pub use self::{
+    chip::Chip,
+    cli::config::Config,
+    elf::{FlashFrequency, FlashMode},
+    error::{Error, InvalidPartitionTable, MissingPartitionTable},
+    flasher::{FlashSize, Flasher},
+    image_format::ImageFormatId,
+    partition_table::PartitionTable,
+};
 
 pub mod chip;
+pub mod cli;
 pub mod command;
 pub mod connection;
 pub mod elf;
@@ -16,8 +19,31 @@ pub mod flash_target;
 pub mod flasher;
 pub mod image_format;
 pub mod partition_table;
+pub mod stubs;
 
-#[doc(hidden)]
-pub mod cli;
+pub mod logging {
+    use env_logger::Env;
+    use log::LevelFilter;
 
-pub mod stubs;
+    pub fn initialize_logger(filter: LevelFilter) {
+        env_logger::Builder::from_env(Env::default().default_filter_or(filter.as_str())).init();
+    }
+}
+
+pub mod update {
+    use std::time::Duration;
+
+    use log::info;
+    use update_informer::{registry, Check};
+
+    pub fn check_for_update(name: &str, version: &str) {
+        // By setting the interval to 0 seconds we invalidate the cache with each
+        // invocation and ensure we're getting up-to-date results
+        let informer =
+            update_informer::new(registry::Crates, name, version).interval(Duration::from_secs(0));
+
+        if let Some(version) = informer.check_version().ok().flatten() {
+            info!("🚀 A new version of {name} is available: {version}");
+        }
+    }
+}