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

Error handling

Browse Source
This commit is contained in:
Sam Hedin 2020-06-15 15:42:09 +02:00
parent 309f5e02a0
commit 730f9ca30a
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,11 @@
use indexmap::{IndexMap, IndexSet}; use indexmap::{IndexMap, IndexSet};
use nu_protocol::{Primitive, UntaggedValue, Value}; use nu_protocol::{Primitive, UntaggedValue, Value};
use std::io::Write; use std::{
use std::io::{Error, ErrorKind, Result}; ffi::OsString,
use std::{ffi::OsString, fmt::Debug, fs::OpenOptions, path::PathBuf}; fmt::Debug,
io::{Error, ErrorKind, Result},
path::PathBuf,
};
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct DirectorySpecificEnvironment { pub struct DirectorySpecificEnvironment {
@ -12,7 +15,7 @@ pub struct DirectorySpecificEnvironment {
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.
overwritten_env_values: IndexMap<PathBuf, IndexMap<String, OsString>>, overwritten_env_vars: IndexMap<PathBuf, IndexMap<String, OsString>>,
} }
impl DirectorySpecificEnvironment { impl DirectorySpecificEnvironment {
@ -42,7 +45,7 @@ impl DirectorySpecificEnvironment {
DirectorySpecificEnvironment { DirectorySpecificEnvironment {
allowed_directories, allowed_directories,
added_env_vars: IndexMap::new(), added_env_vars: IndexMap::new(),
overwritten_env_values: IndexMap::new(), overwritten_env_vars: IndexMap::new(),
} }
} }
@ -55,13 +58,15 @@ impl DirectorySpecificEnvironment {
let mut keyvals_to_restore = IndexMap::new(); let mut keyvals_to_restore = IndexMap::new();
while let Some(wdir) = working_dir { while let Some(wdir) = working_dir {
if let Some(val) = self.overwritten_env_values.get(wdir) { if let Some(val) = self.overwritten_env_vars.get(wdir) {
new_overwritten_env_values.insert(wdir.to_path_buf(), val.clone()); new_overwritten_env_values.insert(wdir.to_path_buf(), val.clone());
} }
working_dir = working_dir.unwrap().parent(); working_dir = working_dir
.expect("This should not be None because of the while condition")
.parent();
} }
for (dir, keyvals) in &self.overwritten_env_values { for (dir, keyvals) in &self.overwritten_env_vars {
if !new_overwritten_env_values.contains_key(dir) { if !new_overwritten_env_values.contains_key(dir) {
keyvals.iter().for_each(|(k, v)| { keyvals.iter().for_each(|(k, v)| {
keyvals_to_restore.insert(k.clone(), v.to_str().unwrap().to_string()); keyvals_to_restore.insert(k.clone(), v.to_str().unwrap().to_string());
@ -69,7 +74,7 @@ impl DirectorySpecificEnvironment {
} }
} }
self.overwritten_env_values = new_overwritten_env_values; self.overwritten_env_vars = new_overwritten_env_values;
Ok(keyvals_to_restore) Ok(keyvals_to_restore)
} }
@ -77,7 +82,6 @@ impl DirectorySpecificEnvironment {
let current_dir = std::env::current_dir()?; let current_dir = std::env::current_dir()?;
let mut working_dir = Some(current_dir.as_path()); let mut working_dir = Some(current_dir.as_path());
let empty = toml::value::Table::new();
let mut vars_to_add = IndexMap::new(); let mut vars_to_add = IndexMap::new();
//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.
@ -89,9 +93,9 @@ impl DirectorySpecificEnvironment {
toml_doc toml_doc
.get("env") .get("env")
.unwrap() .ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section missing"))?
.as_table() .as_table()
.unwrap_or_else(|| &empty) .ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section malformed"))?
.iter() .iter()
.for_each(|(k, v)| { .for_each(|(k, v)| {
if !vars_to_add.contains_key(k) { if !vars_to_add.contains_key(k) {
@ -99,7 +103,7 @@ impl DirectorySpecificEnvironment {
//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.
if let Some(val) = std::env::var_os(k) { if let Some(val) = std::env::var_os(k) {
self.overwritten_env_values self.overwritten_env_vars
.entry(wdir.to_path_buf()) .entry(wdir.to_path_buf())
.or_insert_with(|| IndexMap::new()) .or_insert_with(|| IndexMap::new())
.insert(k.clone(), val); .insert(k.clone(), val);
@ -113,9 +117,8 @@ impl DirectorySpecificEnvironment {
} }
}); });
} }
working_dir = working_dir //Keep going up in the directory structure with .parent() working_dir = working_dir //Keep going up in the directory structure with .parent()
.expect("This directory has no parent") .expect("This should not be None because of the while condition")
.parent(); .parent();
} }
@ -132,10 +135,12 @@ impl DirectorySpecificEnvironment {
while let Some(wdir) = working_dir { while let Some(wdir) = working_dir {
if let Some(vars_added_by_this_directory) = self.added_env_vars.get(wdir) { if let Some(vars_added_by_this_directory) = self.added_env_vars.get(wdir) {
new_added_env_vars.insert(wdir.to_path_buf(), vars_added_by_this_directory.clone());
//If we are still in a directory, we should continue to track the vars it added. //If we are still in a directory, we should continue to track the vars it added.
new_added_env_vars.insert(wdir.to_path_buf(), vars_added_by_this_directory.clone());
} }
working_dir = working_dir.expect("Root directory has no parent").parent(); working_dir = working_dir
.expect("This should not be None because of the while condition")
.parent();
} }
//Gather up all environment variables that should be deleted. //Gather up all environment variables that should be deleted.

11
crates/nu-cli/src/env/environment.rs vendored
View File

@ -2,9 +2,8 @@ use crate::data::config::Conf;
use crate::env::directory_specific_environment::*; use crate::env::directory_specific_environment::*;
use indexmap::{indexmap, IndexSet}; use indexmap::{indexmap, IndexSet};
use nu_protocol::{UntaggedValue, Value}; use nu_protocol::{UntaggedValue, Value};
use std::io::Write;
use std::ffi::OsString; use std::ffi::OsString;
use std::{fs::OpenOptions, fmt::Debug}; use std::fmt::Debug;
pub trait Env: Debug + Send { pub trait Env: Debug + Send {
fn env(&self) -> Option<Value>; fn env(&self) -> Option<Value>;
@ -64,18 +63,10 @@ impl Environment {
self.remove_env(&k); self.remove_env(&k);
}); });
// let mut file = OpenOptions::new()
// .write(true)
// .append(true)
// .create(true)
// .open("restore.txt")
// .unwrap();
self.direnv self.direnv
.overwritten_values_to_restore()? .overwritten_values_to_restore()?
.iter() .iter()
.for_each(|(k, v)| { .for_each(|(k, v)| {
// write!(&mut file, "restoring: {:?}\n", (k, v)).unwrap();
self.add_env(&k, &v, true); self.add_env(&k, &v, true);
}); });