From 2bb03d98134555527d97105e1dbef08f708d29fc Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathan.d.turner@gmail.com>
Date: Mon, 18 Nov 2019 06:10:50 +1300
Subject: [PATCH] Abbreviate ls by default, add --full flag

---
 src/commands/ls.rs            | 17 ++++++++++-------
 src/data/files.rs             | 18 ++++++++++++++----
 src/shell/filesystem_shell.rs |  5 +++--
 src/shell/help_shell.rs       |  1 +
 src/shell/shell.rs            |  1 +
 src/shell/shell_manager.rs    |  3 ++-
 src/shell/value_shell.rs      |  1 +
 7 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/commands/ls.rs b/src/commands/ls.rs
index b108a53c0c..6bc2daa28d 100644
--- a/src/commands/ls.rs
+++ b/src/commands/ls.rs
@@ -8,6 +8,7 @@ pub struct LS;
 #[derive(Deserialize)]
 pub struct LsArgs {
     path: Option<Tagged<PathBuf>>,
+    full: bool,
 }
 
 impl WholeStreamCommand for LS {
@@ -16,11 +17,13 @@ impl WholeStreamCommand for LS {
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("ls").optional(
-            "path",
-            SyntaxShape::Pattern,
-            "a path to get the directory contents from",
-        )
+        Signature::build("ls")
+            .optional(
+                "path",
+                SyntaxShape::Pattern,
+                "a path to get the directory contents from",
+            )
+            .switch("full", "list all available columns for each entry")
     }
 
     fn usage(&self) -> &str {
@@ -37,6 +40,6 @@ impl WholeStreamCommand for LS {
     }
 }
 
-fn ls(LsArgs { path }: LsArgs, context: RunnableContext) -> Result<OutputStream, ShellError> {
-    context.shell_manager.ls(path, &context)
+fn ls(LsArgs { path, full }: LsArgs, context: RunnableContext) -> Result<OutputStream, ShellError> {
+    context.shell_manager.ls(path, &context, full)
 }
diff --git a/src/data/files.rs b/src/data/files.rs
index 47c6ae093f..1e565ece37 100644
--- a/src/data/files.rs
+++ b/src/data/files.rs
@@ -13,6 +13,7 @@ pub(crate) fn dir_entry_dict(
     filename: &std::path::Path,
     metadata: &std::fs::Metadata,
     tag: impl Into<Tag>,
+    full: bool,
 ) -> Result<Tagged<Value>, ShellError> {
     let mut dict = TaggedDictBuilder::new(tag);
     dict.insert("name", Value::string(filename.to_string_lossy()));
@@ -26,10 +27,19 @@ pub(crate) fn dir_entry_dict(
     };
 
     dict.insert("type", Value::string(format!("{:?}", kind)));
-    dict.insert(
-        "readonly",
-        Value::boolean(metadata.permissions().readonly()),
-    );
+
+    if full {
+        dict.insert(
+            "readonly",
+            Value::boolean(metadata.permissions().readonly()),
+        );
+
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            dict.insert("mode", Value::int(metadata.permissions().mode()));
+        }
+    }
 
     dict.insert("size", Value::bytes(metadata.len() as u64));
 
diff --git a/src/shell/filesystem_shell.rs b/src/shell/filesystem_shell.rs
index 60d5135d11..1b8ee3387c 100644
--- a/src/shell/filesystem_shell.rs
+++ b/src/shell/filesystem_shell.rs
@@ -86,6 +86,7 @@ impl Shell for FilesystemShell {
         &self,
         pattern: Option<Tagged<PathBuf>>,
         context: &RunnableContext,
+        full: bool,
     ) -> Result<OutputStream, ShellError> {
         let cwd = self.path();
         let mut full_path = PathBuf::from(self.path());
@@ -136,7 +137,7 @@ impl Shell for FilesystemShell {
                                     Path::new(&filepath)
                                 };
 
-                                let value = dir_entry_dict(filename, &metadata, &name_tag)?;
+                                let value = dir_entry_dict(filename, &metadata, &name_tag, full)?;
                                 yield ReturnSuccess::value(value);
                             }
                         }
@@ -175,7 +176,7 @@ impl Shell for FilesystemShell {
                             Path::new(&entry)
                         };
 
-                        if let Ok(value) = dir_entry_dict(filename, &metadata, &name_tag) {
+                        if let Ok(value) = dir_entry_dict(filename, &metadata, &name_tag, full) {
                             yield ReturnSuccess::value(value);
                         }
                     }
diff --git a/src/shell/help_shell.rs b/src/shell/help_shell.rs
index 7c0e74bde4..88b4b3f344 100644
--- a/src/shell/help_shell.rs
+++ b/src/shell/help_shell.rs
@@ -129,6 +129,7 @@ impl Shell for HelpShell {
         &self,
         _pattern: Option<Tagged<PathBuf>>,
         _context: &RunnableContext,
+        _full: bool,
     ) -> Result<OutputStream, ShellError> {
         Ok(self
             .commands()
diff --git a/src/shell/shell.rs b/src/shell/shell.rs
index 507fc0517b..6f76838ad4 100644
--- a/src/shell/shell.rs
+++ b/src/shell/shell.rs
@@ -16,6 +16,7 @@ pub trait Shell: std::fmt::Debug {
         &self,
         pattern: Option<Tagged<PathBuf>>,
         context: &RunnableContext,
+        full: bool,
     ) -> Result<OutputStream, ShellError>;
     fn cd(&self, args: EvaluatedWholeStreamCommandArgs) -> Result<OutputStream, ShellError>;
     fn cp(&self, args: CopyArgs, name: Tag, path: &str) -> Result<OutputStream, ShellError>;
diff --git a/src/shell/shell_manager.rs b/src/shell/shell_manager.rs
index 149fdd58d1..247ba6ca5d 100644
--- a/src/shell/shell_manager.rs
+++ b/src/shell/shell_manager.rs
@@ -127,10 +127,11 @@ impl ShellManager {
         &self,
         path: Option<Tagged<PathBuf>>,
         context: &RunnableContext,
+        full: bool,
     ) -> Result<OutputStream, ShellError> {
         let env = self.shells.lock().unwrap();
 
-        env[self.current_shell()].ls(path, context)
+        env[self.current_shell()].ls(path, context, full)
     }
 
     pub fn cd(&self, args: EvaluatedWholeStreamCommandArgs) -> Result<OutputStream, ShellError> {
diff --git a/src/shell/value_shell.rs b/src/shell/value_shell.rs
index 0aa9e341bb..bc057e1e19 100644
--- a/src/shell/value_shell.rs
+++ b/src/shell/value_shell.rs
@@ -90,6 +90,7 @@ impl Shell for ValueShell {
         &self,
         target: Option<Tagged<PathBuf>>,
         context: &RunnableContext,
+        _full: bool,
     ) -> Result<OutputStream, ShellError> {
         let mut full_path = PathBuf::from(self.path());
         let name_tag = context.name.clone();