extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-20 09:50:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and handle errors

Browse Source
This commit is contained in:
Sam Hedin 2020-06-07 07:01:51 +02:00
parent ff742ed675
commit e1581ec156
2 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
crates/nu-cli/src/env/directory_specific_environment.rs vendored
View File

@ -1,16 +1,17 @@
use indexmap::IndexMap; use indexmap::IndexMap;
use nu_protocol::{Primitive, UntaggedValue, Value}; use nu_protocol::{Primitive, UntaggedValue, Value};
use std::io::{Error, ErrorKind, Result};
use std::{ffi::OsString, fmt::Debug, path::PathBuf}; use std::{ffi::OsString, fmt::Debug, path::PathBuf};
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct DirectorySpecificEnvironment { pub struct DirectorySpecificEnvironment {
pub whitelisted_directories: Vec<PathBuf>, whitelisted_directories: Vec<PathBuf>,
//Directory -> Env key. If an environment var has been added from a .nu in a directory, we track it here so we can remove it when the user leaves the directory. //Directory -> Env key. If an environment var has been added from a .nu in a directory, we track it here so we can remove it when the user leaves the directory.
pub added_env_vars: IndexMap<PathBuf, Vec<String>>, added_env_vars: IndexMap<PathBuf, Vec<String>>,
//Directory -> (env_key, value). If a .nu overwrites some existing environment variables, they are added here so that they can be restored later. //Directory -> (env_key, value). If a .nu overwrites some existing environment variables, they are added here so that they can be restored later.
pub overwritten_env_values: IndexMap<PathBuf, Vec<(String, OsString)>>, overwritten_env_values: IndexMap<PathBuf, Vec<(String, OsString)>>,
} }
impl DirectorySpecificEnvironment { impl DirectorySpecificEnvironment {
@ -22,16 +23,17 @@ impl DirectorySpecificEnvironment {
{ {
wrapped_directories wrapped_directories
.iter() .iter()
.fold(vec![], |mut directories, dirval| { .filter_map(|dirval| {
if let Value { if let Value {
value: UntaggedValue::Primitive(Primitive::String(ref dir)), value: UntaggedValue::Primitive(Primitive::String(ref dir)),
tag: _, tag: _,
} = dirval } = dirval
{ {
directories.push(PathBuf::from(&dir)); return Some(PathBuf::from(&dir));
} }
directories None
}) })
.collect()
} else { } else {
vec![] vec![]
}; };
@ -44,7 +46,7 @@ impl DirectorySpecificEnvironment {
} }
} }
pub fn overwritten_values_to_restore(&mut self) -> std::io::Result<IndexMap<String, String>> { pub fn overwritten_values_to_restore(&mut self) -> Result<IndexMap<String, String>> {
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let mut keyvals_to_restore = IndexMap::new(); let mut keyvals_to_restore = IndexMap::new();
@ -60,7 +62,11 @@ impl DirectorySpecificEnvironment {
new_overwritten.insert(directory.clone(), keyvals.clone()); new_overwritten.insert(directory.clone(), keyvals.clone());
break; break;
} else { } else {
working_dir = working_dir.expect("Root directory has no parent").parent(); working_dir = working_dir //Keep going up in the directory structure with .parent()
.ok_or_else(|| {
Error::new(ErrorKind::NotFound, "Root directory has no parent")
})?
.parent();
} }
} }
if re_add_keyvals { if re_add_keyvals {
@ -68,7 +74,9 @@ impl DirectorySpecificEnvironment {
keyvals_to_restore.insert( keyvals_to_restore.insert(
k.clone(), k.clone(),
v.to_str() v.to_str()
.expect("Filepath is not valid unicode") .ok_or_else(|| {
Error::new(ErrorKind::Other, "Filepath is not valid unicode")
})?
.to_string(), .to_string(),
); );
} }
@ -79,7 +87,7 @@ impl DirectorySpecificEnvironment {
Ok(keyvals_to_restore) Ok(keyvals_to_restore)
} }
pub fn env_vars_to_add(&mut self) -> std::io::Result<IndexMap<String, String>> { pub fn env_vars_to_add(&mut self) -> Result<IndexMap<String, String>> {
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let mut vars_to_add = IndexMap::new(); let mut vars_to_add = IndexMap::new();
@ -89,15 +97,24 @@ impl DirectorySpecificEnvironment {
//Start in the current directory, then traverse towards the root with working_dir to see if we are in a subdirectory of a valid directory. //Start in the current directory, then traverse towards the root with working_dir to see if we are in a subdirectory of a valid directory.
while let Some(wdir) = working_dir { while let Some(wdir) = working_dir {
if wdir == dir.as_path() { if wdir == dir.as_path() {
//Read the .nu file and parse it into a nice map
let toml_doc = std::fs::read_to_string(wdir.join(".nu").as_path())? let toml_doc = std::fs::read_to_string(wdir.join(".nu").as_path())?
.parse::<toml::Value>()?; .parse::<toml::Value>()?;
let vars_in_current_file = toml_doc let vars_in_current_file = toml_doc
.get("env") .get("env")
.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidData, "No [env] section in .nu-file"))? .ok_or_else(|| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
"No [env] section in .nu-file",
)
})?
.as_table() .as_table()
.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidData, "Malformed [env] section in .nu-file"))?; .ok_or_else(|| {
Error::new(
ErrorKind::InvalidData,
"Malformed [env] section in .nu-file",
)
})?;
let mut keys_in_current_nufile = vec![]; let mut keys_in_current_nufile = vec![];
for (k, v) in vars_in_current_file { for (k, v) in vars_in_current_file {
@ -105,24 +122,29 @@ impl DirectorySpecificEnvironment {
keys_in_current_nufile.push(k.clone()); //this is used to keep track of which directory added which variables keys_in_current_nufile.push(k.clone()); //this is used to keep track of which directory added which variables
} }
self.overwritten_env_values.insert(
//If we are about to overwrite any environment variables, we save them first so they can be restored later. //If we are about to overwrite any environment variables, we save them first so they can be restored later.
self.overwritten_env_values.insert(
wdir.to_path_buf(), wdir.to_path_buf(),
keys_in_current_nufile keys_in_current_nufile
.iter() .iter()
.fold(vec![], |mut keyvals, key| { .filter_map(|key| {
if let Some(val) = std::env::var_os(key) { if let Some(val) = std::env::var_os(key) {
keyvals.push((key.clone(), val)); return Some((key.clone(), val));
} }
keyvals None
}), })
.collect(),
); );
self.added_env_vars self.added_env_vars
.insert(wdir.to_path_buf(), keys_in_current_nufile); .insert(wdir.to_path_buf(), keys_in_current_nufile);
break; break;
} else { } else {
working_dir = working_dir.expect("Root directory has no parent").parent(); working_dir = working_dir //Keep going up in the directory structure with .parent()
.ok_or_else(|| {
Error::new(ErrorKind::NotFound, "Root directory has no parent")
})?
.parent();
} }
} }
} }
@ -131,7 +153,7 @@ impl DirectorySpecificEnvironment {
} }
//If the user has left directories which added env vars through .nu, we clear those vars //If the user has left directories which added env vars through .nu, we clear those vars
pub fn env_vars_to_delete(&mut self) -> std::io::Result<Vec<String>> { pub fn env_vars_to_delete(&mut self) -> Result<Vec<String>> {
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
//Gather up all environment variables that should be deleted. //Gather up all environment variables that should be deleted.
@ -142,7 +164,7 @@ impl DirectorySpecificEnvironment {
let mut working_dir = Some(current_dir.as_path()); let mut working_dir = Some(current_dir.as_path());
while let Some(wdir) = working_dir { while let Some(wdir) = working_dir {
if &wdir == directory { if wdir == directory {
return vars_to_delete; return vars_to_delete;
} else { } else {
working_dir = working_dir.expect("Root directory has no parent").parent(); working_dir = working_dir.expect("Root directory has no parent").parent();

3
crates/nu-cli/src/env/environment_syncer.rs vendored
View File

@ -52,8 +52,7 @@ impl EnvironmentSyncer {
environment.add_env(&name, &value, false); environment.add_env(&name, &value, false);
environment environment
.maintain_directory_environment() .maintain_directory_environment().ok();
.expect("Could not set directory-based environment variables");
// clear the env var from the session // clear the env var from the session
// we are about to replace them // we are about to replace them