diff options
| author | Roman Melnikov | 2023-04-19 17:46:43 +0800 |
|---|---|---|
| committer | Roman Melnikov | 2023-04-20 15:13:13 +0800 |
| commit | 784e9ee24d977c99dcb5ba5aef81dae48cb899fb (patch) | |
| tree | 141acdf6bd62aae808f4c9542819ebc211f09ac2 /src/data.rs | |
| parent | 8c9ea9605eed20528bf60fae35a2b613b901fd77 (diff) | |
[Chore] Handle 'temp_path' as an actual 'Path' instead of 'String'
Problem: 'temp_path' and 'lock_path' are handled as 'String'.
This can be a problem when the 'temp_path' directory is a symlink
on the target system, e.g. this is the case with the default
'/tmp' and macOS, where this directory is actually a symlink to '/private/tmp'.
Solution: Handle 'temp_path' and 'lock_path' as actual Paths.
Also, canonicalize 'temp_path' to avoid canary file path mismatches when checking
filesystem events.
As a side effect, also update the 'notify' dependency to the latest stable version.
Diffstat (limited to 'src/data.rs')
| -rw-r--r-- | src/data.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/data.rs b/src/data.rs index 90ea331..3b3e2c9 100644 --- a/src/data.rs +++ b/src/data.rs @@ -5,6 +5,7 @@ use merge::Merge; use serde::Deserialize; use std::collections::HashMap; +use std::path::PathBuf; #[derive(Deserialize, Debug, Clone, Merge)] pub struct GenericSettings { @@ -25,7 +26,7 @@ pub struct GenericSettings { #[serde(rename(deserialize = "confirmTimeout"))] pub confirm_timeout: Option<u16>, #[serde(rename(deserialize = "tempPath"))] - pub temp_path: Option<String>, + pub temp_path: Option<PathBuf>, #[serde(rename(deserialize = "magicRollback"))] pub magic_rollback: Option<bool>, #[serde(rename(deserialize = "sudo"))] |