maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

If transfer error reason is Abrupted or IO, then stat created file and remove it

Browse source
This commit is contained in:
veeso 2021-05-02 10:45:14 +02:00
parent a35395bd51
commit fe51185f74
1 changed files with 65 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/ui/activities/filetransfer_activity/session.rs
View file

@ -52,16 +52,16 @@ use thiserror::Error;
/// Describes the reason that caused an error during a file transfer
#[derive(Error, Debug)]
enum TransferErrorReason {
#[error("Abrupted")]
#[error("File transfer aborted")]
Abrupted,
#[error("Failed to seek file: {0}")]
CouldNotRewind(std::io::Error),
#[error("I/O error on localhost: {0}")]
LocalIOError(std::io::Error),
LocalIoError(std::io::Error),
#[error("Host error: {0}")]
HostError(HostError),
#[error("I/O error on remote: {0}")]
RemoteIOError(std::io::Error),
RemoteIoError(std::io::Error),
#[error("File transfer error: {0}")]
FileTransferError(FileTransferError),
}
@ -182,9 +182,33 @@ impl FileTransferActivity {
// If transfer was abrupted or there was an IO error on remote, remove file
if matches!(
err,
TransferErrorReason::Abrupted | TransferErrorReason::RemoteIOError(_)
TransferErrorReason::Abrupted | TransferErrorReason::RemoteIoError(_)
) {
// TODO: make dummy fs entry
// Stat file on remote and remove it if exists
match self.client.stat(remote_path.as_path()) {
Err(err) => self.log(
LogLevel::Error,
format!(
"Could not remove created file {}: {}",
remote_path.display(),
err
)
.as_str(),
),
Ok(entry) => {
if let Err(err) = self.client.remove(&entry) {
self.log(
LogLevel::Error,
format!(
"Could not remove created file {}: {}",
remote_path.display(),
err
)
.as_str(),
);
}
}
}
}
}
}
@ -293,7 +317,38 @@ impl FileTransferActivity {
LogLevel::Error,
format!("Could not download file {}: {}", file.name, err),
);
// TODO: delete file
// If transfer was abrupted or there was an IO error on remote, remove file
if matches!(
err,
TransferErrorReason::Abrupted | TransferErrorReason::LocalIoError(_)
) {
let local = &mut self.context.as_mut().unwrap().local;
// Stat file
match local.stat(local_file_path.as_path()) {
Err(err) => self.log(
LogLevel::Error,
format!(
"Could not remove created file {}: {}",
local_file_path.display(),
err
)
.as_str(),
),
Ok(entry) => {
if let Err(err) = local.remove(&entry) {
self.log(
LogLevel::Error,
format!(
"Could not remove created file {}: {}",
local_file_path.display(),
err
)
.as_str(),
);
}
}
}
}
}
}
FsEntry::Directory(dir) => {
@ -460,7 +515,7 @@ impl FileTransferActivity {
}
Err(err) => {
self.umount_progress_bar();
return Err(TransferErrorReason::RemoteIOError(
return Err(TransferErrorReason::RemoteIoError(
err,
));
}
@ -470,7 +525,7 @@ impl FileTransferActivity {
}
Err(err) => {
self.umount_progress_bar();
return Err(TransferErrorReason::LocalIOError(err));
return Err(TransferErrorReason::LocalIoError(err));
}
}
// Increase progress
@ -563,7 +618,7 @@ impl FileTransferActivity {
Ok(bytes) => buf_start += bytes,
Err(err) => {
self.umount_progress_bar();
return Err(TransferErrorReason::LocalIOError(
return Err(TransferErrorReason::LocalIoError(
err,
));
}
@ -573,7 +628,7 @@ impl FileTransferActivity {
}
Err(err) => {
self.umount_progress_bar();
return Err(TransferErrorReason::RemoteIOError(err));
return Err(TransferErrorReason::RemoteIoError(err));
}
}
// Set progress