mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make source of IO errors more obvious

Browse source
This commit is contained in:
Cole Helbling 2024-06-06 08:02:47 -07:00
parent 06ffb16385
commit 0a64d2c632
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
magic-nix-cache/src/flakehub.rs
View file

@ -38,9 +38,24 @@ pub async fn init_cache(
) -> Result<State> { ) -> Result<State> {
// Parse netrc to get the credentials for api.flakehub.com. // Parse netrc to get the credentials for api.flakehub.com.
let netrc = { let netrc = {
let mut netrc_file = File::open(flakehub_api_server_netrc).await?; let mut netrc_file = File::open(flakehub_api_server_netrc).await.map_err(|e| {
Error::Internal(format!(
"Failed to open {}: {}",
flakehub_api_server_netrc.display(),
e
))
})?;
let mut netrc_contents = String::new(); let mut netrc_contents = String::new();
netrc_file.read_to_string(&mut netrc_contents).await?; netrc_file
.read_to_string(&mut netrc_contents)
.await
.map_err(|e| {
Error::Internal(format!(
"Failed to read {} contents: {}",
flakehub_api_server_netrc.display(),
e
))
})?;
netrc_rs::Netrc::parse(netrc_contents, false).map_err(Error::Netrc)? netrc_rs::Netrc::parse(netrc_contents, false).map_err(Error::Netrc)?
}; };
@ -84,7 +99,15 @@ pub async fn init_cache(
.create(false) .create(false)
.append(true) .append(true)
.open(flakehub_api_server_netrc) .open(flakehub_api_server_netrc)
.await?; .await
.map_err(|e| {
Error::Internal(format!(
"Failed to open {} for appending: {}",
flakehub_api_server_netrc.display(),
e
))
})?;
netrc_file netrc_file
.write_all( .write_all(
format!( format!(
@ -93,7 +116,14 @@ pub async fn init_cache(
) )
.as_bytes(), .as_bytes(),
) )
.await?; .await
.map_err(|e| {
Error::Internal(format!(
"Failed to write credentials to {}: {}",
flakehub_api_server_netrc.display(),
e
))
})?;
} }
let server_config = ServerConfig { let server_config = ServerConfig {