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

Merge pull request #566 from Kingtous/fix/download_from_windows_cause_subfolder_collepsed

Browse Source 
fix: Unix <-> Windows sub-folder collapsed
This commit is contained in:
RustDesk 2022-05-20 11:33:13 +08:00 committed by GitHub
commit 9987c24d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hbb_common/src/fs.rs
View File

@ -767,6 +767,13 @@ pub fn create_dir(dir: &str) -> ResultType<()> {
Ok(()) Ok(())
} }
#[inline]
pub fn transform_windows_path(entries: &mut Vec<FileEntry>) {
for entry in entries {
entry.name = entry.name.replace("\\", "/");
}
}
pub enum DigestCheckResult { pub enum DigestCheckResult {
IsSame, IsSame,
NeedConfirm(FileTransferDigest), NeedConfirm(FileTransferDigest),

10
src/mobile.rs
View File

@ -4,9 +4,8 @@ use hbb_common::{
allow_err, allow_err,
compress::decompress, compress::decompress,
config::{Config, LocalConfig}, config::{Config, LocalConfig},
fs, fs, log,
fs::{can_enable_overwrite_detection, get_string, new_send_confirm, DigestCheckResult}, fs::{can_enable_overwrite_detection, new_send_confirm, DigestCheckResult, get_string, transform_windows_path},
get_version_number, log,
message_proto::*, message_proto::*,
protobuf::Message as _, protobuf::Message as _,
rendezvous_proto::ConnType, rendezvous_proto::ConnType,
@ -662,7 +661,10 @@ impl Connection {
} }
Some(message::Union::file_response(fr)) => match fr.union { Some(message::Union::file_response(fr)) => match fr.union {
Some(file_response::Union::dir(fd)) => { Some(file_response::Union::dir(fd)) => {
let entries = fd.entries.to_vec(); let mut entries = fd.entries.to_vec();
if self.session.peer_platform() == "Windows" {
fs::transform_windows_path(&mut entries);
}
let id = fd.id; let id = fd.id;
self.session.push_event( self.session.push_event(
"file_dir", "file_dir",

16
src/ui/remote.rs
View File

@ -1644,7 +1644,15 @@ impl Remote {
); );
let m = make_fd(job.id(), job.files(), true); let m = make_fd(job.id(), job.files(), true);
self.handler.call("updateFolderFiles", &make_args!(m)); self.handler.call("updateFolderFiles", &make_args!(m));
#[cfg(not(windows))]
let files = job.files().clone(); let files = job.files().clone();
#[cfg(windows)]
let mut files = job.files().clone();
#[cfg(windows)]
if self.handler.peer_platform() != "Windows" {
// peer is not windows, need transform \ to /
fs::transform_windows_path(&mut files);
}
self.read_jobs.push(job); self.read_jobs.push(job);
self.timer = time::interval(MILLI1); self.timer = time::interval(MILLI1);
allow_err!(peer.send(&fs::new_receive(id, to, file_num, files)).await); allow_err!(peer.send(&fs::new_receive(id, to, file_num, files)).await);
@ -2019,7 +2027,13 @@ impl Remote {
Some(message::Union::file_response(fr)) => { Some(message::Union::file_response(fr)) => {
match fr.union { match fr.union {
Some(file_response::Union::dir(fd)) => { Some(file_response::Union::dir(fd)) => {
let entries = fd.entries.to_vec(); let mut entries = fd.entries.to_vec();
#[cfg(not(windows))]
{
if self.handler.peer_platform() == "Windows" {
fs::transform_windows_path(&mut entries);
}
}
let mut m = make_fd(fd.id, &entries, fd.id > 0); let mut m = make_fd(fd.id, &entries, fd.id > 0);
if fd.id <= 0 { if fd.id <= 0 {
m.set_item("path", fd.path); m.set_item("path", fd.path);