hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "make sure default video save directory exist"

Browse Source
This commit is contained in:
RustDesk 2023-03-10 21:02:28 +08:00 committed by GitHub
parent 2d11a12cf4
commit 975ea660ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ui_interface.rs
View File

@ -648,50 +648,29 @@ pub fn get_langs() -> String {
#[inline] #[inline]
pub fn default_video_save_directory() -> String { pub fn default_video_save_directory() -> String {
let appname = crate::get_app_name(); let appname = crate::get_app_name();
// ui process can show it correctly Once vidoe process created it. // In order to make the function call results of the UI process and the video process the same, no result check is performed.
let try_create = |path: &std::path::Path| { let try_create = |path: &std::path::Path| {
if !path.exists() { if !path.exists() {
std::fs::create_dir_all(path).ok(); if std::fs::create_dir_all(path).is_err() {
log::warn!("video directory {:?} create failed.", path);
}
} }
if path.exists() {
path.to_string_lossy().to_string() path.to_string_lossy().to_string()
} else {
"".to_string()
}
}; };
#[cfg(any(target_os = "android", target_os = "ios"))] #[cfg(any(target_os = "android", target_os = "ios"))]
if let Ok(home) = config::APP_HOME_DIR.read() { if let Ok(home) = config::APP_HOME_DIR.read() {
let mut path = home.to_owned(); let mut path = home.to_owned();
path.push_str("/RustDesk/ScreenRecord"); path.push_str("/RustDesk/ScreenRecord");
let dir = try_create(&std::path::Path::from(path)); return try_create(&std::path::Path::from(path));
if !dir.is_empty() {
return dir;
}
} }
if let Some(user) = directories_next::UserDirs::new() { if let Some(user) = directories_next::UserDirs::new() {
if let Some(video_dir) = user.video_dir() { if let Some(video_dir) = user.video_dir() {
let dir = try_create(&video_dir.join(&appname)); return try_create(&video_dir.join(&appname));
if !dir.is_empty() {
return dir;
}
if video_dir.exists() {
return video_dir.to_string_lossy().to_string();
}
}
if let Some(desktop_dir) = user.desktop_dir() {
if desktop_dir.exists() {
return desktop_dir.to_string_lossy().to_string();
}
}
let home = user.home_dir();
if home.exists() {
return home.to_string_lossy().to_string();
} }
} }
// same order as above
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
if let Some(home) = crate::platform::get_active_user_home() { if let Some(home) = crate::platform::get_active_user_home() {
let name = if cfg!(target_os = "macos") { let name = if cfg!(target_os = "macos") {
@ -699,31 +678,12 @@ pub fn default_video_save_directory() -> String {
} else { } else {
"Videos" "Videos"
}; };
let video_dir = home.join(name); return try_create(&home.join(name).join(&appname));
let dir = try_create(&video_dir.join(&appname));
if !dir.is_empty() {
return dir;
}
if video_dir.exists() {
return video_dir.to_string_lossy().to_string();
}
let desktop_dir = home.join("Desktop");
if desktop_dir.exists() {
return desktop_dir.to_string_lossy().to_string();
}
if home.exists() {
return home.to_string_lossy().to_string();
}
} }
if let Ok(exe) = std::env::current_exe() { if let Ok(exe) = std::env::current_exe() {
if let Some(parent) = exe.parent() { if let Some(dir) = exe.parent() {
let dir = try_create(&parent.join("videos")); return try_create(&dir.join("videos"));
if !dir.is_empty() {
return dir;
}
// basically exist
return parent.to_string_lossy().to_string();
} }
} }
"".to_owned() "".to_owned()