rust-embed

rust macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev.

8d4838e1 — BBaoVanC

Add mime-guess feature to store mimetype as metadata

Files changed (5) hide show

Cargo.toml CHANGED Viewed

@@ -79,6 +79,7 @@ sha2 = "0.10"
 debug-embed = ["rust-embed-impl/debug-embed", "rust-embed-utils/debug-embed"]
 interpolate-folder-path = ["rust-embed-impl/interpolate-folder-path"]
 compression = ["rust-embed-impl/compression", "include-flate"]
+mime-guess = ["rust-embed-impl/mime-guess"]
 include-exclude = ["rust-embed-impl/include-exclude", "rust-embed-utils/include-exclude"]
 actix = ["actix-web", "mime_guess"]
 warp-ex = ["warp", "tokio", "mime_guess"]

impl/Cargo.toml CHANGED Viewed

@@ -30,4 +30,5 @@ optional = true
 debug-embed = []
 interpolate-folder-path = ["shellexpand"]
 compression = []
+mime-guess = ["rust-embed-utils/mime-guess"]
 include-exclude = ["rust-embed-utils/include-exclude"]

impl/src/lib.rs CHANGED Viewed

@@ -174,6 +174,12 @@ fn embed_file(rel_path: &str, full_canonical_path: &str) -> TokenStream2 {
     Some(last_modified) => quote! { Some(#last_modified) },
     None => quote! { None },
   };
+  let mimetype = if cfg!(feature = "mime-guess") {
+    let mt = file.metadata.mimetype().to_string();
+    quote! { #mt }
+  } else {
+    quote! { None }
+  };
   let embedding_code = if cfg!(feature = "compression") {
     quote! {
@@ -192,7 +198,7 @@ fn embed_file(rel_path: &str, full_canonical_path: &str) -> TokenStream2 {
           Some(rust_embed::EmbeddedFile {
               data: std::borrow::Cow::from(bytes),
-              metadata: rust_embed::Metadata::__rust_embed_new([#(#hash),*], #last_modified)
+              metadata: rust_embed::Metadata::__rust_embed_new([#(#hash),*], #last_modified, #mimetype)
           })
       }
   }

utils/Cargo.toml CHANGED Viewed

@@ -14,6 +14,7 @@ edition = "2018"
 [dependencies]
 walkdir = "2.3.1"
 sha2 = "0.10.5"
+mime_guess = { version = "2.0.4", optional = true }
 [dependencies.globset]
 version = "0.4.8"
@@ -21,4 +22,5 @@ optional = true
 [features]
 debug-embed = []
+mime-guess = ["mime_guess"]
 include-exclude = ["globset"]

utils/src/lib.rs CHANGED Viewed

@@ -87,14 +87,23 @@ pub struct EmbeddedFile {
 pub struct Metadata {
   hash: [u8; 32],
   last_modified: Option<u64>,
+  #[cfg(feature = "mime-guess")]
+  mimetype: Cow<'static, str>,
 }
 impl Metadata {
   #[doc(hidden)]
+  #[cfg(not(feature = "mime-guess"))]
   pub fn __rust_embed_new(hash: [u8; 32], last_modified: Option<u64>) -> Self {
     Self { hash, last_modified }
   }
+  #[doc(hidden)]
+  #[cfg(feature = "mime-guess")]
+  pub fn __rust_embed_new(hash: [u8; 32], last_modified: Option<u64>, mimetype: &'static str) -> Self {
+    Self { hash, last_modified, mimetype: mimetype.into() }
+  }
   /// The SHA256 hash of the file
   pub fn sha256_hash(&self) -> [u8; 32] {
     self.hash
@@ -105,6 +114,12 @@ impl Metadata {
   pub fn last_modified(&self) -> Option<u64> {
     self.last_modified
   }
+  /// The mime type of the file
+  #[cfg(feature = "mime-guess")]
+  pub fn mimetype(&self) -> &Cow<str> {
+    &self.mimetype
+  }
 }
 pub fn read_file_from_fs(file_path: &Path) -> io::Result<EmbeddedFile> {
@@ -127,11 +142,16 @@ pub fn read_file_from_fs(file_path: &Path) -> io::Result<EmbeddedFile> {
       .as_secs()
   });
+  #[cfg(feature = "mime-guess")]
+  let mimetype = mime_guess::from_path(file_path).first_or_octet_stream().to_string();
   Ok(EmbeddedFile {
     data,
     metadata: Metadata {
       hash,
       last_modified: source_date_epoch.or(last_modified),
+      #[cfg(feature = "mime-guess")]
+      mimetype: mimetype.into(),
     },
   })
 }