mirror of
https://github.com/rustdesk/rustdesk.git
synced 2024-11-24 20:59:37 +08:00
opt: clean code
This commit is contained in:
parent
a2bc2a21bb
commit
52fd312ff3
@ -264,7 +264,6 @@ message FileResponse {
|
||||
FileTransferError error = 3;
|
||||
FileTransferDone done = 4;
|
||||
FileTransferDigest digest = 5;
|
||||
FileTransferDirOffsetRequest offset = 6;
|
||||
}
|
||||
}
|
||||
|
||||
@ -306,14 +305,6 @@ message FileTransferSendConfirmRequest {
|
||||
}
|
||||
}
|
||||
|
||||
message FileTransferDirOffsetRequest {
|
||||
int32 id = 1;
|
||||
// start from file_num
|
||||
sint32 file_num = 2;
|
||||
// current file blk offset
|
||||
uint32 offset_blk = 3;
|
||||
}
|
||||
|
||||
message FileTransferDone {
|
||||
int32 id = 1;
|
||||
sint32 file_num = 2;
|
||||
|
@ -1054,14 +1054,6 @@ impl Connection {
|
||||
last_modified: d.last_modified,
|
||||
is_upload: true,
|
||||
}),
|
||||
Some(file_response::Union::offset(offset)) => {
|
||||
// TODO: i32
|
||||
// self.send_fs(ipc::FS::WriteOffset {
|
||||
// id: offset.id,
|
||||
// file_num: offset.file_num,
|
||||
// offset_blk: offset.offset_blk,
|
||||
// });
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
Some(message::Union::misc(misc)) => match misc.union {
|
||||
|
@ -1550,7 +1550,7 @@ impl Remote {
|
||||
let job: Result<TransferJobMeta, serde_json::Error> = serde_json::from_str(&job_str);
|
||||
if let Ok(job) = job {
|
||||
self.handler.call("addJob",&make_args!(
|
||||
cnt,job.remote.clone(),job.to.clone(),job.file_num,job.show_hidden, false
|
||||
cnt,job.to.clone(),job.remote.clone(),job.file_num,job.show_hidden, false
|
||||
));
|
||||
cnt += 1;
|
||||
println!("restore read_job: {:?}",job);
|
||||
@ -1595,7 +1595,7 @@ impl Remote {
|
||||
.push(fs::TransferJob::new_write(id, path.clone(),to,file_num, include_hidden, is_remote, Vec::new(), od));
|
||||
allow_err!(peer.send(&fs::new_send(id, path,file_num, include_hidden)).await);
|
||||
} else {
|
||||
match fs::TransferJob::new_read(id, path.clone(),to.clone(), file_num,include_hidden,is_remote, include_hidden, od) {
|
||||
match fs::TransferJob::new_read(id, to.clone(), path.clone(), file_num,include_hidden,is_remote, include_hidden, od) {
|
||||
Err(err) => {
|
||||
self.handle_job_status(id, -1, Some(err.to_string()));
|
||||
}
|
||||
@ -1830,7 +1830,7 @@ impl Remote {
|
||||
}
|
||||
|
||||
async fn sync_jobs_status_to_local(&mut self) -> bool {
|
||||
println!("sync job status");
|
||||
log::info!("sync transfer job status");
|
||||
let mut config: PeerConfig = self.handler.load_config();
|
||||
let mut transfer_metas = TransferSerde::default();
|
||||
for job in self.read_jobs.iter() {
|
||||
@ -1842,7 +1842,6 @@ impl Remote {
|
||||
transfer_metas.write_jobs.push(json_str);
|
||||
}
|
||||
config.transfer = transfer_metas;
|
||||
println!("{:?}", config.transfer);
|
||||
self.handler.save_config(config);
|
||||
true
|
||||
}
|
||||
@ -1934,10 +1933,6 @@ impl Remote {
|
||||
job.files = entries;
|
||||
}
|
||||
}
|
||||
Some(file_response::Union::offset(offset)) => {
|
||||
// TODO: offset
|
||||
// upload
|
||||
}
|
||||
Some(file_response::Union::digest(digest)) => {
|
||||
if digest.is_upload {
|
||||
if let Some(job) = fs::get_job(digest.id, &mut self.read_jobs) {
|
||||
|
Loading…
Reference in New Issue
Block a user