Skip to content

Commit

Permalink
Only provide selection method when --envs is passed but no arguments,…
Browse files Browse the repository at this point in the history
… for the export subcommand
  • Loading branch information
humblepenguinn committed Feb 27, 2024
1 parent fec9dbe commit 899c2e2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/bin/envio/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ impl Command {
return;
};

if envs.is_none() {
if envs.is_some() && envs.as_ref().unwrap().contains(&"select".to_string()) {
let prompt = MultiSelect::new("Select the environment variables you want to export:", profile.envs.keys().collect())
.with_default(&(0..profile.envs.len()).collect::<Vec<usize>>())
.with_vim_mode(vim_mode)
Expand Down
12 changes: 6 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ impl Profile {
@param file_name &str
*/
pub fn export_envs(&self, file_name: &str, envs: &Option<Vec<String>>) {
pub fn export_envs(&self, file_name: &str, envs_selected: &Option<Vec<String>>) {
let mut file = std::fs::OpenOptions::new()
.create(true)
.write(true)
.append(false)
.truncate(true)
.open(get_cwd().join(file_name))
.unwrap();

Expand All @@ -171,13 +171,13 @@ impl Profile {
}

let mut keys: Vec<_> = self.envs.keys().cloned().collect::<Vec<String>>();
if let Some(envs) = envs {
if !envs.is_empty() {
if let Some(envs_selected) = envs_selected {
if !envs_selected.is_empty() {
keys = self
.envs
.keys()
.into_iter()
.filter(|item| envs.contains(item))
.filter(|item| envs_selected.contains(item))
.cloned()
.collect::<Vec<String>>();
}
Expand All @@ -192,7 +192,7 @@ impl Profile {
buffer = buffer + key.as_str() + "=" + self.envs.get(key.as_str()).unwrap() + "\n";
}

if let Err(e) = writeln!(file, "{}", buffer) {
if let Err(e) = write!(file, "{}", buffer) {
println!("{}: {}", "Error".red(), e);
}

Expand Down

0 comments on commit 899c2e2

Please sign in to comment.