Skip to content

Fix path checking for FileWatcher for virtual workspace projects#16958

Merged
alice-i-cecile merged 3 commits intobevyengine:mainfrom
super-saturn:file-watcher-path-fix
Dec 29, 2024
Merged

Fix path checking for FileWatcher for virtual workspace projects#16958
alice-i-cecile merged 3 commits intobevyengine:mainfrom
super-saturn:file-watcher-path-fix

Conversation

@super-saturn
Copy link
Contributor

@super-saturn super-saturn commented Dec 24, 2024

Objective

Fixes #16879

Solution

Moved the construction of the root path of the assets folder out of FileWatcher::new() and into source.rs, as the path is checked there with path.exists() and fails in certain configurations eg., virtual workspaces.

Testing

Applied fix to a private fork and tested against both standard project setups and virtual workspaces. Works without issue on both. Have tested under macOS and Arch Linux.

@github-actions
Copy link
Contributor

Welcome, new contributor!

Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨

@BenjaminBrienen BenjaminBrienen added C-Feature A new feature, making something new possible A-Assets Load files from disk to use for things like images, models, and sounds D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Dec 24, 2024
@alice-i-cecile
Copy link
Member

@super-saturn can you explain why you closed this so others trying to fix this bug better understand what's going on?

@super-saturn
Copy link
Contributor Author

@alice-i-cecile Apologies, this just has a small issue, I was merging these fixes in from my own cloned copy of bevy, and I was trying to be very clean about what I picked and this won't compile as-is. Triple-checking my work before I make a small change and re-open.

@super-saturn super-saturn reopened this Dec 24, 2024
@mockersf mockersf added this to the 0.15.1 milestone Dec 26, 2024
@alice-i-cecile alice-i-cecile added S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it and removed S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Dec 26, 2024
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Dec 29, 2024
Merged via the queue into bevyengine:main with commit 2dcf6bc Dec 29, 2024
mockersf pushed a commit that referenced this pull request Jan 3, 2025
)

# Objective

Fixes #16879

## Solution

Moved the construction of the root path of the assets folder out of
`FileWatcher::new()` and into `source.rs`, as the path is checked there
with `path.exists()` and fails in certain configurations eg., virtual
workspaces.

## Testing

Applied fix to a private fork and tested against both standard project
setups and virtual workspaces. Works without issue on both. Have tested
under macOS and Arch Linux.

---------

Co-authored-by: JP Stringham <jp@bloomdigital.to>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
ecoskey pushed a commit to ecoskey/bevy that referenced this pull request Jan 6, 2025
…yengine#16958)

# Objective

Fixes bevyengine#16879

## Solution

Moved the construction of the root path of the assets folder out of
`FileWatcher::new()` and into `source.rs`, as the path is checked there
with `path.exists()` and fails in certain configurations eg., virtual
workspaces.

## Testing

Applied fix to a private fork and tested against both standard project
setups and virtual workspaces. Works without issue on both. Have tested
under macOS and Arch Linux.

---------

Co-authored-by: JP Stringham <jp@bloomdigital.to>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
mrchantey pushed a commit to mrchantey/bevy that referenced this pull request Feb 4, 2025
…yengine#16958)

# Objective

Fixes bevyengine#16879

## Solution

Moved the construction of the root path of the assets folder out of
`FileWatcher::new()` and into `source.rs`, as the path is checked there
with `path.exists()` and fails in certain configurations eg., virtual
workspaces.

## Testing

Applied fix to a private fork and tested against both standard project
setups and virtual workspaces. Works without issue on both. Have tested
under macOS and Arch Linux.

---------

Co-authored-by: JP Stringham <jp@bloomdigital.to>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Assets Load files from disk to use for things like images, models, and sounds C-Feature A new feature, making something new possible D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

None yet

Development

Successfully merging this pull request may close these issues.

file_watcher feature cannot find assets folder in workspace

6 participants