mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-01-18 15:53:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use "_" instead of ":" in PeerConfig filenames

Browse Source
This commit is contained in:
Robin Fackler 2022-11-11 00:00:49 +01:00
parent 18a801e3b2
commit e1516d809f
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/hbb_common/src/config.rs
View File

@ -1,5 +1,6 @@
use std::{
collections::HashMap,
ffi::{OsStr, OsString},
fs,
net::{IpAddr, Ipv4Addr, SocketAddr},
path::{Path, PathBuf},
@ -848,7 +849,7 @@ impl PeerConfig {
}
fn path(id: &str) -> PathBuf {
let path: PathBuf = [PEERS, id].iter().collect();
let path: PathBuf = [PEERS, id.replace(":", "_").as_str()].iter().collect();
Config::with_extension(Config::path(path))
}
@ -870,7 +871,22 @@ impl PeerConfig {
.file_stem()
.map(|p| p.to_str().unwrap_or(""))
.unwrap_or("")
.replace("_", ":")
.to_owned();
//rename PeerConfig files if they contain ":"
//to stay backward compatible with *nix
let current_filename = p
.file_name()
.unwrap_or(OsStr::new(""))
.to_str()
.unwrap_or("");
if current_filename.contains(":") {
if let Some(path) = p.parent() {
fs::rename(p, path.join(current_filename.replace(":", "_"))).ok();
}
}
let c = PeerConfig::load(&id);
if c.info.platform.is_empty() {
fs::remove_file(&p).ok();