Cleaning up implementation

Author: ryan-summers

forged-cli/Cargo.toml

@@ -29,3 +29,4 @@ probe-rs-cli-util = "0.13.0"
 thiserror = "1.0.30"
 dotenv = "0.15"
 uuid = { version = "1", features = ["serde"] }
+semver = "1"

forged-cli/src/functions/download.rs

@@ -23,20 +23,27 @@ pub async fn download(
     chip: Option<String>,
     version: Option<String>,
 ) -> Result<()> {
-    println!("⛅ Grabbing binaries from the server ...");
-
     let query = client.run_query(Chips::build(())).await?;
     let chips = query.current_provisioner.project.chips;
 
+    let chips_string =
+        chips
+            .iter()
+            .map(|chip| chip.name.clone())
+            .fold(String::new(), |acc, chip| {
+                if acc.is_empty() {
+                    chip.to_string()
+                } else {
+                    format!("{acc}, {chip}")
+                }
+            });
+
     let chip = if let Some(chip_name) = chip {
         chips
             .iter()
             .find(|chip| chip.name == chip_name)
             .ok_or_else(|| {
-                anyhow!(
-                    "Chip {chip_name} not found. Available chips: {:?}",
-                    chips.iter().map(|chip| chip.name.clone())
-                )
+                anyhow!("Chip `{chip_name}` not found. Available chips: [ {chips_string} ]")
             })?
     } else {
         match chips.len() {
@@ -45,41 +52,57 @@ pub async fn download(
                     "No chips have been configured for this project. Add one to the project first."
                 )))
             }
-            1 => chips.iter().next().unwrap(),
-            _ => return Err(Error::Other(anyhow!(
-                "Multiple chips found for this project. Please specify one. Available chips: {:?}",
-                chips.iter().map(|chip| chip.name.clone())
-            ))),
+            1 => chips.first().unwrap(),
+            _ => {
+                return Err(Error::Other(anyhow!(
+                "Multiple chips found for this project. Please specify one. Available chips: [ {chips_string} ]"
+            )))
+            }
         }
     };
 
     let binaries = &chip.binaries;
     let binary = if let Some(version) = version {
+        let version = semver::Version::parse(&version)?;
         binaries
             .iter()
             .find(|bin| bin.version() == version)
             .ok_or_else(|| {
+                let mut versions: Vec<semver::Version> = binaries.iter().map(|bin| bin.version()).collect();
+                versions.sort();
+                versions.reverse();
+
                 anyhow!(
-                    "Binary version {version} not found for chip {}. Available versions: {:?}",
+                    "Binary version `{version}` not found for chip `{}`. Available versions: [ {} ]",
                     chip.name,
-                    binaries.iter().map(|bin| bin.version())
-                )
+                    versions.iter().fold(String::new(), |acc, version| {
+                        if acc.is_empty() {
+                            version.to_string()
+                        } else {
+                            format!("{acc}, {version}")
+                        }
+                    }
+                ))
             })?
     } else {
-        match binaries.len() {
-            0 => return Err(Error::Other(anyhow!(
-                "No binaries have been configured for chip {}. Add a binary to this chip first.",
+        // Otherwise, find the newest binary.
+        let Some(binary) = binaries.iter().max_by_key(|x| x.version()) else {
+            return Err(Error::Other(anyhow!(
+                "No binaries have been uploaded for chip {}",
                 chip.name
-            ))),
-            1 => binaries.iter().next().unwrap(),
-            _ => return Err(Error::Other(anyhow!(
-                "Multiple binaries found for chip {}. Please specify one. Available versions: {:?}",
-                chip.name,
-                binaries.iter().map(|bin| bin.version())
-            ))),
-        }
+            )));
+        };
+        binary
     };
 
+    println!(
+        " -> Flashing firmware v{} onto {} ({})",
+        binary.version(),
+        chip.name,
+        chip.part_number
+    );
+    println!("⛅ Grabbing binaries from the server ...");
+
     let result = run_flash_download(client, &chip, binary).await;
 
     if result.is_err() {
@@ -107,7 +130,7 @@ async fn run_flash_download(
     }
 
     // Create a new session
-    let mut session = probe.attach(&chip.name, probe_rs::Permissions::default())?;
+    let mut session = probe.attach(&chip.part_number, probe_rs::Permissions::default())?;
 
     let target = session.target();
 

forged-cli/src/main.rs

@@ -52,6 +52,7 @@ pub enum Error {
     Probe(#[from] probe_rs::Error),
     FlashOperation(#[from] probe_rs_cli_util::common_options::OperationError),
     Other(#[from] anyhow::Error),
+    Semver(#[from] semver::Error),
 }
 
 impl Display for Error {
@@ -64,6 +65,7 @@ impl Display for Error {
             }
             Error::Other(error) => writeln!(f, "{error}"),
             Error::FlashOperation(error) => writeln!(f, "{error}"),
+            Error::Semver(error) => writeln!(f, "Version format error: {error}"),
         }
     }
 }

forged-cli/src/queries.rs

@@ -51,6 +51,7 @@ pub mod queries {
     pub struct Chip {
         pub id: Uuid,
         pub name: String,
+        pub part_number: String,
         pub binaries: Vec<Binary>,
     }
 
@@ -82,11 +83,14 @@ pub mod queries {
     }
 
     impl Binary {
-        pub fn version(&self) -> String {
-            format!(
-                "{}.{}.{}",
-                self.version_major, self.version_minor, self.version_patch
-            )
+        pub fn version(&self) -> semver::Version {
+            semver::Version {
+                major: self.version_major as u64,
+                minor: self.version_minor as u64,
+                patch: self.version_patch as u64,
+                pre: Default::default(),
+                build: Default::default(),
+            }
         }
     }