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.

d1843470 — Jasper van Herpt

Fetch metadata when a folder is fetched instead of a file

Files changed (3) hide show

tests/lib.rs CHANGED Viewed

@@ -10,6 +10,7 @@ fn get_works() {
   assert!(Asset::get("index.html").is_some(), "index.html should exist");
   assert!(Asset::get("gg.html").is_none(), "gg.html should not exist");
   assert!(Asset::get("images/llama.png").is_some(), "llama.png should exist");
+  assert!(Asset::get("images").is_some(), "images should exist");
 }
 /// Using Windows-style path separators (`\`) is acceptable

tests/metadata.rs CHANGED Viewed

@@ -25,3 +25,14 @@ fn last_modified_is_accurate() {
   assert_eq!(index_file.metadata.last_modified(), Some(expected_datetime_utc));
 }
+#[test]
+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");
+  assert_eq!(index_file.metadata.is_dir(), false);
+  assert_eq!(doc_file.metadata.is_dir(), false);
+  assert!(images_folder.metadata.is_dir());
+}

utils/src/lib.rs CHANGED Viewed

@@ -114,7 +114,7 @@ impl Metadata {
 }
 pub fn read_file_from_fs(file_path: &Path) -> io::Result<EmbeddedFile> {
-  let data = fs::read(file_path)?;
+  let data = if !file_path.is_dir() { fs::read(file_path)? } else { Vec::new() };
   let data = Cow::from(data);
   let mut hasher = sha2::Sha256::new();