improve file write to cm

This commit is contained in:
rustdesk
2022-03-26 03:05:15 +08:00
parent 75c9bbb30f
commit 3ea33f7203
4 changed files with 35 additions and 14 deletions

View File

@@ -175,15 +175,23 @@ impl ConnectionManager {
data,
compressed,
} => {
let raw = if let Ok(bytes) = conn.next_raw().await {
Some(bytes)
} else {
None
};
if let Some(job) = fs::get_job(id, write_jobs) {
if let Err(err) = job
.write(FileTransferBlock {
id,
file_num,
data,
compressed,
..Default::default()
})
.write(
FileTransferBlock {
id,
file_num,
data,
compressed,
..Default::default()
},
raw.as_ref().map(|x| &x[..]),
)
.await
{
Self::send(fs::new_error(id, err, file_num), conn).await;

View File

@@ -1797,7 +1797,7 @@ impl Remote {
}
Some(file_response::Union::block(block)) => {
if let Some(job) = fs::get_job(block.id, &mut self.write_jobs) {
if let Err(_err) = job.write(block).await {
if let Err(_err) = job.write(block, None).await {
// to-do: add "skip" for writing job
}
self.update_jobs_status();