zizia 4.4.1.alpha.01 → 4.5.1.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9629a59be90ca2d1b2d56ea38c6a1de8bad912bd7c4843e21a8625fceb1ef581
-  data.tar.gz: 35aa1ba6679804b0ceaab32696ce3a2a4ff47076ccced0a585493e18933d09fd
+  metadata.gz: be8096fc629accb26c9372a1d504a26e27ea0f8bd45b91ef19d35c45b747e566
+  data.tar.gz: b16397d6834829c155ba18f3f66850bb4f67a382579f7f7e34d2c1890a755e2d
 SHA512:
-  metadata.gz: 723108c90866bf5d8d1db2380731f4448dc46c94eb670b708549f2fe5bc9c0a8032bc63f1e1ca9f0c16bf6283cd3eda970331986ab18cef7157d5f64b221205d
-  data.tar.gz: ef217c2d1820075ecaf8514c9d78b90ae4a76e0cf3f68426278a6f9b84383e7f39d938bd3d300f522d363c7ec1ad0aa02d917a1fa5818c218bb66601c96cc8d5
+  metadata.gz: 8ddd55ffcb647acc0c356decbcf1de863c8110e40e54454a2d7a34325c8700a92d0cca75ea638589fdff43352895939d9a71385e9fe49de8c2b0ad8d275b81aa
+  data.tar.gz: 9b6124b66ffe83170c5413748245981510369f4ac7b75eab95a3e7612068a434d0b2273c589be63e3ee4c1f87e3993e8a368f707ca143e0b8c04b7e023fafd92

data/app/importers/modular_importer.rb

@@ -25,7 +25,7 @@ class ModularImporter
     csv_import_detail.batch_id = @csv_import.id
     csv_import_detail.deduplication_field = DEDUPLICATION_FIELD
     csv_import_detail.update_actor_stack = @csv_import.update_actor_stack
-    csv_import_detail.save!
+    csv_import_detail.save
 
     attrs = {
       csv_import_detail: csv_import_detail
@@ -34,18 +34,21 @@ class ModularImporter
     Rails.logger.info "[zizia] event: start_import, batch_id: #{@csv_import.id}, collection_id: #{@collection_id}, user: #{@user_email}"
     importer = Zizia::Importer.new(parser: Zizia::CsvParser.new(file: file), record_importer: Zizia::HyraxRecordImporter.new(attributes: attrs))
 
-    importer.records.each do |record|
+    importer.records.each_with_index do |record, index|
       pre_ingest_work = Zizia::PreIngestWork.new(csv_import_detail_id: csv_import_detail.id)
-      @row += 1
-
-      pre_ingest_file = Zizia::PreIngestFile.new(row_number: @row,
-                                                 pre_ingest_work: pre_ingest_work,
-                                                 filename: record.mapper.files.first,
-                                                 size: File.join(ENV['IMPORT_PATH'], record.mapper.files.first).size)
-      pre_ingest_work.save!
-      pre_ingest_file.save!
+
+      record.mapper.files.each do |child_file|
+        full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first
+        pre_ingest_file = Zizia::PreIngestFile.new(row_number: index + 1,
+                                                   pre_ingest_work: pre_ingest_work,
+                                                   filename: child_file,
+                                                   size: File.size(full_path))
+        pre_ingest_file.save
+      end
+      pre_ingest_work.save
     end
-    csv_import_detail.save!
+
+    csv_import_detail.save
     importer.import
     file.close
   end

data/app/views/zizia/csv_import_details/index.html.erb

@@ -4,7 +4,8 @@
     <th>ID</th>
     <th>Associated User</th>
     <th>CSV File</th>
-    <th>Total Size in Bytes</th>
+    <th>Number of Works</th>
+    <th>Total Size</th>
   </tr>
   <% @csv_import_details.each do |csv_import_detail| %>
     <tr>
@@ -18,7 +19,10 @@
         <%= csv_import_detail.csv_import.manifest %>
       </td>
       <td>
-        <%= csv_import_detail.total_size %>
+        <%= csv_import_detail.pre_ingest_works.count  %>
+      </td>
+      <td>
+        <%= number_to_human_size(csv_import_detail.total_size) %>
       </td>
     </tr>
   <% end %>

data/app/views/zizia/csv_import_details/show.html.erb

@@ -4,7 +4,7 @@
     <li>Import created by: <%= User.find(@csv_import_detail.csv_import.user_id) %>
     </li>
     <li>CSV File: <%= @csv_import_detail.csv_import.manifest %></li>
-    <li>Total Size in Bytes: <%= @csv_import_detail.total_size %></li>
+    <li>Total Size: <%= number_to_human_size(@csv_import_detail.total_size) %></li>
   </ul>
 
   <h3>Files</h3>
@@ -21,10 +21,9 @@
           <%= pre_ingest_file.filename %>
         </td>
         <td>
-          <%= pre_ingest_file.size %>
+          <%= number_to_human_size(pre_ingest_file.size) %>
         </td>
         <td>
-          Row number:
           <%= pre_ingest_file.row_number %>
         </td>
       </tr>

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '4.4.1.alpha.01'
+  VERSION = '4.5.1.alpha.01'
 end

data/spec/dummy/spec/system/csv_import_details_page_spec.rb

@@ -13,6 +13,6 @@ RSpec.describe 'viewing the csv import detail page' do
     visit ('/csv_import_details/index')
     expect(page).to have_content('CSV Imports ID')
     click_on '1'
-    expect(page).to have_content('Total Size in Bytes')
+    expect(page).to have_content('Total Size')
   end
 end

data/spec/dummy/spec/system/import_from_csv_spec.rb

@@ -241,9 +241,10 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
 
       # Viewing additional details after an import
       visit "/csv_import_details/index"
-      expect(page).to have_content('Total Size in Bytes')
+      expect(page).to have_content('Total Size')
       find(:xpath, '//*[@id="content-wrapper"]/table/tbody/tr[2]/td[1]/a').click
       expect(page).to have_content('dog.jpg')
+      expect(page).to have_content('5.74 MB')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 4.4.1.alpha.01
+  version: 4.5.1.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts