fix(utils): fix resources map becomes directory by amrbashir · Pull Request #10293 · tauri-apps/tauri

amrbashir · 2024-07-15T19:01:58Z

Fixes the behavior of mapped resources generating extra directory, for example: "../resources/user.json": "resources/user.json" generates this resource resources/user.json/user.json where it should generate resources/user.json

This PR includes a refactor of the Iterator implementation which splits it into more scoped functions and relis on recursing instead of a loop which makes the code a lot more readable and easier to maintain.

closes #10187 Fixes the behavior of mapped resources generating extra directory, for example: `"../resources/user.json": "resources/user.json"` generates this resource `resources/user.json/user.json` where it should generate `resources/user.json` This PR includes a refactor of the Iterator implementation which splits it into more scoped functions and relis on recursing instead of a loop which makes the code a lot more readable and easier to maintain.

github-actions · 2024-07-15T19:02:27Z

Package Changes Through `4dfd836`

There are 11 changes which include tauri-cli with prerelease, @tauri-apps/cli with prerelease, tauri-build with prepatch, tauri-codegen with prerelease, tauri-utils with prerelease, tauri-bundler with prerelease, tauri with prerelease, tauri-macos-sign with prepatch, @tauri-apps/api with prepatch, tauri-runtime with prepatch, tauri-runtime-wry with prepatch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package	current	next
@tauri-apps/api	2.0.0-rc.0	2.0.1-rc.0
tauri-utils	2.0.0-rc.2	2.0.0-rc.3
tauri-macos-sign	0.1.0-beta.0	0.1.1-rc.0
tauri-bundler	2.0.1-rc.1	2.0.1-rc.2
tauri-runtime	2.0.0-rc.2	2.0.1-rc.0
tauri-runtime-wry	2.0.0-rc.2	2.0.1-rc.0
tauri-codegen	2.0.0-rc.2	2.0.0-rc.3
tauri-macros	2.0.0-rc.2	2.0.0-rc.3
tauri-plugin	2.0.0-rc.2	2.0.0-rc.3
tauri-build	2.0.0-rc.2	2.0.1-rc.0
tauri	2.0.0-rc.2	2.0.0-rc.3
@tauri-apps/cli	2.0.0-rc.3	2.0.0-rc.4
tauri-cli	2.0.0-rc.3	2.0.0-rc.4

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

pewsheen · 2024-07-16T09:29:46Z

I tested with some folder cases, and it seems to have some differences from the past version when the source has folders inside a folder or the destination is a folder:

src/
├─ assets/
│  ├─ lang/
│  │  ├─ de.json
│  ├─ tauri.svg

Source: Folder, Dest: Folder

{
  "resources": {
    "assets/": "dist/"
  }  
}

# before
Resource { path: "assets/tauri.svg", target: "dist/tauri.svg" }
Resource { path: "assets/lang/de.json", target: "dist/lang/de.json" }
# now
Resource { path: "assets/tauri.svg", target: "dist/" }
Resource { path: "assets/lang/de.json", target: "dist/" }

Source: Folder, Dest: Root

{
  "resources": {
    "assets/": ""
  }  
}

# before
Resource { path: "assets/tauri.svg", target: "tauri.svg" }
Resource { path: "assets/lang/de.json", target: "lang/de.json" }
# now
Resource { path: "assets/tauri.svg", target: "tauri.svg" }
Resource { path: "assets/lang/de.json", target: "de.json" }

Source: Glob, Dest: Folder

{
  "resources": {
    "assets/*": "dist/"
  }  
}

# before
Resource { path: "assets/tauri.svg", target: "dist/tauri.svg" }
Resource { path: "assets/lang/de.json", target: "dist/lang/de.json" }
# now
Resource { path: "assets/tauri.svg", target: "dist/" }
Resource { path: "assets/lang/de.json", target: "dist/" }

Source: Glob, Dest: Root (this one is correct)

{
  "resources": {
    "assets/*": ""
  }  
}

# before
Resource { path: "assets/tauri.svg", target: "tauri.svg" }
Resource { path: "assets/lang/de.json", target: "de.json" }
# now
Resource { path: "assets/tauri.svg", target: "tauri.svg" }
Resource { path: "assets/lang/de.json", target: "de.json" }

amrbashir · 2024-07-17T03:45:59Z

Thanks @pewsheen for extensive tests, I will fix the Source: Folder, Dest: Folder or Root cases.

However Source: Glob, Dest: Folder is basically the same as Source: Glob, Dest: Root and so they should act the same, and so I consider Source: Glob, Dest: Folder got fixed from previous behavior.

amrbashir · 2024-07-17T04:41:17Z

I just noticed that Source: Glob, Dest: Folder is just plain broken, it should be

# before
Resource { path: "assets/tauri.svg", target: "dist/tauri.svg" }
Resource { path: "assets/lang/de.json", target: "dist/lang/de.json" }
# now
Resource { path: "assets/tauri.svg", target: "dist/tauri.svg" }
Resource { path: "assets/lang/de.json", target: "dist/de.json" }

which is a different behavior than before but consistent with Source Glob, Dest: Root

amrbashir · 2024-07-17T04:49:35Z

@pewsheen all should be good now, please give it another test

pewsheen · 2024-07-17T06:09:37Z

This one is weird

("../src/sounds/*".into(), "voices".into()),

Resource {
    path: "../src/sounds/lang/fr.wav",
    target: "voices/../src/sounds/lang/fr.wav",
},
Resource {
    path: "../src/sounds/lang/es.wav",
    target: "voices/../src/sounds/lang/es.wav",
},

And if the the glob path is not valid, it'll remain in the glob format

Resource {
    path: "not/exists/path/*",
    target: "voices",
},

Maybe we should check the glob path is valid or return crate::Error::GlobPathNotFound

amrbashir · 2024-07-18T01:33:11Z

@pewsheen these two cases should be fixed now, let me know if you find any more bugs

pewsheen

Looks good!

lucasfernog

I opened this PR considering writing tests to validate this, but you already did it ❤️

Raicuparta · 2024-09-03T12:46:09Z

I think this PR is probably what broke the resources setting for me. I have a resources folder that has several other folders inside it, and those folders have a bunch of files at different levels. But the root resources folder doesn't have any files itself. My tauri config had "resources": ["resources/*"], and that stopped working, with the error resource path resources\* doesn't exist. I had to change my setting to "resources": ["resources/**/*"] to get it working again.

I should probably make a separate issue for it, but don't have the time to make it detailed enough. And sorry if this is unrelated (very possible)

FabianLars · 2024-09-03T12:52:14Z

@Raicuparta

I should probably make a separate issue for it, but don't have the time to make it detailed enough

What you wrote here is already detailed enough for an initial issue. :)

amrbashir · 2024-09-03T13:27:49Z

@Raicuparta I believe "resources": ["resources/**/*"] should be the correct behavior, and "resources": ["resources/*"] should only match files directly under resources dir. This is how globbing behaves in bash as well.

However I think we may need to improve the error.

Raicuparta · 2024-09-03T14:27:03Z

That makes sense. I guess the error could specifically mention globs when those are used to make it more clear. But maybe the breaking change could be documented in V2 migration docs. Unless it's considered a bug fix because the previous version wasn't following globbing expectations.

amrbashir · 2024-09-03T16:25:13Z

I will open a PR to improve the error a bit, However for ./resources/* it will no longer print any errors since the glob is correct but it just couldn't find any files there which is the correct behavior here.

The migration docs will be updated.

ref: #10293 (comment)

* fix(resources): enhance error messages for globs ref: #10293 (comment) * fmt

amrbashir requested a review from a team as a code owner July 15, 2024 19:01

clippy

0f986db

cover more cases

0116e4b

clippy

c9a7bc1

turtureanu mentioned this pull request Jul 17, 2024

[bug] [v2]: $APPDATA/$APPCONFIG/... don't get created on Linux #10314

Closed

amrbashir added 2 commits July 18, 2024 04:25

fix glob into directory, not resolving target correctly

1f1ca94

return error when resource origin path doesn't exist

b0b0205

pewsheen approved these changes Jul 18, 2024

View reviewed changes

amrbashir requested a review from lucasfernog August 14, 2024 12:57

lucasfernog added 2 commits August 16, 2024 22:46

Merge remote-tracking branch 'origin/dev' into fix/mapped-resources

57f1631

fix resources example build

4d70649

lucasfernog reviewed Aug 17, 2024

View reviewed changes

Comment thread .changes/resources-map-becoming-dirs.md Outdated

Update .changes/resources-map-becoming-dirs.md

4dfd836

lucasfernog approved these changes Aug 17, 2024

View reviewed changes

lucasfernog merged commit 9e89193 into dev Aug 17, 2024

lucasfernog deleted the fix/mapped-resources branch August 17, 2024 02:03

github-actions Bot mentioned this pull request Aug 17, 2024

Apply Version Updates From Current Changes #10561

Merged

amrbashir added a commit that referenced this pull request Sep 3, 2024

fix(resources): enhance error messages for globs

6c50ee9

ref: #10293 (comment)

amrbashir mentioned this pull request Sep 3, 2024

fix(resources): enhance error messages for globs #10879

Merged

amrbashir added a commit that referenced this pull request Sep 3, 2024

fix(resources): enhance error messages for globs (#10879)

976cad9

* fix(resources): enhance error messages for globs ref: #10293 (comment) * fmt

FabianLars mentioned this pull request Sep 10, 2024

docs: Add Info.plist localization guide tauri-apps/tauri-docs#2668

Merged

Uh oh!

Conversation

amrbashir commented Jul 15, 2024

Uh oh!

github-actions Bot commented Jul 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Package Changes Through 4dfd836

Uh oh!

pewsheen commented Jul 16, 2024

Source: Folder, Dest: Folder

Source: Folder, Dest: Root

Source: Glob, Dest: Folder

Source: Glob, Dest: Root (this one is correct)

Uh oh!

amrbashir commented Jul 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amrbashir commented Jul 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amrbashir commented Jul 17, 2024

Uh oh!

pewsheen commented Jul 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

amrbashir commented Jul 18, 2024

Uh oh!

pewsheen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lucasfernog left a comment

Choose a reason for hiding this comment

Uh oh!

Raicuparta commented Sep 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FabianLars commented Sep 3, 2024

Uh oh!

amrbashir commented Sep 3, 2024

Uh oh!

Raicuparta commented Sep 3, 2024

Uh oh!

amrbashir commented Sep 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

github-actions Bot commented Jul 15, 2024 •

edited

Loading

Package Changes Through `4dfd836`

amrbashir commented Jul 17, 2024 •

edited

Loading

amrbashir commented Jul 17, 2024 •

edited

Loading

pewsheen commented Jul 17, 2024 •

edited

Loading

Raicuparta commented Sep 3, 2024 •

edited

Loading

amrbashir commented Sep 3, 2024 •

edited

Loading