Merge pull request #670 from jonathandturner/improve_ls_and_defaults

Improve default features and don't precompute ls

Cargo.lock

@@ -1556,7 +1556,7 @@ dependencies = [
  "rawkey 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "roxmltree 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustyline 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustyline 5.0.2 (git+https://github.com/kkawakam/rustyline)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2196,7 +2196,7 @@ dependencies = [
 [[package]]
 name = "rustyline"
 version = "5.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/kkawakam/rustyline#5e68e972810133a7343b75db30addc98aea63ba0"
 dependencies = [
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3216,7 +3216,7 @@ dependencies = [
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rustyline 5.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f8ee0838a6594169a1c5f4bb9af0fe692cc99691941710a8cc6576395ede804e"
+"checksum rustyline 5.0.2 (git+https://github.com/kkawakam/rustyline)" = "<none>"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"

Cargo.toml

@@ -85,12 +85,12 @@ ptree = {version = "0.2", optional = true }
 image = { version = "0.22.2", default_features = false, features = ["png_codec", "jpeg"], optional = true }
 
 [features]
+default = ["textview", "sys", "ps"]
 raw-key = ["rawkey", "neso"]
 textview = ["syntect", "onig_sys", "crossterm"]
 binaryview = ["image", "crossterm"]
 sys = ["heim", "battery"]
 ps = ["heim"]
-all = ["raw-key", "textview", "binaryview", "sys", "ps", "clipboard", "ptree"]
 
 [dependencies.rusqlite]
 version = "0.20.0"

src/shell/filesystem_shell.rs

@@ -94,8 +94,49 @@ impl Shell for FilesystemShell {
             _ => {}
         }
 
-        let entries: Vec<_> = match glob::glob(&full_path.to_string_lossy()) {
+        let mut shell_entries = VecDeque::new();
-            Ok(files) => files.collect(),
+
+        //If it's not a glob, try to display the contents of the entry if it's a directory
+        let lossy_path = full_path.to_string_lossy();
+        if !lossy_path.contains("*") && !lossy_path.contains("?") {
+            let entry = Path::new(&full_path);
+            if entry.is_dir() {
+                let entries = std::fs::read_dir(&entry);
+                let entries = match entries {
+                    Err(e) => {
+                        if let Some(s) = pattern {
+                            return Err(ShellError::labeled_error(
+                                e.to_string(),
+                                e.to_string(),
+                                s.tag(),
+                            ));
+                        } else {
+                            return Err(ShellError::labeled_error(
+                                e.to_string(),
+                                e.to_string(),
+                                command_tag,
+                            ));
+                        }
+                    }
+                    Ok(o) => o,
+                };
+                for entry in entries {
+                    let entry = entry?;
+                    let filepath = entry.path();
+                    let filename = if let Ok(fname) = filepath.strip_prefix(&cwd) {
+                        fname
+                    } else {
+                        Path::new(&filepath)
+                    };
+                    let value = dir_entry_dict(filename, &entry.metadata()?, command_tag)?;
+                    shell_entries.push_back(ReturnSuccess::value(value))
+                }
+                return Ok(shell_entries.to_output_stream());
+            }
+        }
+
+        let entries = match glob::glob(&full_path.to_string_lossy()) {
+            Ok(files) => files,
             Err(_) => {
                 if let Some(source) = pattern {
                     return Err(ShellError::labeled_error(
@@ -109,47 +150,6 @@ impl Shell for FilesystemShell {
             }
         };
 
-        let mut shell_entries = VecDeque::new();
-
-        // If this is a single entry, try to display the contents of the entry if it's a directory
-        if entries.len() == 1 {
-            if let Ok(entry) = &entries[0] {
-                if entry.is_dir() {
-                    let entries = std::fs::read_dir(&entry);
-                    let entries = match entries {
-                        Err(e) => {
-                            if let Some(s) = pattern {
-                                return Err(ShellError::labeled_error(
-                                    e.to_string(),
-                                    e.to_string(),
-                                    s.tag(),
-                                ));
-                            } else {
-                                return Err(ShellError::labeled_error(
-                                    e.to_string(),
-                                    e.to_string(),
-                                    command_tag,
-                                ));
-                            }
-                        }
-                        Ok(o) => o,
-                    };
-                    for entry in entries {
-                        let entry = entry?;
-                        let filepath = entry.path();
-                        let filename = if let Ok(fname) = filepath.strip_prefix(&cwd) {
-                            fname
-                        } else {
-                            Path::new(&filepath)
-                        };
-                        let value = dir_entry_dict(filename, &entry.metadata()?, command_tag)?;
-                        shell_entries.push_back(ReturnSuccess::value(value))
-                    }
-                    return Ok(shell_entries.to_output_stream());
-                }
-            }
-        }
-
         // Enumerate the entries from the glob and add each
         for entry in entries {
             if let Ok(entry) = entry {