xavo95/repak
1
0
Fork 0
mirror of https://github.com/xavo95/repak.git synced 2025-02-22 15:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve oodle loader errors

Browse source
This commit is contained in:
Truman Kilen 2025-01-18 15:31:15 -06:00
parent 057429fde1
commit 1dadf36624
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
oodle_loader/src/lib.rs
View file

@ -127,7 +127,7 @@ fn url() -> String {
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum Error { pub enum Error {
#[error("hash mismatch expected: {expected} got {found}")] #[error("Oodle lib hash mismatch expected: {expected} got {found}")]
HashMismatch { expected: String, found: String }, HashMismatch { expected: String, found: String },
#[error("Oodle compression failed")] #[error("Oodle compression failed")]
CompressionFailed, CompressionFailed,
@ -137,7 +137,7 @@ pub enum Error {
Io(#[from] std::io::Error), Io(#[from] std::io::Error),
#[error("ureq error {0:?}")] #[error("ureq error {0:?}")]
Ureq(Box<ureq::Error>), Ureq(Box<ureq::Error>),
#[error("libloading error {0:?}")] #[error("Oodle libloading error {0:?}")]
LibLoading(#[from] libloading::Error), LibLoading(#[from] libloading::Error),
} }
impl From<ureq::Error> for Error { impl From<ureq::Error> for Error {
@ -173,7 +173,8 @@ fn fetch_oodle() -> Result<std::path::PathBuf> {
check_hash(&buffer)?; check_hash(&buffer)?;
std::fs::write(&oodle_path, 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) Ok(oodle_path)
} }