Can read files named "cache" now, cache subcommand working too #275
Conversation
Now if a cache file exists in the current directory, and the use passes no arguments to the cache command, the cache file would be displayed. If however the user uses cache command with arguments, the cache command would be executed as normal regardless of wether the file cache exists in the current directory or not.
|
Okay so like I have tried everything I could to pass the travis check, but I just can not pass it 😅 Like, please look at it and let me know what's wrong, cargo fmt says things have been changed but then removes and adds the same line, I am pretty confused. |
BK1603
changed the title
|
Thank you very much for your contribution!
It's just trailing whitespace that |
| run_cache_subcommand(cache_matches)?; | ||
| Ok(true) | ||
| } else { | ||
| let mut config = app.config()?; |
There was a problem hiding this comment.
The code duplication in this else-clause is kind of unfortunate (it mirrors most steps that we normally do, if no subcommand is given).
I was wondering whether we could simply take out the cache subcommand completely if a cache file exists. We wouldn't get the behavior which you implemented here (i.e. that bat cache --init still works)
There was a problem hiding this comment.
Umm, yeah I thought about it, like implementing that in the app.rs file, but, umm, how about we make a function for calling the controller and call it first here and then in the other match clause?
There was a problem hiding this comment.
Or else we can do what you are suggesting, but yep that is gonna drop the functionality there 😅
There was a problem hiding this comment.
Ok, sounds good. We should probably move the HighlightingAssets::new() part into this new function (and remove the assets argument from list_languages and list_themes and just call HighlightingAssets::new() inside those functions).
There was a problem hiding this comment.
I will be doing what you just said! Should be ready in a few minutes!
src/app.rs
Outdated
| @@ -102,6 +103,10 @@ impl App { | |||
| AppSettings::ColorNever | |||
| }; | |||
|
|
|||
| // Check if the current directory contains a file name cache, if it does | |||
| // do not make the arguements for subcommand 'cache' required. | |||
| let arg_group_required = !Path::new("./cache").exists(); | |||
There was a problem hiding this comment.
I think this can be just "cache", right?
There was a problem hiding this comment.
Oh yeagh 😓
Just a minute let me fix that
git has been disturbing me
|
Sorry for all the mess 😅 Also if there is anything else that isn't like, with the conventions please let me know And thanks a lot for reviewing the code and telling me about the mistakes 😄 |
|
Do you want me to call |
|
I fixed it 😅 |
No worries! You need to make sure to have the latest version of rustfmt-nightly. The style changes slightly from time to time.
Well, thank you for your contribution! |
|
IT'S DONE! |
|
Released in v0.7.0. |
Now if a cache file exists in the current directory, and the user passes
no arguments to the cache command, the cache file would be displayed.
If however the user uses cache command with arguments, the cache command
would be executed as normal regardless of wether the file cache exists
in the current directory or not.
Though now there won't be an error message displayed if the user uses the cache sub command without arguments in any directory that contains a file named cache.