fix(core): asset loading not decoding percent-encoded path, closes #1879

(#1938)
tauri-apps · Jun 1, 2021 · c021968 · c021968
1 parent 40b717e
commit c021968
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/.changes/fix-asset-loading.md b/.changes/fix-asset-loading.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fixes custom protocol asset loader not decoding the percent-encoded path.
diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -55,6 +55,7 @@ http = "0.2"
 state = "0.4"
 bincode = "1.3"
 dirs-next = "2.0"
+percent-encoding = "2.1"
 
 # FS
 base64 = { version = "0.13", optional = true } # also used on the updater

diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -406,6 +406,9 @@ impl<P: Params> WindowManager<P> {
         if path.ends_with('/') {
           path.pop();
         }
+        path = percent_encoding::percent_decode(path.as_bytes())
+          .decode_utf8_lossy()
+          .to_string();
         let path = if path.is_empty() {
           // if the url is `tauri://localhost`, we should load `index.html`
           "index.html".to_string()

diff --git a/examples/api/public/build/bundle.js b/examples/api/public/build/bundle.js
diff --git a/examples/api/public/build/bundle.js.map b/examples/api/public/build/bundle.js.map
diff --git a/examples/api/public/tauri.png → examples/api/public/tauri logo.png b/examples/api/public/tauri.png → examples/api/public/tauri logo.png
diff --git a/examples/api/src/App.svelte b/examples/api/src/App.svelte
@@ -81,7 +81,7 @@
 
 <main>
   <div class="flex row noselect just-around" style="margin=1em;" data-tauri-drag-region>
-    <img src="tauri.png" height="60" on:click={onLogoClick} alt="logo" />
+    <img src="tauri logo.png" height="60" on:click={onLogoClick} alt="logo" />
     <div>
       <a class="dark-link" target="_blank" href="https://tauri.studio/en/docs/getting-started/intro">
         Documentation