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

Merge branch '0.3.1' into refactoring/1

Browse Source
This commit is contained in:
Christian Visintin
2021-01-18 08:07:00 +01:00
committed by GitHub
parent d7e5eacd79 d68d63b978
commit c412d98ec7
20 changed files with 836 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/filetransfer/ftp_transfer.rs
View File

@@ -150,10 +150,12 @@ impl FtpFileTransfer {
Err(_) => None,
};
// Get filesize
let filesize: usize = match metadata.get(6).unwrap().as_str().parse::<usize>() {
Ok(sz) => sz,
Err(_) => 0,
};
let filesize: usize = metadata
.get(6)
.unwrap()
.as_str()
.parse::<usize>()
.unwrap_or(0);
let file_name: String = String::from(metadata.get(8).unwrap().as_str());
// Check if file_name is '.' or '..'
if file_name.as_str() == "." || file_name.as_str() == ".." {
@@ -240,10 +242,7 @@ impl FtpFileTransfer {
true => 0, // If is directory, filesize is 0
false => match metadata.get(3) {
// If is file, parse arg 3
Some(val) => match val.as_str().parse::<usize>() {
Ok(sz) => sz,
Err(_) => 0,
},
Some(val) => val.as_str().parse::<usize>().unwrap_or(0),
None => 0, // Should not happen
},
};