forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't panic on temporary files in file watcher (#18462)

Browse Source 
# Objective

Fixes #18461

Apparently `RustRover` creates a temporary file with a tilde like
`load_scene_example.scn.ron~` and at the moment of calling
`.canonicalize()` the file does not exists anymore.

## Solution

Not call `.unwrap()` and return `None` fixes the issue. 

## Testing

- `cargo ci`: OK
- Tested the `scene` example with `file_watcher` feature and it works as
expected.

Co-authored-by: François Mockers <mockersf@gmail.com>
This commit is contained in:
Erick Z 2025-03-25 05:16:33 +01:00 committed by GitHub
parent 584c6665f9
commit 933752ad46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_asset/src/io/file/file_watcher.rs
View File

@ -35,7 +35,7 @@ impl FileWatcher {
sender: Sender<AssetSourceEvent>, sender: Sender<AssetSourceEvent>,
debounce_wait_time: Duration, debounce_wait_time: Duration,
) -> Result<Self, notify::Error> { ) -> Result<Self, notify::Error> {
let root = normalize_path(&path).canonicalize().unwrap(); let root = normalize_path(&path).canonicalize()?;
let watcher = new_asset_event_debouncer( let watcher = new_asset_event_debouncer(
path.clone(), path.clone(),
debounce_wait_time, debounce_wait_time,
@ -262,7 +262,7 @@ impl FilesystemEventHandler for FileEventHandler {
self.last_event = None; self.last_event = None;
} }
fn get_path(&self, absolute_path: &Path) -> Option<(PathBuf, bool)> { fn get_path(&self, absolute_path: &Path) -> Option<(PathBuf, bool)> {
let absolute_path = absolute_path.canonicalize().unwrap(); let absolute_path = absolute_path.canonicalize().ok()?;
Some(get_asset_path(&self.root, &absolute_path)) Some(get_asset_path(&self.root, &absolute_path))
} }