replace chrono with a simpler custom DateTime

Author: j-hc

Cargo.toml

@@ -8,13 +8,14 @@ description = "FTP client for Rust"
 readme = "README.md"
 license = "Apache-2.0/MIT"
 keywords = ["ftp"]
+edition = "2021"
 categories = ["network-programming"]
 
 [badges]
 travis-ci = { repository = "mattnenterprise/rust-ftp" }
 
 [lib]
-name ="ftp"
+name = "ftp"
 path = "src/lib.rs"
 
 [features]
@@ -25,11 +26,11 @@ debug_print = []
 [dependencies]
 lazy_static = "1"
 regex = "1"
-chrono = "0.4"
 openssl = { version = "0.10", optional = true }
 native-tls = { version = "0.2", optional = true }
 
-
-
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "openssl"]
+
+[dev-dependencies]
+chrono = "0.4"

src/ftp.rs

@@ -7,7 +7,6 @@ use super::{
 };
 
 use {
-    chrono::{offset::TimeZone, DateTime, Utc},
     regex::Regex,
     std::{
         borrow::Cow,
@@ -47,6 +46,40 @@ pub struct FtpStream {
     ssl_cfg: Option<SslContext>,
 }
 
+pub struct DateTime {
+    pub year: u32,
+    pub month: u32,
+    pub day: u32,
+    pub hour: u32,
+    pub minute: u32,
+    pub second: u32,
+}
+impl DateTime {
+    pub fn timestamp(&self) -> u32 {
+        let days_asof_m = [31_u16, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365];
+        let yyear = self.year - 1;
+        let countleap = ((yyear / 4) - (yyear / 100) + (yyear / 400))
+            - ((1970 / 4) - (1970 / 100) + (1970 / 400));
+
+        let m = if self.month > 1 {
+            let days_per_month = ((self.year % 4 == 0
+                && ((self.year % 100 != 0) || self.year % 400 == 0))
+                && self.month > 2
+                || self.month == 2 && self.day >= 29) as u16;
+            (days_asof_m[(self.month - 2) as usize] + days_per_month) as u32 * 86400
+        } else {
+            0
+        };
+        (self.year - 1970) * 365 * 86400
+            + (countleap * 86400)
+            + self.second
+            + (self.hour * 3600)
+            + (self.minute * 60)
+            + ((self.day - 1) * 86400)
+            + m
+    }
+}
+
 impl FtpStream {
     /// Creates an FTP Stream and returns the welcome message
     #[cfg(not(any(feature = "openssl", feature = "native-tls")))]
@@ -641,14 +674,14 @@ impl FtpStream {
 
     /// Retrieves the modification time of the file at `pathname` if it exists.
     /// In case the file does not exist `None` is returned.
-    pub fn mdtm(&mut self, pathname: &str) -> crate::Result<Option<DateTime<Utc>>> {
+    pub fn mdtm(&mut self, pathname: &str) -> crate::Result<Option<DateTime>> {
         self.write_str(format!("MDTM {}\r\n", pathname))?;
         let Line(_, content) = self.read_response(status::FILE)?;
 
         match MDTM_RE.captures(&content) {
             Some(caps) => {
                 let (year, month, day) = (
-                    caps[1].parse::<i32>().unwrap(),
+                    caps[1].parse::<u32>().unwrap(),
                     caps[2].parse::<u32>().unwrap(),
                     caps[3].parse::<u32>().unwrap(),
                 );
@@ -657,9 +690,14 @@ impl FtpStream {
                     caps[5].parse::<u32>().unwrap(),
                     caps[6].parse::<u32>().unwrap(),
                 );
-                Ok(Some(
-                    Utc.ymd(year, month, day).and_hms(hour, minute, second),
-                ))
+                Ok(Some(DateTime {
+                    year,
+                    month,
+                    day,
+                    hour,
+                    minute,
+                    second,
+                }))
             }
             None => Ok(None),
         }

src/lib.rs

@@ -28,7 +28,8 @@
 //! For better security it's the good practice to switch to the secure mode
 //! before authentication.
 //!
-#![cfg_attr(feature = "openssl",
+#![cfg_attr(
+    feature = "openssl",
     doc = r##"
 ## FTPS Usage
 
@@ -49,7 +50,8 @@ let _ = ftp_stream.quit();
 ```
 "##
 )]
-#![cfg_attr(feature = "native-ssl",
+#![cfg_attr(
+    feature = "native-ssl",
     doc = r##"
 ## FTPS Usage
 
@@ -72,7 +74,6 @@ let _ = ftp_stream.quit();
 )]
 #[macro_use]
 extern crate lazy_static;
-extern crate chrono;
 extern crate regex;
 
 #[cfg(feature = "native-tls")]
@@ -85,7 +86,7 @@ mod ftp;
 pub mod status;
 pub mod types;
 
-pub use self::ftp::FtpStream;
+pub use self::ftp::{DateTime, FtpStream};
 pub use self::types::FtpError;
 
 /// A shorthand for a Result whose error type is always an FtpError.

src/types.rs

@@ -140,8 +140,33 @@ impl std::error::Error for FtpError {
 
 #[cfg(test)]
 mod tests {
-
     use super::*;
+    use crate::DateTime;
+    use chrono::TimeZone;
+
+    #[test]
+    fn test_datetime() {
+        let year: u32 = 2024;
+        let month: u32 = 3;
+        let day: u32 = 28;
+        let hour: u32 = 13;
+        let minute: u32 = 33;
+        let second: u32 = 59;
+
+        let dt = DateTime {
+            year,
+            month,
+            day,
+            hour,
+            minute,
+            second,
+        };
+        let chronos_dt = chrono::Utc
+            .ymd(year as i32, month, day)
+            .and_hms(hour, minute, second);
+
+        assert_eq!(dt.timestamp(), chronos_dt.timestamp() as u32);
+    }
 
     #[test]
     fn error_str() {