Merge pull request #88 from james-parky/dev-omaha-improvements

Omaha crate improvements

Author: dongsupark

Cargo.lock

@@ -16,7 +16,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let res = download_and_hash(&client, url, &path, None, None)?;
     tempdir.close()?;
 
-    println!("hash: {}", res.hash_sha256);
+    println!("hash: {:?}", res.hash_sha256);
 
     Ok(())
 }

examples/download_test.rs

@@ -4,9 +4,10 @@ use std::borrow::Cow;
 use anyhow::{Context, Result};
 use hard_xml::XmlRead;
 use url::Url;
+use omaha::Sha256Digest;
 
-fn get_pkgs_to_download(resp: &omaha::Response) -> Result<Vec<(Url, omaha::Hash<omaha::Sha256>)>> {
-    let mut to_download: Vec<(Url, omaha::Hash<_>)> = Vec::new();
+fn get_pkgs_to_download(resp: &omaha::Response) -> Result<Vec<(Url, Sha256Digest)>> {
+    let mut to_download: Vec<(Url, Sha256Digest)> = Vec::new();
 
     for app in &resp.apps {
         let manifest = &app.update_check.manifest;
@@ -83,9 +84,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         let res = ue_rs::download_and_hash(&client, url.clone(), &path, Some(expected_sha256.clone()), None).context(format!("download_and_hash({url:?}) failed"))?;
         tempdir.close()?;
 
-        println!("\texpected sha256:   {}", expected_sha256);
-        println!("\tcalculated sha256: {}", res.hash_sha256);
-        println!("\tsha256 match?      {}", expected_sha256 == res.hash_sha256);
+        println!("\texpected sha256:   {:?}", expected_sha256);
+        println!("\tcalculated sha256: {:?}", res.hash_sha256);
+        println!("\tsha256 match?      {:?}", expected_sha256 == res.hash_sha256);
     }
 
     Ok(())

examples/full_test.rs

@@ -46,7 +46,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
             #[rustfmt::skip]
             if let Some(h) = pkg.hash.as_ref() {
-                println!("      sha1: {}", h);
+                println!("      sha1: {:?}", h);
             };
 
             #[rustfmt::skip]
@@ -61,7 +61,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             #[rustfmt::skip]
             hash_sha256
                 .map(|h| {
-                    println!("      sha256: {}", h);
+                    println!("      sha256: {:?}", h);
                 });
 
             println!();

examples/response.rs

@@ -7,12 +7,9 @@ edition = "2021"
 
 [dependencies]
 uuid = "1.2"
-ct-codecs = "1"
 url = "2"
-anyhow = "1.0.75"
 sha2 = "0.10.8"
 sha1 = "0.10.6"
-digest = "0.10.7"
 
 [dependencies.hard-xml]
 path = "../vendor/hard-xml"

omaha/Cargo.toml

@@ -0,0 +1,37 @@
+use std::fmt::Display;
+use std::num::ParseIntError;
+
+#[derive(Debug)]
+pub enum Error {
+    TryFromHex(ParseIntError),
+    InvalidDigestLength {
+        expected: usize,
+        actual: usize,
+    },
+    UnknownActionEvent(String),
+    UnknownSuccessAction(String),
+    ParseFileSize(ParseIntError),
+    ParseUuid(uuid::Error),
+    ParseUrl(url::ParseError),
+}
+
+impl Display for Error {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::TryFromHex(err) => write!(fmt, "failed to convert from hex: {err}"),
+            Error::InvalidDigestLength {
+                expected,
+                actual,
+            } => {
+                write!(fmt, "invalid digest length: expected {expected}, actual {actual}")
+            }
+            Error::UnknownActionEvent(action) => write!(fmt, "unknown action event: {action}"),
+            Error::UnknownSuccessAction(action) => write!(fmt, "unknown success action: {action}"),
+            Error::ParseFileSize(err) => write!(fmt, "failed to parse file size: {err}"),
+            Error::ParseUuid(err) => write!(fmt, "failed to parse uuid: {err}"),
+            Error::ParseUrl(err) => write!(fmt, "failed to parse url: {err}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}