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

Less pedantic parse_list/parse_ls methods. Invalid times are converted to UNIX_EPOCH 0

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-05 17:58:21 +01:00
parent 26006ee383
commit ae2224618d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/filetransfer/ftp_transfer.rs
View File

@@ -154,7 +154,7 @@ impl FtpFileTransfer {
"%b %d %H:%M", "%b %d %H:%M",
) { ) {
Ok(t) => t, Ok(t) => t,
Err(_) => return Err(()), Err(_) => SystemTime::UNIX_EPOCH,
}; };
// Get uid // Get uid
let uid: Option<u32> = match metadata.get(4).unwrap().as_str().parse::<u32>() { let uid: Option<u32> = match metadata.get(4).unwrap().as_str().parse::<u32>() {
@@ -169,7 +169,7 @@ impl FtpFileTransfer {
// Get filesize // Get filesize
let filesize: usize = match metadata.get(6).unwrap().as_str().parse::<usize>() { let filesize: usize = match metadata.get(6).unwrap().as_str().parse::<usize>() {
Ok(sz) => sz, Ok(sz) => sz,
Err(_) => return Err(()), Err(_) => 0,
}; };
let file_name: String = String::from(metadata.get(8).unwrap().as_str()); let file_name: String = String::from(metadata.get(8).unwrap().as_str());
let mut abs_path: PathBuf = PathBuf::from(path); let mut abs_path: PathBuf = PathBuf::from(path);

6
src/filetransfer/scp_transfer.rs
View File

@@ -154,7 +154,7 @@ impl ScpFileTransfer {
"%b %d %H:%M", "%b %d %H:%M",
) { ) {
Ok(t) => t, Ok(t) => t,
Err(_) => return Err(()), Err(_) => SystemTime::UNIX_EPOCH,
}; };
// Get uid // Get uid
let uid: Option<u32> = match metadata.get(4).unwrap().as_str().parse::<u32>() { let uid: Option<u32> = match metadata.get(4).unwrap().as_str().parse::<u32>() {
@@ -169,7 +169,7 @@ impl ScpFileTransfer {
// Get filesize // Get filesize
let filesize: usize = match metadata.get(6).unwrap().as_str().parse::<usize>() { let filesize: usize = match metadata.get(6).unwrap().as_str().parse::<usize>() {
Ok(sz) => sz, Ok(sz) => sz,
Err(_) => return Err(()), Err(_) => 0,
}; };
// Get link and name // Get link and name
let (file_name, symlink_path): (String, Option<PathBuf>) = match is_symlink { let (file_name, symlink_path): (String, Option<PathBuf>) = match is_symlink {
@@ -584,7 +584,7 @@ impl FileTransfer for ScpFileTransfer {
let p: PathBuf = self.wrkdir.clone(); let p: PathBuf = self.wrkdir.clone();
match self.perform_shell_cmd_with_path( match self.perform_shell_cmd_with_path(
p.as_path(), p.as_path(),
format!("mv -f \"{}\" {}\"; echo $?", path.display(), dst.display()).as_str(), format!("mv -f \"{}\" \"{}\"; echo $?", path.display(), dst.display()).as_str(),
) { ) {
Ok(output) => { Ok(output) => {
// Check if output is 0 // Check if output is 0