fix: fix few panics with latest rust-embed, closes #236 (#237)

tauri-apps · Nov 23, 2022 · 8034aac · 8034aac
1 parent c6ff511
commit 8034aac
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 43 deletions.
diff --git a/.changes/fix-cargo.md b/.changes/fix-cargo.md
@@ -0,0 +1,5 @@
+---
+"create-tauri-app": "patch"
+---
+
+Fix a few panics introduced by some changes in latest `rust-embed` crate versions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml
@@ -20,4 +20,4 @@ path = "src/main.rs"
 anyhow = "1.0"
 dialoguer = "0.10.2"
 pico-args = "0.5.0"
-rust-embed = { version = "6.5.0", features = [ "compression", "interpolate-folder-path" ] }
+rust-embed = { version = "6.5", features = [ "compression", "interpolate-folder-path" ] }
diff --git a/packages/cli/src/template.rs b/packages/cli/src/template.rs
@@ -120,6 +120,11 @@ impl<'a> Template {
         let manifest = Manifest::parse(&manifest_str)?;
 
         let write_file = |file: &str| -> anyhow::Result<()> {
+            let fragment_file = Fragments::get(file).unwrap();
+            if fragment_file.metadata.is_dir() {
+                return Ok(());
+            }
+
             let manifest = manifest.clone();
 
             // remove the first component, which is certainly the fragment directory they were in before getting embeded into the binary
@@ -154,7 +159,7 @@ impl<'a> Template {
                 _ => &file_name,
             };
 
-            let mut data = Fragments::get(file).unwrap().data.to_vec();
+            let mut data = fragment_file.data.to_vec();
 
             // Only modify specific set of files
             if [
@@ -206,8 +211,8 @@ impl<'a> Template {
             path::PathBuf::from(e.to_string())
                 .components()
                 .next()
-                .unwrap()
-                .as_os_str()
+                .map(|c| c.as_os_str())
+                .unwrap_or_default()
                 == "base"
         }) {
             write_file(&file)?;
@@ -218,8 +223,8 @@ impl<'a> Template {
             path::PathBuf::from(e.to_string())
                 .components()
                 .next()
-                .unwrap()
-                .as_os_str()
+                .map(|c| c.as_os_str())
+                .unwrap_or_default()
                 == path::PathBuf::from(format!("fragment-{}", self))
         }) {
             write_file(&file)?;