b4tman/socks5ws
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix toml save/load

Browse Source
This commit is contained in:
Dmitry Belyaev 2023-07-11 10:21:43 +03:00
parent a516c777c3
commit 119e9eef22
Signed by: b4tman
GPG Key ID: 41A00BF15EA7E5F3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.rs
View File

@ -66,11 +66,12 @@ impl Default for Config {
impl Config { impl Config {
const FILENAME: &'static str = "config.toml"; const FILENAME: &'static str = "config.toml";
fn read<P: AsRef<Path>>(path: P) -> Result<Self, String> { fn read<P: AsRef<Path>>(path: P) -> Result<Self, String> {
let data = fs::read(path).map_err(|e| format!("can't read config: {:?}", e))?; let data = fs::read_to_string(path).map_err(|e| format!("can't read config: {:?}", e))?;
toml::from_slice(&data).map_err(|e| format!("can't parse config: {:?}", e)) toml::from_str(&data).map_err(|e| format!("can't parse config: {:?}", e))
} }
fn write<P: AsRef<Path>>(&self, path: P) -> Result<(), String> { fn write<P: AsRef<Path>>(&self, path: P) -> Result<(), String> {
let data = toml::to_vec(&self).map_err(|e| format!("can't serialize config: {:?}", e))?; let data = toml::to_string_pretty(&self)
.map_err(|e| format!("can't serialize config: {:?}", e))?;
fs::write(path, &data).map_err(|e| format!("can't write config: {:?}", e)) fs::write(path, &data).map_err(|e| format!("can't write config: {:?}", e))
} }
fn file_location() -> Result<PathBuf, String> { fn file_location() -> Result<PathBuf, String> {