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

Fixed lstime_to_systime

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-03 14:53:08 +01:00
parent 33e64d1b43
commit 4e745d0cb6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils.rs
View File

@@ -60,7 +60,6 @@ pub fn parse_remote_opt(
let mut port: u16 = 22; let mut port: u16 = 22;
let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp; let mut protocol: FileTransferProtocol = FileTransferProtocol::Sftp;
let mut username: Option<String> = None; let mut username: Option<String> = None;
let mut secure: bool = false;
// Split string by '://' // Split string by '://'
let tokens: Vec<&str> = wrkstr.split("://").collect(); let tokens: Vec<&str> = wrkstr.split("://").collect();
// If length is > 1, then token[0] is protocol // If length is > 1, then token[0] is protocol
@@ -177,7 +176,7 @@ pub fn lstime_to_systime(
} }
}; };
// Convert datetime to system time // Convert datetime to system time
let mut sys_time: SystemTime = SystemTime::UNIX_EPOCH; let sys_time: SystemTime = SystemTime::UNIX_EPOCH;
Ok(sys_time Ok(sys_time
.checked_add(Duration::from_secs(datetime.timestamp() as u64)) .checked_add(Duration::from_secs(datetime.timestamp() as u64))
.unwrap_or(SystemTime::UNIX_EPOCH)) .unwrap_or(SystemTime::UNIX_EPOCH))
@@ -276,28 +275,28 @@ mod tests {
lstime_to_systime("Nov 5 16:32", "%b %d %Y", "%b %d %H:%M") lstime_to_systime("Nov 5 16:32", "%b %d %Y", "%b %d %H:%M")
.ok() .ok()
.unwrap() .unwrap()
.duration_since(SystemTime::UNIX_EPOCH), .duration_since(SystemTime::UNIX_EPOCH).ok().unwrap(),
Duration::from_secs(1604593920) Duration::from_secs(1604593920)
); );
assert_eq!( assert_eq!(
lstime_to_systime("Dec 2 21:32", "%b %d %Y", "%b %d %H:%M") lstime_to_systime("Dec 2 21:32", "%b %d %Y", "%b %d %H:%M")
.ok() .ok()
.unwrap() .unwrap()
.duration_since(SystemTime::UNIX_EPOCH), .duration_since(SystemTime::UNIX_EPOCH).ok().unwrap(),
Duration::from_secs(1606948320) Duration::from_secs(1606944720)
); );
assert_eq!( assert_eq!(
lstime_to_systime("Nov 5 2018", "%b %d %Y", "%b %d %H:%M") lstime_to_systime("Nov 5 2018", "%b %d %Y", "%b %d %H:%M")
.ok() .ok()
.unwrap() .unwrap()
.duration_since(SystemTime::UNIX_EPOCH), .duration_since(SystemTime::UNIX_EPOCH).ok().unwrap(),
Duration::from_secs(1541376000) Duration::from_secs(1541376000)
); );
assert_eq!( assert_eq!(
lstime_to_systime("Mar 18 2018", "%b %d %Y", "%b %d %H:%M") lstime_to_systime("Mar 18 2018", "%b %d %Y", "%b %d %H:%M")
.ok() .ok()
.unwrap() .unwrap()
.duration_since(SystemTime::UNIX_EPOCH), .duration_since(SystemTime::UNIX_EPOCH).ok().unwrap(),
Duration::from_secs(1521331200) Duration::from_secs(1521331200)
); );
// bad cases // bad cases