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.

88b94eab — Jasper van Herpt

Get directory entries in release builds as well

Files changed (5) hide show

impl/src/lib.rs CHANGED Viewed

@@ -17,7 +17,12 @@ fn embedded(ident: &syn::Ident, folder_path: String, prefix: Option<&str>, inclu
   let includes: Vec<&str> = includes.iter().map(AsRef::as_ref).collect();
   let excludes: Vec<&str> = excludes.iter().map(AsRef::as_ref).collect();
+  for rust_embed_utils::FileEntry {
+    rel_path,
+    full_canonical_path,
+    is_dir: _,
-  for rust_embed_utils::FileEntry { rel_path, full_canonical_path } in rust_embed_utils::get_files(folder_path, &includes, &excludes) {
+  } in rust_embed_utils::get_files(folder_path, &includes, &excludes)
+  {
     match_values.push(embed_file(&rel_path, &full_canonical_path));
     list_values.push(if let Some(prefix) = prefix {
@@ -176,15 +181,19 @@ fn embed_file(rel_path: &str, full_canonical_path: &str) -> TokenStream2 {
     None => quote! { None },
   };
-  let embedding_code = if cfg!(feature = "compression") {
+  let embedding_code = if cfg!(feature = "compression") && !is_dir {
     quote! {
       rust_embed::flate!(static FILE: [u8] from #full_canonical_path);
       let bytes = &FILE[..];
     }
-  } else {
+  } else if !is_dir {
     quote! {
       let bytes = &include_bytes!(#full_canonical_path)[..];
     }
+  } else {
+    quote! {
+      let bytes = Vec::new();
+    }
   };
   quote! {

tests/interpolated_path.rs CHANGED Viewed

@@ -19,7 +19,7 @@ fn iter_works() {
     assert!(Asset::get(file.as_ref()).is_some());
     num_files += 1;
   }
-  assert_eq!(num_files, 6);
+  assert_eq!(num_files, 8);
 }
 #[test]
@@ -32,6 +32,6 @@ fn trait_works_generic_helper<E: rust_embed::RustEmbed>() {
     assert!(E::get(file.as_ref()).is_some());
     num_files += 1;
   }
-  assert_eq!(num_files, 6);
+  assert_eq!(num_files, 8);
   assert!(E::get("gg.html").is_none(), "gg.html should not exist");
 }

tests/lib.rs CHANGED Viewed

@@ -29,7 +29,7 @@ fn iter_works() {
     assert!(Asset::get(file.as_ref()).is_some());
     num_files += 1;
   }
-  assert_eq!(num_files, 6);
+  assert_eq!(num_files, 8);
 }
 #[test]
@@ -42,6 +42,6 @@ fn trait_works_generic_helper<E: rust_embed::RustEmbed>() {
     assert!(E::get(file.as_ref()).is_some());
     num_files += 1;
   }
-  assert_eq!(num_files, 6);
+  assert_eq!(num_files, 8);
   assert!(E::get("gg.html").is_none(), "gg.html should not exist");
 }

tests/metadata.rs CHANGED Viewed

@@ -30,7 +30,7 @@ fn last_modified_is_accurate() {
 fn is_dir_is_accurate() {
   let index_file: EmbeddedFile = Asset::get("index.html").expect("index.html exists");
   let doc_file: EmbeddedFile = Asset::get("images/doc.txt").expect("doc.txt exists");
-  let images_folder: EmbeddedFile = Asset::get("images/").expect("images exists");
+  let images_folder: EmbeddedFile = Asset::get("images").expect("images exists");
   assert_eq!(index_file.metadata.is_dir(), false);
   assert_eq!(doc_file.metadata.is_dir(), false);

utils/src/lib.rs CHANGED Viewed

@@ -10,6 +10,7 @@ use std::{fs, io};
 pub struct FileEntry {
   pub rel_path: String,
   pub full_canonical_path: String,
+  pub is_dir: bool,
 }
 #[cfg(not(feature = "include-exclude"))]
@@ -58,10 +59,10 @@ pub fn get_files<'patterns>(folder_path: String, includes: &'patterns [&str], ex
     .sort_by_file_name()
     .into_iter()
     .filter_map(|e| e.ok())
-    .filter(|e| e.file_type().is_file())
     .filter_map(move |e| {
       let rel_path = path_to_str(e.path().strip_prefix(&folder_path).unwrap());
       let full_canonical_path = path_to_str(std::fs::canonicalize(e.path()).expect("Could not get canonical path"));
+      let is_dir = e.file_type().is_dir();
       let rel_path = if std::path::MAIN_SEPARATOR == '\\' {
         rel_path.replace('\\', "/")
@@ -70,7 +71,11 @@ pub fn get_files<'patterns>(folder_path: String, includes: &'patterns [&str], ex
       };
       if is_path_included(&rel_path, includes, excludes) {
+        Some(FileEntry {
+          rel_path,
-        Some(FileEntry { rel_path, full_canonical_path })
+          full_canonical_path,
+          is_dir,
+        })
       } else {
         None
       }