feat: Listing files only #381

hulxv · 2023-09-18T21:17:44Z

What's new?

Add '-f' and '--only-files' flag to list files only (like '-D' and '--only-dirs' to list dirs only)

Example:

content

  hello.rs 
  bye.rs 
  todo.txt
  README.md
  tests/
  docs/ 
  projects/

usage

$ eza --only-files -1
hello.rs 
bye.rs 
todo.txt
README.md

Close #367

9glenda · 2023-09-18T21:56:23Z

src/fs/filter.rs

+            }
+            (false, true) => {
+                // On pass -'-only-files' flag only
+                files.retain(File::is_file)


Add a semicolon for consistent formatting. Like this:

files.retain(File::is_file);

9glenda · 2023-09-18T22:01:00Z

@hulxv try running cargo clippy next time before opening a pull request. Nothing wrong with your code but the CI fails if cargo clippy warnings are in the code.

9glenda · 2023-09-18T22:16:51Z

src/fs/filter.rs

@@ -41,6 +41,9 @@ pub struct FileFilter {
    /// Whether to only show directories.
    pub only_dirs: bool,

+    /// Whether to only show files.
+    pub only_files: bool,


According to clippy

error: more than 3 bools in a struct
--> src/fs/filter.rs:27:1
|
27 | / pub struct FileFilter {
28 | |
29 | | /// Whether directories should be listed first, and other types of file
30 | | /// second. Some users prefer it like this.
... |
65 | | pub git_ignore: GitIgnore,
66 | | }
| |_^
|
= help: consider using a state machine or refactoring bools into two-variant enums
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#struct_excessive_bools
= note: -D clippy::struct-excessive-bools implied by -D warnings

error: could not compile eza (bin "eza") due to previous error
Error: Process completed with exit code 101.

I think this is not that big of a problem but I'm not really into rust types so maybe it should be addressed.

But as far as I understand it this can't be done through and enums as clippy suggests

I working on this. some minutes and I will push the solution

hulxv · 2023-09-18T22:57:54Z

I think this is the best way to solve the clippy error

9glenda

LGTM

9glenda · 2023-09-18T23:12:26Z

src/fs/filter.rs

-    /// Whether to only show directories.
-    pub only_dirs: bool,
+    // Flags that the file filtering process follow
+    pub flags: Vec<FileFilterFlags>,


Nice adding a vector and using an enum. Yes I think this is way more elegant then the struct.

cafkafk

Thanks, this a nice improvement, and the code looks good. Thanks for also adding a trycmd test.

Could you add completions for:

zsh
fish
bash

Also, you'd have to document your changes in:

the manpage man/eza.1.md
the README.md

cafkafk · 2023-09-20T03:26:25Z

src/fs/filter.rs

+        match (self.flags.contains(&OnlyDirs), self.flags.contains(&OnlyFiles)) {
+            (true, false) => {
+                // On pass -'-only-dirs' flag only
+                files.retain(File::is_directory);
+            }
+            (false, true) => {
+                // On pass -'-only-files' flag only
+                files.retain(File::is_file);
+            }
+            _ => {}


Doing it like this means that -f --only-dirs falls through and doesn't just show no files. It's probably the best solution, because -f --only-dirs is completely useless if it didn't show anything.

hulxv · 2023-09-20T12:01:40Z

I'm not familiar with bash. I read completions/bash/eza but I didn't understand what I should do to add completion for --only-files

cafkafk · 2023-09-20T12:28:40Z

I'm not familiar with bash. I read completions/bash/eza but I didn't understand what I should do to add completion for --only-files

Honestly, it is fine if you don't wanna do the bash completions, few if any here know how to do them and they're horribly out of date anyways. With no bash users as contributors we can skip it tbh.

daviessm · 2023-09-20T13:37:12Z

With no bash users as contributors we can skip it tbh.

I'm an unfortunate bash user (historical reasons), I'll try to go through all the completions and make a PR to fix them all at some point.

Edit: #400

cafkafk · 2023-09-20T14:43:02Z

With no bash users as contributors we can skip it tbh.

I'm an unfortunate bash user (historical reasons), I'll try to go through all the completions and make a PR to fix them all at some point.

Ohh, well, thanks for looking into it! You're both the designated windows and bash guy now :p

hulxv · 2023-09-20T15:16:32Z

Is all done or is there still anything should I do?

cafkafk

Is all done or is there still anything should I do?

Nope, seems good to me. Tested sandboxed integrations tests, tested behavior locally, tested completions still work for zsh and fish. Also checked man page generation still works and looks good.

Thanks for the contribution, merging in a moment 👍

hulxv · 2023-09-23T12:58:17Z

This PR hasn't merged yet. Is there any problem?

cafkafk · 2023-09-23T16:46:50Z

This PR hasn't merged yet. Is there any problem?

Yes... I forgot it. Thanks for pinging me >_<

hulxv added 2 commits September 19, 2023 00:14

feat: listing files only using '--only-files' flag

7edd62d

test: test for listing files only

b0d44fc

hulxv requested a review from cafkafk as a code owner September 18, 2023 21:17

9glenda suggested changes Sep 18, 2023

View reviewed changes

fix(clippy): error for missed semicolon

237cf9b

9glenda approved these changes Sep 18, 2023

View reviewed changes

9glenda suggested changes Sep 18, 2023

View reviewed changes

fix(clippy): more than 3 bools in a struct

6ab13b9

9glenda approved these changes Sep 18, 2023

View reviewed changes

cafkafk requested changes Sep 20, 2023

View reviewed changes

hulxv added 2 commits September 20, 2023 17:40

docs: documenting --only-files

34ae54b

chore: add completion for --only-fies (zsh,fish)

d9b798e

cafkafk approved these changes Sep 20, 2023

View reviewed changes

cafkafk merged commit c5b544c into eza-community:main Sep 23, 2023

razvanazamfirei mentioned this pull request Sep 25, 2023

eza 0.13.1 Homebrew/homebrew-core#145861

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Listing files only #381

feat: Listing files only #381

hulxv commented Sep 18, 2023

9glenda Sep 18, 2023

9glenda commented Sep 18, 2023

9glenda Sep 18, 2023

9glenda Sep 18, 2023 •

edited

Loading

hulxv Sep 18, 2023

hulxv commented Sep 18, 2023

9glenda left a comment

9glenda Sep 18, 2023

cafkafk left a comment •

edited

Loading

cafkafk Sep 20, 2023

hulxv commented Sep 20, 2023

cafkafk commented Sep 20, 2023

daviessm commented Sep 20, 2023 •

edited

Loading

cafkafk commented Sep 20, 2023

hulxv commented Sep 20, 2023

cafkafk left a comment

hulxv commented Sep 23, 2023

cafkafk commented Sep 23, 2023

feat: Listing files only #381

feat: Listing files only #381

Conversation

hulxv commented Sep 18, 2023

What's new?

Example:

9glenda Sep 18, 2023

Choose a reason for hiding this comment

9glenda commented Sep 18, 2023

9glenda Sep 18, 2023

Choose a reason for hiding this comment

According to clippy

9glenda Sep 18, 2023 • edited Loading

Choose a reason for hiding this comment

hulxv Sep 18, 2023

Choose a reason for hiding this comment

hulxv commented Sep 18, 2023

9glenda left a comment

Choose a reason for hiding this comment

9glenda Sep 18, 2023

Choose a reason for hiding this comment

cafkafk left a comment • edited Loading

Choose a reason for hiding this comment

cafkafk Sep 20, 2023

Choose a reason for hiding this comment

hulxv commented Sep 20, 2023

cafkafk commented Sep 20, 2023

daviessm commented Sep 20, 2023 • edited Loading

cafkafk commented Sep 20, 2023

hulxv commented Sep 20, 2023

cafkafk left a comment

Choose a reason for hiding this comment

hulxv commented Sep 23, 2023

cafkafk commented Sep 23, 2023

9glenda Sep 18, 2023 •

edited

Loading

cafkafk left a comment •

edited

Loading

daviessm commented Sep 20, 2023 •

edited

Loading