From 92ce31ac46809abf75b1463cd85b98e5f2f5a889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20N=2E=20Robalino?= Date: Thu, 22 Aug 2019 23:51:43 -0500 Subject: [PATCH] rmwrapped cd - ls --- src/shell/filesystem_shell.rs | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/shell/filesystem_shell.rs b/src/shell/filesystem_shell.rs index 2d1eb977b..2cbf4d0f4 100644 --- a/src/shell/filesystem_shell.rs +++ b/src/shell/filesystem_shell.rs @@ -73,20 +73,30 @@ impl Shell for FilesystemShell { } fn ls(&self, args: EvaluatedWholeStreamCommandArgs) -> Result { - let cwd = self.path.clone(); - let mut full_path = PathBuf::from(&self.path); + let cwd = self.path(); + let mut full_path = PathBuf::from(self.path()); + match &args.nth(0) { Some(Tagged { item: value, .. }) => full_path.push(Path::new(&value.as_string()?)), _ => {} } - let entries = glob::glob(&full_path.to_string_lossy()); - if entries.is_err() { - return Err(ShellError::string("Invalid pattern.")); - } + let entries: Vec<_> = match glob::glob(&full_path.to_string_lossy()) { + Ok(files) => files.collect(), + Err(_) => { + if let Some(source) = args.nth(0) { + return Err(ShellError::labeled_error( + "Invalid pattern", + "Invalid pattern", + source.span(), + )); + } else { + return Err(ShellError::string("Invalid pattern.")); + } + } + }; let mut shell_entries = VecDeque::new(); - let entries: Vec<_> = entries.unwrap().collect(); // If this is a single entry, try to display the contents of the entry if it's a directory if entries.len() == 1 { @@ -185,11 +195,11 @@ impl Shell for FilesystemShell { match std::env::set_current_dir(&path) { Ok(_) => {} Err(_) => { - if args.len() > 0 { + if let Some(directory) = args.nth(0) { return Err(ShellError::labeled_error( "Can not change to directory", "directory not found", - args.nth(0).unwrap().span().clone(), + directory.span(), )); } else { return Err(ShellError::string("Can not change to directory"));