vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changed FTP library from ftp4 to suppaftp; Handle directory already exists on FTP transfer; mkdir already exists test units

Browse Source
This commit is contained in:
veeso
2021-08-23 11:11:14 +02:00
parent 81482b47f4
commit 7390bb58c5
10 changed files with 218 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/filetransfer/scp_transfer.rs
View File

@@ -643,7 +643,7 @@ impl FileTransfer for ScpFileTransfer {
/// ### mkdir
///
/// Make directory
/// It MUSTN'T return error in case the directory already exists
/// In case the directory already exists, it must return an Error of kind `FileTransferErrorType::DirectoryAlreadyExists`
fn mkdir(&mut self, dir: &Path) -> Result<(), FileTransferError> {
match self.is_connected() {
true => {
@@ -651,7 +651,7 @@ impl FileTransfer for ScpFileTransfer {
info!("Making directory {}", dir.display());
let p: PathBuf = self.wrkdir.clone();
// If directory already exists, return Err
if let Ok(_) = self.stat(dir.as_path()) {
if self.stat(dir.as_path()).is_ok() {
error!("Directory {} already exists", dir.display());
return Err(FileTransferError::new(
FileTransferErrorType::DirectoryAlreadyExists,
@@ -1026,6 +1026,15 @@ mod tests {
assert!(client.list_dir(&Path::new("/config")).unwrap().len() >= 4);
// Make directory
assert!(client.mkdir(PathBuf::from("/tmp/omar").as_path()).is_ok());
// Remake directory (should report already exists)
assert_eq!(
client
.mkdir(PathBuf::from("/tmp/omar").as_path())
.err()
.unwrap()
.kind(),
FileTransferErrorType::DirectoryAlreadyExists
);
// Make directory (err)
assert!(client
.mkdir(PathBuf::from("/root/aaaaa/pommlar").as_path())