patchwork_csv_utils 0.1.4-x86_64-linux → 0.1.5-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d62eb73016a46a3ec9caac2d43fd5db562a0856831c7f0e544e9c570e8d550
-  data.tar.gz: 1262e0f45c2b8cfe896be3d4bd6f1074db61aa2b252049f5090cec5feba05c1a
+  metadata.gz: 7db641e3c590f814c0a9b89a555da4b4b333cfccdcc11759a9cd1a7faa9f6638
+  data.tar.gz: 2ba2941e6384563b6a44fafb715940ead548aadbc319466ed316911f7ca18148
 SHA512:
-  metadata.gz: 4fca3c59b6ff0b5cfd1dcc2ad0ae6efdf8005716980c0a1d111bff0190a4fae3c9bc6b560086416c794be89e3eab46ae6ffc34bdfc408a806c4ac07fe1660608
-  data.tar.gz: 28454948d621cd2272b9a6790d735ce7e2d95da51202accb76a3d56f1a5b2b6bc9a274bf7473073bbc99fac25a64de818ed0a1b9839b94dc0893241ff0290c24
+  metadata.gz: 2856df18a42dc6019c3a6b6d02aa9d88ccd6384ac46a157bc762c4848dd601bd1a31dd072831bd8dafe301ab8514c930bbff159f7f22a47aeb8ff0aafbd932ee
+  data.tar.gz: 926f5673c06e7419f63ff66094e2c35d7aae36df5b8eb09f3604ea4ee77add83b36bf8087f36ffe495e00b728a5052277738f11da3037260484aeb2232086be7

data/Gemfile.lock

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

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

@@ -33,12 +33,20 @@ pub fn dedup(ruby: &Ruby, previous_csv_path: String, new_csv_path: String, targe
     let mut previous_records = vec![];
     for previous_record in previous_csv.records() {
         let previous_record = previous_record.map_err(|e| magnus_err(ruby, e, "previous_record"))?;
+
+        if has_empty_row_skip(&previous_record) { continue; }
+        if has_empty_first_col_skip_row(&previous_record) { continue; }
+
         let previous_record = previous_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
         previous_records.push(previous_record)
     }
 
     for new_record in new_csv.records() {
         let new_record = new_record.map_err(|e| magnus_err(ruby, e, "new_record"))?;
+
+        if has_empty_row_skip(&new_record) { continue; }
+        if has_empty_first_col_skip_row(&new_record) { continue; }
+
         let new_record = new_record.into_iter().map(|r| r.trim_end()).collect::<StringRecord>();
         if !previous_records.contains(&new_record) {
             wtr.write_byte_record(new_record.as_byte_record()).unwrap();
@@ -50,4 +58,18 @@ pub fn dedup(ruby: &Ruby, previous_csv_path: String, new_csv_path: String, targe
     Ok(())
 }
 
+fn has_empty_first_col_skip_row(previous_record: &StringRecord) -> bool {
+    if previous_record[0].is_empty() {
+        return true;
+    }
+    false
+}
+
+fn has_empty_row_skip(record: &StringRecord) -> bool {
+    if record.iter().all(|r| r.is_empty()) {
+        return true;
+    }
+    false
+}
+
 

data/lib/csv_utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchwork_csv_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: x86_64-linux
 authors:
 - kingsley.hendrickse