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

Merged 0.6.1; added new DirectoryAlreadyExists; return new variant for SFTP/SCP

Browse Source
This commit is contained in:
veeso
2021-08-18 09:33:27 +02:00
parent 1757eb5bec 6cb1dcaa43
commit 81482b47f4
40 changed files with 1034 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/filetransfer/sftp_transfer.rs
View File

@@ -282,7 +282,7 @@ impl FileTransfer for SftpFileTransfer {
// Try addresses
for socket_addr in socket_addresses.iter() {
debug!("Trying socket address {}", socket_addr);
match TcpStream::connect_timeout(&socket_addr, Duration::from_secs(30)) {
match TcpStream::connect_timeout(socket_addr, Duration::from_secs(30)) {
Ok(stream) => {
tcp = Some(stream);
break;
@@ -559,6 +559,13 @@ impl FileTransfer for SftpFileTransfer {
Some(sftp) => {
// Make directory
let path: PathBuf = self.get_abs_path(PathBuf::from(dir).as_path());
// If directory already exists, return Err
if let Ok(_) = sftp.stat(path.as_path()) {
error!("Directory {} already exists", path.display());
return Err(FileTransferError::new(
FileTransferErrorType::DirectoryAlreadyExists,
));
}
info!("Making directory {}", path.display());
match sftp.mkdir(path.as_path(), 0o775) {
Ok(_) => Ok(()),
@@ -602,7 +609,7 @@ impl FileTransfer for SftpFileTransfer {
// Get directory files
let directory_content: Vec<FsEntry> = self.list_dir(d.abs_path.as_path())?;
for entry in directory_content.iter() {
if let Err(err) = self.remove(&entry) {
if let Err(err) = self.remove(entry) {
return Err(err);
}
}