TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-17 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: file transfer, resume, path and finished size (#12739)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-08-26 17:59:39 +08:00
committed by GitHub
parent 34cf9d6181
commit ac70f380a6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

Submodule libs/hbb_common updated: 5b6c0cf49a...fa8f289776

13
src/client/io_loop.rs
View File

@@ -722,12 +722,22 @@ impl<T: InvokeUiSession> Remote<T> {
fs::DataSource::FilePath(_p) => { fs::DataSource::FilePath(_p) => {
job.is_last_job = false; job.is_last_job = false;
job.is_resume = true; job.is_resume = true;
job.set_finished_size_on_resume();
#[cfg(not(windows))]
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);
}
allow_err!( allow_err!(
peer.send(&fs::new_receive( peer.send(&fs::new_receive(
id, id,
job.remote.clone(), job.remote.clone(),
job.file_num, job.file_num,
job.files.clone(), files,
job.total_size(), job.total_size(),
)) ))
.await .await
@@ -1463,6 +1473,7 @@ impl<T: InvokeUiSession> Remote<T> {
if let Some(job) = fs::get_job(fd.id, &mut self.write_jobs) { if let Some(job) = fs::get_job(fd.id, &mut self.write_jobs) {
log::info!("job set_files: {:?}", entries); log::info!("job set_files: {:?}", entries);
job.set_files(entries); job.set_files(entries);
job.set_finished_size_on_resume();
} else if let Some(job) = self.remove_jobs.get_mut(&fd.id) { } else if let Some(job) = self.remove_jobs.get_mut(&fd.id) {
job.files = entries; job.files = entries;
} }