From f8be6b7fac1cf7ca859bf2641ec7fbcf384f2140 Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Thu, 3 Dec 2020 12:32:55 +0100 Subject: [PATCH] Changed FileReadonly with Permissionn error --- src/filetransfer/mod.rs | 4 ++-- src/filetransfer/sftp_transfer.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index 19ece0b..e41ce4f 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -62,9 +62,9 @@ pub enum FileTransferErrorType { SslError, DirStatFailed, FileCreateDenied, - FileReadonly, IoErr(std::io::Error), NoSuchFileOrDirectory, + PexError, ProtocolError, UninitializedSession, UnsupportedFeature, @@ -101,11 +101,11 @@ impl std::fmt::Display for FileTransferError { FileTransferErrorType::ConnectionError => String::from("Connection error"), FileTransferErrorType::DirStatFailed => String::from("Could not stat directory"), FileTransferErrorType::FileCreateDenied => String::from("Failed to create file"), - FileTransferErrorType::FileReadonly => String::from("File is readonly"), FileTransferErrorType::IoErr(err) => format!("IO Error: {}", err), FileTransferErrorType::NoSuchFileOrDirectory => { String::from("No such file or directory") } + FileTransferErrorType::PexError => String::from("Not enough permissions"), FileTransferErrorType::ProtocolError => String::from("Protocol error"), FileTransferErrorType::SslError => String::from("SSL error"), FileTransferErrorType::UninitializedSession => String::from("Uninitialized session"), diff --git a/src/filetransfer/sftp_transfer.rs b/src/filetransfer/sftp_transfer.rs index 434cef1..3182b9a 100644 --- a/src/filetransfer/sftp_transfer.rs +++ b/src/filetransfer/sftp_transfer.rs @@ -341,7 +341,7 @@ impl FileTransfer for SftpFileTransfer { // Remove file match sftp.unlink(f.abs_path.as_path()) { Ok(_) => Ok(()), - Err(err) => Err(FileTransferError::new_ex(FileTransferErrorType::FileReadonly, format!("{}", err))), + Err(err) => Err(FileTransferError::new_ex(FileTransferErrorType::PexError, format!("{}", err))), } } FsEntry::Directory(d) => { @@ -358,7 +358,7 @@ impl FileTransfer for SftpFileTransfer { // Finally remove directory match sftp.rmdir(d.abs_path.as_path()) { Ok(_) => Ok(()), - Err(err) => Err(FileTransferError::new_ex(FileTransferErrorType::FileReadonly, format!("{}", err))), + Err(err) => Err(FileTransferError::new_ex(FileTransferErrorType::PexError, format!("{}", err))), } } Err(err) => return Err(err),