CHANGELOG.md

@@ -1,113 +0,0 @@
-# Changelog
-Dates are given in YYYY-MM-DD format.
-
-## v0.2
-### v0.2.11 (0201-)
-#### Features
-- fif can now traverse symlinks with the `-f`/`--follow-symlinks` flag
-- Extensions are no longer mandatory - running fif without `-e` or `-E` will scan all files, regardless of extension
-  (files without extensions are still skipped unless the -S flag is used)
-#### Bugfixes
-- Fixed compilation on big endian 32-bit architectures (see
-  [here]https://github.com/bodil/smartstring/blob/v0.2.6/src/config.rs#L101-L103 for why that was a problem in the first
-  place)
-- Fixed broken tests for the [`infer`] backend
-#### Other
-- Better mime type detection:
-  - Consider "some/x-thing" and "some/thing" to be identical
-  - Use a patched version of mime_guess (which took a while to make 0u0;) with many more extension<->type mappings
-
-### v0.2.10 (2021-03-26)
-- PowerShell support!
-
-### v0.2.9 (2021-03-17)
-- Replaced a bunch of `PathBuf`s with `Path`s, which should reduce memory usage
-- Formatting improvements
-
-### v0.2.8 (2021-03-03)
-#### Features
-- Added much more information - author, copyright, etc. - to `--help`/`-h` output
-- Scan files without extensions with `-S` (by default, such files are ignored)
-#### Bugfixes
-- Using `-s` to skip hidden files no longer skips all files if the root directory itself is hidden
-#### Other
-- The `ScanError` enum now contains a `PathBuf` - Errors now return `ScanError` rather than `(ScanError, PathBuf)`
-- Renamed modules in accordance with [Rust's API guidelines](https://rust-lang.github.io/api-guidelines/naming.html)
-
-### v0.2.7 (2021-03-01)
-- Default to `WARN`-level logging if `RUST_LOG` isn't set
-- Added a drone CI config
-- Added `test.py` for automated building and testing against Rust stable, beta, nightly, and the MSRV specified in
-  `Cargo.toml`
-- Added a test for argument parsing
-- Documentation! And lots of it! 0u0
-
-### v0.2.6 (2021-02-28)
-- Added tests!
-- Default to [`xdg-mime`] on all Unixy platforms, not just Linux - this also includes the various *BSDs (I've tested
-  FreeBSD), macOS (haven't tested, but I have a very old MacBook running Leopard that has file preinstalled, so it
-  *should* work fine), Redox OS (haven't tested), etc.
-
-### v0.2.5 (2021-02-27)
-- Use [`xdg-mime`] by default on Linux, [`infer`] elsewhere
-
-### v0.2.4 (2021-02-22)
-- Proper(ish) XML document support
-- Display version in help output
-
-### v0.2.3+hotfix (2021-02-22)
-- A quick hack to fix broken/non-existent support for XML document files - `docx`, `odt`, etc.
-
-### v0.2.3 (2021-02-22)
-#### Features
-- Automatically disable [`xdg-mime`] backend on Windows
-- Exit codes
-- Improved error handling
-- Retrieve extension sets from [`mime_guess`] rather than hardcoding them in
-#### Bugfixes
-- Improved SVG detection
-#### Other
-- Switched back from `printf` to `echo` in shell output
-- More frequent and detailed comments
-- Refactored `formats.rs`
-- Exclude certain files and directories from the crate
-
-### v0.2.2 (2021-02-20)
-- Windows support
-
-### v0.2.1 (2021-02-18)
-#### Features
-- Added extension sets -- you can now use, for example, `-E images` to check files with known image extensions
-- Shell script output now uses `printf` instead of `echo`
-- Added [`infer`] backend
-#### Bugfixes
-- Fixed broken singlethreaded support
-#### Other
-- Use a global backend instance instead of passing `&db` around constantly
-- Use `rustfmt` 0u0
-
-### v0.2.0 (2021-02-15)
-#### Features
-- Output a script rather than a list of misnamed files
-- Parallel file scanning
-- Added logging support
-#### Bugfixes
-- Handle filenames with invalid UTF-8
-#### Other
-- Added license
-- Replaced [`structopt`] with [`clap`] 3 (beta)
-- Specify 1.43.0 as minimum supported Rust version
-
-## v0.1
-### v0.1.0 (2021-02-04)
-Initial commit!
-- Only one backend - [`xdg-mime`]
-- Prints files directly rather than outputting a script
-- Only supported flags are `-e` (specify extensions) and `-s` (scan hidden files)
-
-<!-- links -->
-[`xdg-mime`]: https://crates.io/crates/xdg-mime
-[`structopt`]: https://crates.io/crates/structopt
-[`clap`]: https://crates.io/crates/clap
-[`infer`]: https://crates.io/crates/infer
-[`mime_guess`]: https://crates.io/crates/mime_guess

Cargo.lock

@@ -177,7 +177,7 @@ dependencies = [
 
 [[package]]
 name = "fif"
-version = "0.2.11"
+version = "0.2.10"
 dependencies = [
  "cached",
  "cfg-if",
@@ -284,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
 
 [[package]]
 name = "log"
@@ -305,9 +305,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memoffset"
-version = "0.6.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
 dependencies = [
  "autocfg",
 ]
@@ -320,8 +320,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
-source = "git+https://github.com/Lynnesbian/mime_guess#679d3b8887d30bd43a83f162d61b7226675c7012"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
 dependencies = [
  "mime",
  "unicase",
@@ -392,9 +393,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid",
 ]
@@ -549,9 +550,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "syn"
-version = "1.0.68"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87"
+checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fif"
 description = "A command-line tool for detecting and optionally correcting files with incorrect extensions."
-version = "0.2.11"
+version = "0.2.10"
 authors = ["Lynnesbian <lynne@bune.city>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
@@ -26,6 +26,7 @@ xdg-mime-backend = []
 [dependencies]
 walkdir = "2.3.1"
 log = "0.4.14"
+smartstring = "0.2.6"
 mime_guess = "2.0.3"
 snailquote = "0.3.0"
 once_cell = "1.5.2"
@@ -37,14 +38,9 @@ cfg-if = "1.0.0"
 [target.'cfg(unix)'.dependencies]
 xdg-mime = "0.3"
 
-[target.'cfg(not(all(target_endian = "big", target_pointer_width = "32")))'.dependencies]
-smartstring = "0.2.6"
-
 [patch.crates-io]
 # use git version while waiting on a release incorporating https://github.com/ebassi/xdg-mime-rs/commit/de5a6dd
 xdg-mime = {git = "https://github.com/ebassi/xdg-mime-rs", version = "0.3", rev = "de5a6dd" }
-# 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"

clippy.sh

@@ -6,19 +6,12 @@ cargo clippy --tests -- \
  -W clippy::pedantic \
  -W clippy::complexity \
  -W clippy::cargo \
- -W clippy::float_cmp_const \
- -W clippy::lossy_float_literal \
- -W clippy::multiple_inherent_impl \
- -W clippy::string_to_string \
- -W clippy::wrong_pub_self_convention \
  -A clippy::unused_io_amount \
  -A clippy::redundant_closure_for_method_calls \
- -A clippy::shadow_unrelated \
- -A clippy::option_if_let_else
+ -A clippy::shadow_unrelated
 
 # ALLOWS:
 # unused_io_amount: there are two places where i want to read up to X bytes and i'm fine with getting less than that
 # redundant_closure...: the alternative is often much more verbose
 # shadow_unrelated: sometimes things that seem unrelated are actually related ;)
-# option_if_let_else: the suggested code is usually harder to read than the original
 

src/findings.rs

@@ -1,7 +1,7 @@
 use std::path::Path;
 
-use crate::string_type::String;
 use mime_guess::Mime;
+use smartstring::alias::String;
 
 use crate::inspectors::mime_extension_lookup;
 

src/formats.rs

@@ -167,8 +167,6 @@ impl Format for Script {
 	}
 }
 
-// PowerShell is a noun, not a type
-#[allow(clippy::doc_markdown)]
 /// PowerShell script.
 pub struct PowerShell {}
 

src/inspectors.rs

@@ -8,9 +8,9 @@ use std::str::FromStr;
 
 use cached::cached;
 use mime_guess::Mime;
+use smartstring::alias::String;
 
 use crate::mime_db::MimeDb;
-use crate::string_type::String;
 
 /// The number of bytes to read initially.
 ///
@@ -72,24 +72,7 @@ cached! {
 		// match on the mime's `essence_str` rather than the mime itself - mime_guess::get_mime_extensions ignores the type
 		// suffix, treating "image/svg+xml" as "image/svg", and thus fails to find any extensions. passing the essence_str
 		// (which includes the suffix) fixes this.
-		let essence = mime.essence_str();
-		let mut exts = mime_guess::get_mime_extensions_str(essence);
-		if exts.is_none() {
-			// no matches :c
-			// mime_guess' database isn't exactly perfect... there are a lot of times where the db will return "some/x-thing"
-			// but mime_guess only understands "some/thing", or vice-versa.
-			// so, if there appear to be no extensions, try replacing "some/x-thing" with "some/thing", or "some/thing" with
-			// "some/x-thing".
-			if essence.contains("/x-") {
-				// replace e.g. "application/x-gzip" with "application/gzip"
-				exts = mime_guess::get_mime_extensions_str(&essence.replace("/x-", "/"));
-			} else {
-				// replace e.g. "video/mp2t" with "video/x-mp2t"
-				exts = mime_guess::get_mime_extensions_str(&essence.replace("/", "/x-"));
-			}
-		}
-
-		match exts {
+		match mime_guess::get_mime_extensions_str(mime.essence_str()) {
 			Some(exts) => {
 				let possible_exts: Vec<String> = exts.iter().map(|e| String::from(*e)).collect();
 

src/main.rs

@@ -41,7 +41,6 @@ mod inspectors;
 mod mime_db;
 mod parameters;
 mod scan_error;
-pub(crate) mod string_type;
 
 #[cfg(test)]
 mod tests;
@@ -81,7 +80,7 @@ fn main() {
 
 	debug!("Checking files with extensions: {:?}", extensions);
 
-	let entries = scan_directory(&args.dirs, extensions.as_ref(), &args.get_scan_opts());
+	let entries = scan_directory(&args.dirs, &extensions, &args.get_scan_opts());
 
 	if entries.is_none() {
 		// no need to log anything for fatal errors - fif will already have printed something obvious like
@@ -112,9 +111,8 @@ fn main() {
 		match result {
 			Ok(r) => {
 				debug!(
-					"{:?} is {}, should have file extension {}",
+					"{:?} should have file extension {}",
 					r.file,
-					r.mime,
 					r.recommended_extension().unwrap_or_else(|| "???".into())
 				)
 			}
@@ -166,8 +164,8 @@ cfg_if! {
 }
 
 /// Returns `true` if a file matches the given criteria. This means checking whether the file's extension appears in
-/// `exts` (if specified), potentially skipping over hidden files, and so on.
-fn wanted_file(entry: &DirEntry, exts: Option<&Vec<&str>>, scan_opts: &ScanOpts) -> bool {
+/// `exts`, potentially skipping over hidden files, and so on.
+fn wanted_file(entry: &DirEntry, exts: &[&str], scan_opts: &ScanOpts) -> bool {
 	if entry.depth() == 0 {
 		// the root directory should always be scanned.
 		return true;
@@ -190,13 +188,7 @@ fn wanted_file(entry: &DirEntry, exts: Option<&Vec<&str>>, scan_opts: &ScanOpts)
 		return false;
 	}
 
-	if let Some(exts) = exts {
-		// only scan if the file has one of the specified extensions.
 	exts.contains(&ext.unwrap().to_string_lossy().to_lowercase().as_str())
-	} else {
-		// no extensions specified - no reason not to scan this file.
-		true
-	}
 }
 
 /// Given a file path, returns its extension, using [`std::path::Path::extension`].
@@ -271,8 +263,8 @@ fn scan_from_walkdir(entries: &[DirEntry]) -> Vec<Result<Findings, ScanError>> {
 
 /// Scans a given directory with [`WalkDir`], filters with [`wanted_file`], checks for errors, and returns a vector of
 /// [DirEntry]s.
-fn scan_directory(dirs: &Path, exts: Option<&Vec<&str>>, scan_opts: &ScanOpts) -> Option<Vec<DirEntry>> {
-	let stepper = WalkDir::new(dirs).follow_links(scan_opts.follow_symlinks).into_iter();
+fn scan_directory(dirs: &Path, exts: &[&str], scan_opts: &ScanOpts) -> Option<Vec<DirEntry>> {
+	let stepper = WalkDir::new(dirs).into_iter();
 	let mut probably_fatal_error = false;
 	let entries: Vec<DirEntry> = stepper
 		.filter_entry(|e| wanted_file(e, exts, scan_opts)) // filter out unwanted files

src/parameters.rs

@@ -1,10 +1,11 @@
 //! [Clap] struct used to parse command line arguments.
 
+use std::path::PathBuf;
+
 use crate::extension_set::ExtensionSet;
-use crate::string_type::String as StringType;
 use cfg_if::cfg_if;
 use clap::{AppSettings, Clap};
-use std::path::PathBuf;
+use smartstring::{LazyCompact, SmartString};
 
 cfg_if! {
 	if #[cfg(windows)] {
@@ -42,11 +43,17 @@ pub enum OutputFormat {
 )]
 pub struct Parameters {
 	/// Only examine files with these extensions (Comma-separated list)
-	#[clap(short, long, use_delimiter = true, require_delimiter = true, group = "extensions")]
-	pub exts: Option<Vec<StringType>>,
+	#[clap(
+		short,
+		long,
+		use_delimiter = true,
+		require_delimiter = true,
+		required_unless_present = "ext-set"
+	)]
+	pub exts: Option<Vec<SmartString<LazyCompact>>>,
 
 	/// Use a preset list of extensions as the search filter
-	#[clap(short = 'E', long, arg_enum, group = "extensions")]
+	#[clap(short = 'E', long, arg_enum, required_unless_present = "exts")]
 	pub ext_set: Option<ExtensionSet>,
 
 	/// Don't skip hidden files and directories
@@ -61,10 +68,6 @@ pub struct Parameters {
 	#[clap(short, long, default_value = DEFAULT_FORMAT, arg_enum)]
 	pub output_format: OutputFormat,
 
-	/// Follow symlinks
-	#[clap(short, long)]
-	pub follow_symlinks: bool,
-
 	/// Directory to process
 	// TODO: right now this can only take a single directory - should this be improved?
 	#[clap(name = "DIR", default_value = ".", parse(from_os_str))]
@@ -72,27 +75,24 @@ pub struct Parameters {
 }
 
 /// Further options relating to scanning.
-#[derive(PartialEq, Debug)]
 pub struct ScanOpts {
 	/// Whether hidden files and directories should be scanned.
 	pub hidden: bool,
 	/// Whether files without extensions should be scanned.
 	pub extensionless: bool,
-	/// Should symlinks be followed?
-	pub follow_symlinks: bool,
 }
 
 impl Parameters {
-	pub fn extensions(&self) -> Option<Vec<&str>> {
+	pub fn extensions(&self) -> Vec<&str> {
 		if let Some(exts) = &self.exts {
 			// extensions supplied like "-e png,jpg,jpeg"
-			Some(exts.iter().map(|s| s.as_str()).collect())
+			exts.iter().map(|s| s.as_str()).collect()
 		} else if let Some(exts) = &self.ext_set {
 			// extensions supplied like "-E images"
-			Some(exts.extensions())
+			exts.extensions()
 		} else {
-			// neither -E nor -e was passed
-			None
+			// neither -E nor -e was passed - this should be impossible
+			unreachable!()
 		}
 	}
 
@@ -100,7 +100,6 @@ impl Parameters {
 		ScanOpts {
 			hidden: self.scan_hidden,
 			extensionless: self.scan_extensionless,
-			follow_symlinks: self.follow_symlinks,
 		}
 	}
 }

src/string_type.rs

@@ -1,11 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-	if #[cfg(not(all(target_endian = "big", target_pointer_width = "32")))] {
-		// most architectures
-		pub use smartstring::alias::String;
-	} else {
-		// powerpc and other big endian 32-bit archs
-		pub use std::string::String;
-	}
-}

src/tests/mod.rs

@@ -1,13 +1,12 @@
 use crate::inspectors::{mime_extension_lookup, BUF_SIZE};
 use crate::{extension_from_path, init_db, scan_directory, scan_from_walkdir};
 
-use crate::mime_db::MimeDb;
 use crate::parameters::{Parameters, ScanOpts};
-use crate::string_type::String;
+use crate::mime_db::MimeDb;
 use cfg_if::cfg_if;
 use mime_guess::mime::{APPLICATION_OCTET_STREAM, APPLICATION_PDF, IMAGE_JPEG, IMAGE_PNG};
 use mime_guess::Mime;
-
+use smartstring::alias::String;
 use std::borrow::Borrow;
 use std::collections::HashMap;
 use std::ffi::OsStr;
@@ -101,12 +100,11 @@ fn simple_directory() {
 	let scan_opts = ScanOpts {
 		hidden: true,
 		extensionless: false,
-		follow_symlinks: false,
 	};
 
 	let entries = scan_directory(
 		&dir.path().to_path_buf(),
-		Some(&vec!["jpg", "jpeg", "png", "pdf", "zip"]),
+		&["jpg", "jpeg", "png", "pdf", "zip"],
 		&scan_opts,
 	)
 	.expect("Directory scan failed.");
@@ -158,51 +156,21 @@ fn simple_directory() {
 fn argument_parsing() {
 	use clap::Clap;
 
-	// pass `-f`, which enables following symlinks, and `-E images`, which scans files with image extensions
-	let args: Parameters = Parameters::parse_from(vec!["fif", "-f", "-E", "images"]);
-
-	// check if "jpg" is in the list of extensions to be scanned
-	assert!(args
-		.extensions()
-		.expect("args.extensions() should contain the `images` set!")
-		.contains(&"jpg"));
+	// check if "jpg" is in the list of extensions to be considered when passing "-E images"
+	let args: Parameters = Parameters::parse_from(vec!["fif", "-E", "images"]);
+	assert!(args.extensions().contains(&"jpg"));
 
 	// make sure "scan_hidden" is false
 	assert!(!args.scan_hidden);
 
 	// exts should be none
 	assert!(args.exts.is_none());
-
-	// get the ScanOpts, and make sure they match expectations
-	assert_eq!(
-		args.get_scan_opts(),
-		ScanOpts {
-			hidden: false,
-			extensionless: false,
-			follow_symlinks: true
-		}
-	)
 }
 
 #[test]
 fn rejects_bad_args() {
 	use clap::Clap;
-	let tests = [
-		// Non-existent flags:
-		vec!["fif", "-abcdefghijklmnopqrstuvwxyz"],
-		// `-E` without specifying a set:
-		vec!["fif", "-E"],
-		// `-E` with an invalid set:
-		vec!["fif", "-E", "pebis"],
-		// `-E` and `-e`:
-		vec!["fif", "-E", "media", "-e", "jpg"],
-		// `-e` with nothing but commas:
-		vec!["fif", "-e", ",,,,,"],
-	];
-
-	for test in &tests {
-		assert!(Parameters::try_parse_from(test).is_err(), "Failed to reject {:?}", test);
-	}
+	assert!(Parameters::try_parse_from(vec!["fif", "-abcdefg", "-E", "-e"]).is_err());
 }
 
 #[test]