patchwork_csv_utils 0.1.8-x86_64-darwin → 0.1.9-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6603f8bcfc0587d4d92642e938c58f3077e7cc22a3147de6cc11ad83f562d337
-  data.tar.gz: 4b8e33dcd5fa853d8f9a95420d6f844645dc552f16651e91458c6429f92b67b3
+  metadata.gz: 2e212bd3e73eeacfee9ebfcb560843920d212939254bfff6ffef90ca3a36fe42
+  data.tar.gz: a22f483c32e99467a020e3ff9a64809fbf7d9946974da06f565f27dc27b46c9b
 SHA512:
-  metadata.gz: a1102ac2ad779f7077324871702edb4597157715aae11fda27081c40dc6708aed94549053f4895ceb9dafcc862740de6b83b7cce09d770593bcf62dcb5fc1ed0
-  data.tar.gz: e33c5a1e1e521af86d6391093a7f0a5be3b77f733dad77e1114817aea944cd2788aa59b59b0aac94e0fbf82654ce0669c165f55966dc8d64ca0442b660becc22
+  metadata.gz: 2d731b4b50a025bee35941e48a5f5bdc4f57c0a829c69daa66610f08b354370a52502f12a2c28aab85260dc05b02d74d421a48f8d661a0cc9914546f9ed01d86
+  data.tar.gz: b46e0f9280ee98c6f4439dff004c0e9716ae61cbae2d615e1d0b81adb4bdd3b489b460af42cf4b436c315dfd8347dfb5069bafbb43117c678343002123165a0f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patchwork_csv_utils (0.1.8)
+    patchwork_csv_utils (0.1.9)
 
 GEM
   remote: https://rubygems.org/

data/ext/csv_utils/src/utils/csv.rs

@@ -3,9 +3,9 @@ use std::fs::File;
 
 use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use csv::{StringRecord, Writer};
-use magnus::{RArray, Ruby};
+use magnus::{Error, RArray, Ruby};
 
-use crate::utils::{FileExtension, magnus_err, missing_header};
+use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error};
 
 pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusions: RArray) -> magnus::error::Result<()> {
     if !csv_path.has_extension(&["csv"]) {
@@ -47,11 +47,8 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
                 Ok(current.to_string())
             } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
                 if c.is_empty() { return Ok(c.to_string()); }
-                let unknown = "Unknown".to_string();
-                let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
-                let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
-                let datetime = transform_time_to_datetime(date_value, current_time);
-                Ok(datetime.to_string())
+                let column_name = get_column_name(&inverse_header_map, &i);
+                process_datetime(ruby, ri, date_value, c, &column_name)
             } else {
                 Ok(c.to_string())
             }
@@ -66,15 +63,39 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
     Ok(())
 }
 
+fn process_datetime(ruby: &Ruby, ri: usize, date_value: NaiveDateTime, c: &str, column_name: &String) -> magnus::error::Result<String> {
+    let maybe_correct = correct_datetime(c);
+    if let Some(correct) = maybe_correct {
+        return Ok(correct.to_string());
+    }
+
+    let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
+    let datetime = transform_time_to_datetime(date_value, current_time);
+    Ok(datetime.to_string())
+}
+
+fn get_column_name(inverse_header_map: &HashMap<usize, String>, i: &usize) -> String {
+    let unknown = "Unknown".to_string();
+    let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
+    column_name.to_string()
+}
+
 fn skip_excluded_rows(request_id: &usize, r: &StringRecord, exclusions: &Vec<String>) -> bool {
     let value = r.get(*request_id).unwrap_or_default();
     exclusions.contains(&value.to_string())
 }
 
 fn string_to_datetime(s: &str) -> Option<NaiveDateTime> {
+    let maybe_correct = correct_datetime(s);
+    if maybe_correct.is_some() { return maybe_correct; }
+
     NaiveDate::parse_from_str(s, "%d-%b-%y").ok().map(|d| d.and_hms_opt(0, 0, 0)).flatten()
 }
 
+fn correct_datetime(s: &str) -> Option<NaiveDateTime> {
+    NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S").ok()
+}
+
 fn string_to_time(s: &str) -> Option<NaiveTime> {
     NaiveTime::parse_from_str(s, "%H:%M").ok()
 }
@@ -83,10 +104,6 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveTime) -> NaiveDateTime
     NaiveDateTime::new(t1.date(), t2)
 }
 
-fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
-    magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
-}
-
 fn has_empty_first_col_skip_row(record: &StringRecord) -> bool {
     record[0].is_empty()
 }

data/ext/csv_utils/src/utils/mod.rs

@@ -15,6 +15,10 @@ fn magnus_err<E: Error>(ruby: &Ruby, e: E, msg: &str) -> magnus::Error {
     magnus::Error::new(ruby.exception_standard_error(), format!("{}: {}", msg, e.to_string()))
 }
 
+fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
+    magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
+}
+
 pub trait FileExtension {
     fn has_extension<S: AsRef<str>>(&self, extensions: &[S]) -> bool;
 }

data/ext/csv_utils/src/utils/xls.rs

@@ -6,7 +6,7 @@ use calamine::{Data, open_workbook, Range, Reader, Xls};
 use chrono::{NaiveDateTime, Utc};
 use magnus::{RArray, Ruby};
 
-use crate::utils::{FileExtension, magnus_err, missing_header};
+use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error};
 
 pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String, exclusions: RArray) -> magnus::error::Result<()> {
     if !xls_path.has_extension(&["xls"]) {
@@ -98,10 +98,6 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveDateTime) -> NaiveDate
     NaiveDateTime::new(t1.date(), t2.time())
 }
 
-fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
-    magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
-}
-
 fn handle_commas<W: Write>(dest: &mut W, s: &str) -> std::io::Result<()> {
     if s.contains(",") {
         write!(dest, "{:?}", clean_strings(s).trim_end())

data/lib/csv_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CsvUtils
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: x86_64-darwin
 authors:
 - kingsley.hendrickse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Deduplication of CSV files and XLS to CSV conversion.
 email: