From 1dadf3662416432887bdbe743c2f47e173858270 Mon Sep 17 00:00:00 2001 From: Truman Kilen Date: Sat, 18 Jan 2025 15:31:15 -0600 Subject: [PATCH] Improve oodle loader errors --- oodle_loader/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/oodle_loader/src/lib.rs b/oodle_loader/src/lib.rs index 7fe5f89..835a618 100644 --- a/oodle_loader/src/lib.rs +++ b/oodle_loader/src/lib.rs @@ -127,7 +127,7 @@ fn url() -> String { #[derive(thiserror::Error, Debug)] pub enum Error { - #[error("hash mismatch expected: {expected} got {found}")] + #[error("Oodle lib hash mismatch expected: {expected} got {found}")] HashMismatch { expected: String, found: String }, #[error("Oodle compression failed")] CompressionFailed, @@ -137,7 +137,7 @@ pub enum Error { Io(#[from] std::io::Error), #[error("ureq error {0:?}")] Ureq(Box), - #[error("libloading error {0:?}")] + #[error("Oodle libloading error {0:?}")] LibLoading(#[from] libloading::Error), } impl From for Error { @@ -173,7 +173,8 @@ fn fetch_oodle() -> Result { check_hash(&buffer)?; std::fs::write(&oodle_path, buffer)?; } - check_hash(&std::fs::read(&oodle_path)?)?; + // don't check existing file to allow user to substitute other versions + // check_hash(&std::fs::read(&oodle_path)?)?; Ok(oodle_path) }