patchwork_csv_utils 0.1.2-x86_64-linux → 0.1.4-x86_64-linux
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/ext/csv_utils/src/lib.rs +1 -1
- data/ext/csv_utils/src/utils/xls.rs +31 -8
- data/lib/csv_utils/2.7/csv_utils.so +0 -0
- data/lib/csv_utils/3.0/csv_utils.so +0 -0
- data/lib/csv_utils/3.1/csv_utils.so +0 -0
- data/lib/csv_utils/3.2/csv_utils.so +0 -0
- data/lib/csv_utils/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b9d62eb73016a46a3ec9caac2d43fd5db562a0856831c7f0e544e9c570e8d550
|
4
|
+
data.tar.gz: 1262e0f45c2b8cfe896be3d4bd6f1074db61aa2b252049f5090cec5feba05c1a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4fca3c59b6ff0b5cfd1dcc2ad0ae6efdf8005716980c0a1d111bff0190a4fae3c9bc6b560086416c794be89e3eab46ae6ffc34bdfc408a806c4ac07fe1660608
|
7
|
+
data.tar.gz: 28454948d621cd2272b9a6790d735ce7e2d95da51202accb76a3d56f1a5b2b6bc9a274bf7473073bbc99fac25a64de818ed0a1b9839b94dc0893241ff0290c24
|
data/Gemfile.lock
CHANGED
data/ext/csv_utils/src/lib.rs
CHANGED
@@ -8,6 +8,6 @@ pub mod utils;
|
|
8
8
|
fn init() -> Result<(), magnus::Error> {
|
9
9
|
let module = define_module("CsvUtils")?;
|
10
10
|
module.define_singleton_method("dedup", function!(dedup, 3))?;
|
11
|
-
module.define_singleton_method("to_csv", function!(to_csv,
|
11
|
+
module.define_singleton_method("to_csv", function!(to_csv, 2))?;
|
12
12
|
Ok(())
|
13
13
|
}
|
@@ -8,13 +8,15 @@ use magnus::Ruby;
|
|
8
8
|
|
9
9
|
use crate::utils::{FileExtension, magnus_err};
|
10
10
|
|
11
|
-
pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String
|
11
|
+
pub fn to_csv(ruby: &Ruby, xls_path: String, target_path: String) -> magnus::error::Result<()> {
|
12
12
|
if !xls_path.has_extension(&["xls"]) {
|
13
13
|
return Err(magnus::Error::new(ruby.exception_standard_error(), "xls_path must be an xls file".to_string()));
|
14
14
|
}
|
15
15
|
|
16
16
|
let mut workbook: Xls<_> = open_workbook(xls_path.clone()).map_err(|e| magnus_err(ruby, e, format!("could not open xls: {}", xls_path).as_str()))?;
|
17
|
-
let range = workbook.
|
17
|
+
let range = workbook.worksheet_range_at(0)
|
18
|
+
.ok_or(magnus::Error::new(ruby.exception_standard_error(), "no worksheet found in xls".to_string()))
|
19
|
+
.and_then(|r| r.map_err(|e| magnus_err(ruby, e, "could not read worksheet range")))?;
|
18
20
|
|
19
21
|
let headers = range.headers().ok_or(magnus::Error::new(ruby.exception_standard_error(), "no headers found in xls".to_string()))?;
|
20
22
|
let header_map: HashMap<String, usize> = headers.iter().enumerate().map(|(i, h)| (h.to_string(), i)).collect();
|
@@ -28,13 +30,17 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
|
|
28
30
|
let n = range.get_size().1 - 1;
|
29
31
|
for (ri, r) in range.rows().enumerate() {
|
30
32
|
let mut date_value = Utc::now().naive_utc();
|
31
|
-
for (i, c) in r.iter().enumerate() {
|
32
|
-
let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
|
33
|
-
let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
|
34
|
-
let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
|
35
|
-
let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
|
36
|
-
let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
|
37
33
|
|
34
|
+
if skip_empty_rows(r) { continue; }
|
35
|
+
if skip_rows_with_no_request_id(&header_map, r) { continue; }
|
36
|
+
|
37
|
+
let date = header_map.get("Date").ok_or(missing_header(ruby, "Date"))?;
|
38
|
+
let start = header_map.get("Start").ok_or(missing_header(ruby, "Start"))?;
|
39
|
+
let end = header_map.get("End").ok_or(missing_header(ruby, "End"))?;
|
40
|
+
let actual_start = header_map.get("Actual Start").ok_or(missing_header(ruby, "Actual Start"))?;
|
41
|
+
let actual_end = header_map.get("Actual End").ok_or(missing_header(ruby, "Actual End"))?;
|
42
|
+
|
43
|
+
for (i, c) in r.iter().enumerate() {
|
38
44
|
match *c {
|
39
45
|
Data::Empty => Ok(()),
|
40
46
|
Data::String(ref s) | Data::DateTimeIso(ref s) | Data::DurationIso(ref s) => {
|
@@ -63,6 +69,22 @@ fn write_csv<W: Write>(ruby: &Ruby, dest: &mut W, range: &Range<Data>, header_ma
|
|
63
69
|
Ok(())
|
64
70
|
}
|
65
71
|
|
72
|
+
fn skip_empty_rows(r: &[Data]) -> bool {
|
73
|
+
if r.iter().all(|c| c == &Data::Empty) {
|
74
|
+
return true;
|
75
|
+
}
|
76
|
+
false
|
77
|
+
}
|
78
|
+
|
79
|
+
fn skip_rows_with_no_request_id(header_map: &HashMap<String, usize>, r: &[Data]) -> bool {
|
80
|
+
if let Some(request_id) = header_map.get("Request Id") {
|
81
|
+
if r[*request_id] == Data::Empty {
|
82
|
+
return true;
|
83
|
+
}
|
84
|
+
}
|
85
|
+
false
|
86
|
+
}
|
87
|
+
|
66
88
|
fn missing_header(ruby: &Ruby, header: &str) -> magnus::Error {
|
67
89
|
magnus::Error::new(ruby.exception_standard_error(), format!("Missing '{}' header in xls", header))
|
68
90
|
}
|
@@ -83,4 +105,5 @@ fn clean_strings(s: &str) -> String {
|
|
83
105
|
s.replace("\n", " ")
|
84
106
|
.replace("\r", " ")
|
85
107
|
.replace("\"", "")
|
108
|
+
.replace("'", "")
|
86
109
|
}
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/lib/csv_utils/version.rb
CHANGED
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.
|
4
|
+
version: 0.1.4
|
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-
|
11
|
+
date: 2024-08-01 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: Deduplication of CSV files and XLS to CSV conversion.
|
14
14
|
email:
|