oxalica/nil
1
1
Fork 0
mirror of https://github.com/oxalica/nil.git synced 2024-11-26 12:30:54 +03:00
Code Issues Projects Releases Wiki Activity

Warn users about unavailable flake inputs

Browse Source
This commit is contained in:
oxalica 2023-01-27 18:52:59 +08:00
parent c1352ac4b1
commit 27abf4d61d
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
crates/nil/src/server.rs
View File

@ -15,7 +15,7 @@ use std::cell::Cell;
use std::collections::HashMap; use std::collections::HashMap;
use std::io::ErrorKind; use std::io::ErrorKind;
use std::panic::UnwindSafe; use std::panic::UnwindSafe;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::sync::{Arc, Once, RwLock}; use std::sync::{Arc, Once, RwLock};
use std::{fs, panic, thread}; use std::{fs, panic, thread};
@ -35,7 +35,10 @@ enum Event {
} }
enum LoadFlakeResult { enum LoadFlakeResult {
IsFlake(FlakeInfo), IsFlake {
flake_info: FlakeInfo,
missing_inputs: bool,
},
NotFlake, NotFlake,
} }
@ -212,9 +215,17 @@ impl Server {
format!("Failed to load flake workspace: {err:#}"), format!("Failed to load flake workspace: {err:#}"),
); );
} }
Ok(LoadFlakeResult::IsFlake(flake)) => { Ok(LoadFlakeResult::IsFlake {
tracing::info!("Workspace is a flake: {flake:?}"); flake_info,
self.vfs.write().unwrap().set_flake_info(Some(flake)); missing_inputs,
}) => {
tracing::info!(
"Workspace is a flake (missing_inputs = {missing_inputs}): {flake_info:?}"
);
if missing_inputs {
self.show_message(MessageType::WARNING, "Some flake inputs are not available, please run `nix flake archive` to fetch all inputs");
}
self.vfs.write().unwrap().set_flake_info(Some(flake_info));
self.apply_vfs_change(); self.apply_vfs_change();
} }
Ok(LoadFlakeResult::NotFlake) => { Ok(LoadFlakeResult::NotFlake) => {
@ -378,10 +389,13 @@ impl Server {
Ok(lock_src) => lock_src, Ok(lock_src) => lock_src,
// Flake without inputs. // Flake without inputs.
Err(err) if err.kind() == ErrorKind::NotFound => { Err(err) if err.kind() == ErrorKind::NotFound => {
return Ok(LoadFlakeResult::IsFlake(FlakeInfo { return Ok(LoadFlakeResult::IsFlake {
flake_file, missing_inputs: false,
input_store_paths: HashMap::new(), flake_info: FlakeInfo {
})) flake_file,
input_store_paths: HashMap::new(),
},
});
} }
Err(err) => { Err(err) => {
return Err(anyhow::Error::new(err) return Err(anyhow::Error::new(err)
@ -394,15 +408,20 @@ impl Server {
.context("Failed to resolve flake inputs from lock file")?; .context("Failed to resolve flake inputs from lock file")?;
// We only need the map for input -> store path. // We only need the map for input -> store path.
let inputs_cnt = inputs.len();
let input_store_paths = inputs let input_store_paths = inputs
.into_iter() .into_iter()
.filter(|(_, input)| Path::new(&input.store_path).exists())
.map(|(key, input)| Ok((key, VfsPath::new(input.store_path)?))) .map(|(key, input)| Ok((key, VfsPath::new(input.store_path)?)))
.collect::<Result<_>>()?; .collect::<Result<HashMap<_, _>>>()?;
Ok(LoadFlakeResult::IsFlake(FlakeInfo { Ok(LoadFlakeResult::IsFlake {
flake_file, missing_inputs: input_store_paths.len() != inputs_cnt,
input_store_paths, flake_info: FlakeInfo {
})) flake_file,
input_store_paths,
},
})
}; };
self.task_tx self.task_tx
.send(Box::new(move || Event::LoadFlake(task()))) .send(Box::new(move || Event::LoadFlake(task())))