patchwork_csv_utils 0.1.8-x86_64-linux → 0.1.10-x86_64-linux

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 557cec4f7b89652d9701343e28ff47c43d379c8dbee9f4614964a91dc7f26cf2
4
- data.tar.gz: 62cd2db2316ad54621d110ef397e45aa645a42e7c8ae26eba049ef69d57edb92
3
+ metadata.gz: 55b3b6982ebaadca79bd6b458a51be253d07c6e58bc7270f9fde70f8b535d349
4
+ data.tar.gz: ba693a5d934e92637279159d61f47b16cb9ec4594b5afa22fa2cd279ed2983a7
5
5
  SHA512:
6
- metadata.gz: 5c237bb939e377dfe6448053edac10c54a9eefbaf8216c844fd78ffba3af9a7b493f8ea6afd1b05ce818b623339b41ea80b468c4b3f86b285225381f54d642cb
7
- data.tar.gz: 735cf9537f306962790b7066c7f619f6691cff530ad72b7b8d6b3c402c58fe00f2dd43e4c481fdbeb32307812f00fc6df425eeda9b2bcf7ba047580f1f5b5b38
6
+ metadata.gz: 4a6bb7dbe3b9fcdb7d15335eca40489b5237f71f1145479c6f3aa588f70891a5f8f15e1e73cf3c38fdde59c2df2a5dce84a04404cfeacbb6508474f74b2bebf4
7
+ data.tar.gz: dd040e99cfebdf8c2672fda983c5d444e70c581fba101b0b35ebcfa46833b46dec12f9765f16833a42bfd248739be717292a485f5bfd719c7a69fd91791d4a9a
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- patchwork_csv_utils (0.1.8)
4
+ patchwork_csv_utils (0.1.10)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -3,9 +3,9 @@ use std::fs::File;
3
3
 
4
4
  use chrono::{NaiveDate, NaiveDateTime, NaiveTime, Utc};
5
5
  use csv::{StringRecord, Writer};
6
- use magnus::{RArray, Ruby};
6
+ use magnus::{Error, RArray, Ruby};
7
7
 
8
- use crate::utils::{FileExtension, magnus_err, missing_header};
8
+ use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error};
9
9
 
10
10
  pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusions: RArray) -> magnus::error::Result<()> {
11
11
  if !csv_path.has_extension(&["csv"]) {
@@ -47,11 +47,8 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
47
47
  Ok(current.to_string())
48
48
  } else if i == *start || i == *end || i == *actual_start || i == *actual_end {
49
49
  if c.is_empty() { return Ok(c.to_string()); }
50
- let unknown = "Unknown".to_string();
51
- let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
52
- let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
53
- let datetime = transform_time_to_datetime(date_value, current_time);
54
- Ok(datetime.to_string())
50
+ let column_name = get_column_name(&inverse_header_map, &i);
51
+ process_datetime(ruby, ri, date_value, c, &column_name)
55
52
  } else {
56
53
  Ok(c.to_string())
57
54
  }
@@ -66,15 +63,39 @@ pub fn transform_csv(ruby: &Ruby, csv_path: String, target_path: String, exclusi
66
63
  Ok(())
67
64
  }
68
65
 
66
+ fn process_datetime(ruby: &Ruby, ri: usize, date_value: NaiveDateTime, c: &str, column_name: &String) -> magnus::error::Result<String> {
67
+ let maybe_correct = correct_datetime(c);
68
+ if let Some(correct) = maybe_correct {
69
+ return Ok(correct.to_string());
70
+ }
71
+
72
+ let current_time = string_to_time(c).ok_or(to_datetime_error(ruby, c, ri, column_name))?;
73
+ let datetime = transform_time_to_datetime(date_value, current_time);
74
+ Ok(datetime.to_string())
75
+ }
76
+
77
+ fn get_column_name(inverse_header_map: &HashMap<usize, String>, i: &usize) -> String {
78
+ let unknown = "Unknown".to_string();
79
+ let column_name = inverse_header_map.get(&i).unwrap_or(&unknown);
80
+ column_name.to_string()
81
+ }
82
+
69
83
  fn skip_excluded_rows(request_id: &usize, r: &StringRecord, exclusions: &Vec<String>) -> bool {
70
84
  let value = r.get(*request_id).unwrap_or_default();
71
85
  exclusions.contains(&value.to_string())
72
86
  }
73
87
 
74
88
  fn string_to_datetime(s: &str) -> Option<NaiveDateTime> {
89
+ let maybe_correct = correct_datetime(s);
90
+ if maybe_correct.is_some() { return maybe_correct; }
91
+
75
92
  NaiveDate::parse_from_str(s, "%d-%b-%y").ok().map(|d| d.and_hms_opt(0, 0, 0)).flatten()
76
93
  }
77
94
 
95
+ fn correct_datetime(s: &str) -> Option<NaiveDateTime> {
96
+ NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S").ok()
97
+ }
98
+
78
99
  fn string_to_time(s: &str) -> Option<NaiveTime> {
79
100
  NaiveTime::parse_from_str(s, "%H:%M").ok()
80
101
  }
@@ -83,10 +104,6 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveTime) -> NaiveDateTime
83
104
  NaiveDateTime::new(t1.date(), t2)
84
105
  }
85
106
 
86
- fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
87
- magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
88
- }
89
-
90
107
  fn has_empty_first_col_skip_row(record: &StringRecord) -> bool {
91
108
  record[0].is_empty()
92
109
  }
@@ -15,6 +15,10 @@ fn magnus_err<E: Error>(ruby: &Ruby, e: E, msg: &str) -> magnus::Error {
15
15
  magnus::Error::new(ruby.exception_standard_error(), format!("{}: {}", msg, e.to_string()))
16
16
  }
17
17
 
18
+ fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
19
+ magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
20
+ }
21
+
18
22
  pub trait FileExtension {
19
23
  fn has_extension<S: AsRef<str>>(&self, extensions: &[S]) -> bool;
20
24
  }
@@ -6,7 +6,7 @@ use calamine::{Data, open_workbook, Range, Reader, Xls};
6
6
  use chrono::{NaiveDateTime, Utc};
7
7
  use magnus::{RArray, Ruby};
8
8
 
9
- use crate::utils::{FileExtension, magnus_err, missing_header};
9
+ use crate::utils::{FileExtension, magnus_err, missing_header, to_datetime_error};
10
10
 
11
11
  pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String, exclusions: RArray) -> magnus::error::Result<()> {
12
12
  if !xls_path.has_extension(&["xls"]) {
@@ -98,10 +98,6 @@ fn transform_time_to_datetime(t1: NaiveDateTime, t2: NaiveDateTime) -> NaiveDate
98
98
  NaiveDateTime::new(t1.date(), t2.time())
99
99
  }
100
100
 
101
- fn to_datetime_error(ruby: &Ruby, value: &str, row: usize, col: &str) -> magnus::Error {
102
- magnus::Error::new(ruby.exception_standard_error(), format!("Could not parse datetime '{}', row: {}, col: {}", value, row, col))
103
- }
104
-
105
101
  fn handle_commas<W: Write>(dest: &mut W, s: &str) -> std::io::Result<()> {
106
102
  if s.contains(",") {
107
103
  write!(dest, "{:?}", clean_strings(s).trim_end())
Binary file
Binary file
Binary file
Binary file
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module CsvUtils
4
- VERSION = '0.1.8'
4
+ VERSION = '0.1.10'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: patchwork_csv_utils
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.10
5
5
  platform: x86_64-linux
6
6
  authors:
7
7
  - kingsley.hendrickse
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-08-07 00:00:00.000000000 Z
11
+ date: 2024-08-09 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Deduplication of CSV files and XLS to CSV conversion.
14
14
  email: