sushi_fabric 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625777da16fc54a819726f5b5f82dcf309865c05c11f902a0065dd1d385d7307
-  data.tar.gz: 628bec7e0c32fa99832d35bd2016eaee2bcec4984f71089b23d4b9ebbe7b0c37
+  metadata.gz: 601c5bc07a9e6c62dc71d101a2c459719e2eaef937c9b59c176bb8f3225b4f43
+  data.tar.gz: f4d98401899172185098c8f8d78f782acb032d5e1849ca7142d713e36ae250b6
 SHA512:
-  metadata.gz: 928ddc2796c22bd809bbadc1b91c2a9aa4b15754b60a64a66d26c387b916386d5df39de3e5f8e42424e101256fe7ce55872521644ba96258b9381ea75cb3e59d
-  data.tar.gz: 2d669efcfc9afce6ffad2f07b18496744d0a4b7b52588c519fe791fb8ee2eb23a4c5c8e48855c037359fd6081ffae54c58e483835ddc0a384ffd1b0c9ce2383a
+  metadata.gz: eb1dc2673c8441ffd5a8d360337903d18126c2ddaefc1265b679b22c9ddd23bed8ba724cf192f4b3445191ea6c34b5ed67d31105dbba255d26a15b61044776f9
+  data.tar.gz: dcf130309a2d75527972c1c3a78d265f1a9b161654f2798940074cc0b6c193b261bcd950d40c709888746ea24d310008bda24a37166ae9ad2c90b8755b6f57a2

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20240823-112404'
+# Version = '20241108-111516'
 
 require 'csv'
 require 'fileutils'
@@ -178,21 +178,17 @@ def save_data_set(data_set_arr, headers, rows, user=nil)
       end
       sample = Sample.new
       sample.key_value = sample_hash.to_s
-      sample.save unless sample.saved?
+      sample.save # skip exact-match search
       data_set.samples << sample
     end
 
     data_set.md5 = data_set.md5hexdigest
-    unless data_set.saved?
-      project.data_sets << data_set
-      parent_data_set.data_sets << data_set if parent_data_set
-      data_set.save
-      if user
-        user.data_sets << data_set
-        user.save
-      end
-    else
-      headers[0] = DataSet.find_by_md5(data_set.md5)
+    project.data_sets << data_set
+    parent_data_set.data_sets << data_set if parent_data_set
+    data_set.save
+    if user
+      user.data_sets << data_set
+      user.save
     end
     data_set.id
   end
@@ -794,7 +790,7 @@ rm -rf #{@scratch_dir} || exit 1
         end
         sample = Sample.new
         sample.key_value = sample_hash.to_s
-        sample.save unless sample.saved?
+        sample.save # skip exact-match search
         data_set.samples << sample
       end
 
@@ -803,16 +799,12 @@ rm -rf #{@scratch_dir} || exit 1
       end
 
       data_set.md5 = data_set.md5hexdigest
-      unless data_set.saved?
-        project.data_sets << data_set
-        parent_data_set.data_sets << data_set if parent_data_set
-        data_set.save
-        if user
-          user.data_sets << data_set
-          user.save
-        end
-      else
-        headers[0] = DataSet.find_by_md5(data_set.md5)
+      project.data_sets << data_set
+      parent_data_set.data_sets << data_set if parent_data_set
+      data_set.save
+      if user
+        user.data_sets << data_set
+        user.save
       end
       data_set.id
     end

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler