diff --git a/CHANGELOG.md b/CHANGELOG.md index 9de078c..e5845f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ Dates are given in YYYY-MM-DD format. #### Features - Added `-x`/`--exclude` flag for excluding file extensions (overrides `-e` or `-E`) +#### Other +- Publish my fork of ['mime_guess'] as ['new_mime_guess'], allowing it to be used properly with + [crates.io](https://crates.io) + ### v0.2.13 (2021-04-26) #### Features - Added `-v`/`--verbose` flag for setting verbosity without using `RUST_LOG` @@ -148,4 +152,5 @@ Initial commit! [`clap`]: https://crates.io/crates/clap [`infer`]: https://crates.io/crates/infer [`mime_guess`]: https://crates.io/crates/mime_guess +[`new_mime_guess`]: https://crates.io/crates/mime_guess [`snailquote`]: https://crates.io/crates/snailquote \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 492ea85..880b12a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,7 +204,7 @@ dependencies = [ "infer", "itertools", "log", - "mime_guess", + "new_mime_guess", "once_cell", "rayon", "smartstring", @@ -348,9 +348,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] -name = "mime_guess" +name = "new_mime_guess" version = "2.0.4" -source = "git+https://github.com/Lynnesbian/mime_guess#5432b3c1991372291a5e67457cc9307c85f77bd9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eafbe0ec4560a250f49cda59952d7a377b364918d7d8163d71790158c986e54" dependencies = [ "mime", "unicase", @@ -578,9 +579,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" +checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9f5203e..9a54ade 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ xdg-mime-backend = [] [dependencies] walkdir = "2.3.2" log = "0.4.14" -mime_guess = "2.0.3" +mime_guess = { package = "new_mime_guess", version = "2.0.4" } snailquote = "0.3.0" once_cell = "1.7.2" infer = "0.4.0" @@ -41,10 +41,6 @@ xdg-mime = "0.3.3" [target.'cfg(not(all(target_endian = "big", target_pointer_width = "32")))'.dependencies] smartstring = "0.2.6" -[patch.crates-io] -# forked version with many more mime types -mime_guess = { git = "https://github.com/Lynnesbian/mime_guess", version = "2.0.4" } - [dependencies.clap] version = "3.0.0-beta.2" default-features = false diff --git a/src/parameters.rs b/src/parameters.rs index d3d208e..edc639a 100644 --- a/src/parameters.rs +++ b/src/parameters.rs @@ -55,6 +55,8 @@ pub struct Parameters { #[clap(short = 'x', long, use_delimiter = true, require_delimiter = true)] pub exclude: Option>, + // TODO: -X/--exclude-set - allows you to exclude all extensions in a set, e.g. "-X documents" + /// Don't skip hidden files and directories. /// Even if this flag is not present, fif will still recurse into a hidden root directory - for example, `fif /// ~/.hidden` will recurse into `~/.hidden` regardless of whether or not -s was passed as an argument.