CHANGELOG.md

@@ -5,8 +5,6 @@ Dates are given in YYYY-MM-DD format.
 ### v0.3.1 (2021-xx-yy)
 #### Features
 - Added JSON output support via `-o json`
-#### Other
-- `videos` is now an alias for `video`
 
 ### v0.3.0 (2021-04-28)
 #### Features

README.md

@@ -11,7 +11,9 @@
 ](https://crates.io/crates/fif)
 [![License](https://img.shields.io/crates/l/fif.svg?style=flat-square)
 ](https://gitlab.com/Lynnesbian/fif/-/blob/master/LICENSE)
-[![Build status](https://img.shields.io/gitlab/pipeline/Lynnesbian/fif/master?logo=gitlab&style=flat-square)
+[![Drone build status](https://img.shields.io/drone/build/lynnesbian/fif?logo=drone&server=https%3A%2F%2Fdrone.bune.city&style=flat-square)
+](https://drone.bune.city/lynnesbian/fif)
+[![GitLab build status](https://img.shields.io/gitlab/pipeline/Lynnesbian/fif/master?logo=gitlab&style=flat-square)
 ](https://gitlab.com/Lynnesbian/fif/-/pipelines/latest)
 [![Unsafe forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg?style=flat-square)
 ](https://github.com/rust-secure-code/safety-dance/)

src/findings.rs

@@ -38,7 +38,7 @@ impl<'a> serde::Serialize for Findings<'a> {
 
 impl<'a> Findings<'a> {
 	pub fn recommended_extension(&self) -> Option<String> {
-		mime_extension_lookup(self.mime.essence_str().into()).map(|extensions| extensions[0].clone())
+		mime_extension_lookup(self.mime.clone()).map(|extensions| extensions[0].clone())
 	}
 }
 

src/inspectors.rs

@@ -61,17 +61,20 @@ pub fn mime_type<T: MimeDb>(db: &T, path: &Path) -> io::Result<Option<Mime>> {
 	Ok(db.get_type(&buffer))
 }
 
+// TODO: avoid cloning mime if possible, although i don't really see how it would be - maybe instead of passing the mime
+// object, pass a hash of it?
+
 cached! {
 	MIMEXT;
-	fn mime_extension_lookup(essence: String) -> Option<Vec<String>> = {
+	fn mime_extension_lookup(mime: Mime) -> Option<Vec<String>> = {
 		// Returns a list of known extensions for this mime type, if any.
-		// This function uses the [Mime]'s "essence" 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.
-		// ↑ this is supposed to be a doc comment, but the cached! macro doesn't support that... i would switch to the
-		// proc_macro version of cached, but it has a huge number of deps :c
+		// ↑ this is supposed to be a doc comment, but the cached! macro doesn't support that... maybe i should switch to
+		// the derive macro
 
-		let essence = essence.as_str();
+		// 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
@@ -92,13 +95,13 @@ cached! {
 			Some(exts) => {
 				let possible_exts: Vec<String> = exts.iter().map(|e| String::from(*e)).collect();
 
-				Some(if essence == mime_guess::mime::IMAGE_JPEG.essence_str() {
+				Some(if mime == mime_guess::mime::IMAGE_JPEG {
 					// possible_exts starts with "jpe", because it's alphabetically before "jpeg" and "jpg". however, jpg/jpeg are
 					// far more common than jpe, so it makes sense to suggest one of those rather than jpe. to do this, we can
 					// add "jpg" to the start of the possible_exts list, ensuring that it will be the extension suggested by fif.
 					[vec![String::from("jpg")], possible_exts].concat()
 
-				} else if essence == mime_guess::mime::TEXT_XML.essence_str() || essence == "application/xml" {
+				} else if mime == mime_guess::mime::TEXT_XML || mime == Mime::from_str("application/xml").unwrap() {
 					// a somewhat similar case arises with XML files - the first suggested extension is "asa", when it should
 					// (in my opinion) be "xml".
 					// there's also another problem: SVG files can easily be misidentified as XML files, because they usually
@@ -111,15 +114,15 @@ cached! {
 					// extension is classes as application/*+xml, consider it OK
 					[vec![String::from("xml"), String::from("svg")], possible_exts].concat()
 
-				} else if essence == "application/msword" {
+				} else if mime == Mime::from_str("application/msword").unwrap() {
 					// classic office files considered harmful
 					vec![String::from("doc"), String::from("xls"), String::from("ppt")]
 
-				} else if essence == "application/zip" {
+				} else if mime == Mime::from_str("application/zip").unwrap() {
 					// neither xdg-mime nor infer seem to be able to detect office XML files properly...
 					[vec![String::from("zip"), String::from("docx"), String::from("xlsx"), String::from("pptx")], possible_exts].concat()
 
-				} else if essence == "application/x-ms-dos-executable" {
+				} else if mime == Mime::from_str("application/x-ms-dos-executable").unwrap() {
 					// both .dll and .exe files are given the same mime type... but you definitely don't want to rename one to the
 					// other!
 					[vec![String::from("dll"), String::from("exe")], possible_exts].concat()

src/main.rs

@@ -254,7 +254,7 @@ fn scan_file(entry: &DirEntry) -> Result<Findings, ScanError> {
 	let result = result.unwrap();
 
 	// set of known extensions for the given mimetype
-	let known_exts = inspectors::mime_extension_lookup(result.essence_str().into());
+	let known_exts = inspectors::mime_extension_lookup(result.clone());
 	// file extension for this particular file
 	let entry_ext = extension_from_path(entry.path());
 

src/parameters.rs

@@ -234,7 +234,6 @@ pub enum ExtensionSet {
 	/// Extensions used for audio file formats, such as `mp3`, `ogg`, `flac`, etc.
 	Audio,
 	/// Extensions used for video file formats, such as `mkv`, `mp4`, `mov`, etc.
-	#[clap(alias = "videos")]
 	Video,
 	/// Extensions used for media file formats. This acts as a combination of the [Images](ExtensionSet::Images),
 	/// [Audio](ExtensionSet::Audio) and [Videos](ExtensionSet::Videos) variants.

src/tests/mod.rs

@@ -67,14 +67,14 @@ fn detect_type() {
 /// Ensure that `mime_extension_lookup` works as expected, and that the set of extensions for JPEG, PNG, PDF, and ZIP
 /// contain "jpg", "png", "pdf", and "zip", respectively.
 fn recommend_ext() {
-	assert!(mime_extension_lookup(IMAGE_JPEG.essence_str().into())
+	assert!(mime_extension_lookup(IMAGE_JPEG)
 		.unwrap()
 		.contains(&String::from("jpg")));
-	assert!(mime_extension_lookup(IMAGE_PNG.essence_str().into()).unwrap().contains(&String::from("png")));
-	assert!(mime_extension_lookup(APPLICATION_PDF.essence_str().into())
+	assert!(mime_extension_lookup(IMAGE_PNG).unwrap().contains(&String::from("png")));
+	assert!(mime_extension_lookup(APPLICATION_PDF)
 		.unwrap()
 		.contains(&String::from("pdf")));
-	assert!(mime_extension_lookup(application_zip().essence_str().into())
+	assert!(mime_extension_lookup(application_zip())
 		.unwrap()
 		.contains(&String::from("zip")));
 }
@@ -142,7 +142,7 @@ fn simple_directory() {
 		// check if the recommended extension for this file is in the list of known extensions for its mimetype - for
 		// example, if the file is determined to be an IMAGE_PNG, its recommended extension should be one of the extensions
 		// returned by `mime_extension_lookup(IMAGE_PNG)`.
-		assert!(mime_extension_lookup(result.mime.essence_str().into())
+		assert!(mime_extension_lookup(result.mime.clone())
 			.unwrap()
 			.contains(&result.recommended_extension().unwrap()));