tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2025-01-04 17:18:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2021-06-01 15:49:24 -03:00 committed by GitHub
parent 40b717edc5
commit c021968eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/fix-asset-loading.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri": patch
---
Fixes custom protocol asset loader not decoding the percent-encoded path.

1
core/tauri/Cargo.toml
View File

@ -55,6 +55,7 @@ http = "0.2"
state = "0.4" state = "0.4"
bincode = "1.3" bincode = "1.3"
dirs-next = "2.0" dirs-next = "2.0"
percent-encoding = "2.1"
# FS # FS
base64 = { version = "0.13", optional = true } # also used on the updater base64 = { version = "0.13", optional = true } # also used on the updater

3
core/tauri/src/manager.rs
View File

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

4
examples/api/public/build/bundle.js
View File

File diff suppressed because one or more lines are too long

2
examples/api/public/build/bundle.js.map
View File

File diff suppressed because one or more lines are too long

0
examples/api/public/tauri.png → examples/api/public/tauri logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

2
examples/api/src/App.svelte
View File

@ -81,7 +81,7 @@
<main> <main>
<div class="flex row noselect just-around" style="margin=1em;" data-tauri-drag-region> <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> <div>
<a class="dark-link" target="_blank" href="https://tauri.studio/en/docs/getting-started/intro"> <a class="dark-link" target="_blank" href="https://tauri.studio/en/docs/getting-started/intro">
Documentation Documentation