Merge pull request #9 from kamphaus/8-improved-file-parsing

Improved timestamp parsing from file

.github/workflows/rust.yml

@@ -21,6 +21,8 @@ jobs:
     # before the plugin, as the cache uses the current rustc version as its cache key
     - run: rustup toolchain install stable --profile minimal
     - uses: Swatinem/rust-cache@v2
+      with:
+        cache-on-failure: "true"
 
     - name: Build
       run: cargo build --verbose --locked

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "upt"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/main.rs

@@ -143,7 +143,11 @@ fn persist_time(dt: DateTime<Utc>) -> BoxResult<()> {
 
 fn read_time() -> BoxResult<DateTime<Utc>> {
     let persisted = fs::read_to_string(get_file_path()?)?;
-    let parsed = DateTime::parse_from_rfc3339(persisted.as_str())?;
+    parse_time(persisted)
+}
+
+fn parse_time(date_str: String) -> BoxResult<DateTime<Utc>> {
+    let parsed = DateTime::parse_from_rfc3339(date_str.trim())?;
     Ok(parsed.with_timezone(&Utc))
 }
 
@@ -219,8 +223,32 @@ fn main() {
     }
 }
 
-#[test]
-fn verify_cli() {
-    use clap::CommandFactory;
-    Cli::command().debug_assert()
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use chrono::{DateTime, NaiveDateTime, Utc};
+
+    #[test]
+    fn verify_cli() {
+        use clap::CommandFactory;
+        Cli::command().debug_assert()
+    }
+
+    #[test]
+    fn test_date_parsing() {
+        let nt = NaiveDateTime::from_timestamp_opt(1685871491, 0);
+        let dt: DateTime<Utc> = DateTime::from_utc(nt.unwrap(), Utc);
+        assert_eq!(
+            parse_time("2023-06-04T09:38:11.000000000+00:00".to_string()).unwrap(),
+            dt
+        );
+        assert_eq!(
+            parse_time("2023-06-04T09:38:11.000000000+00:00\n".to_string()).unwrap(),
+            dt
+        );
+        assert_eq!(
+            parse_time("2030604T09:xy:11.000000000+00:00".to_string()).is_err(),
+            true
+        )
+    }
 }