cdm_migrator 3.4.2 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b875ba84c55ed42472bfb7bc10a476e49adf23733aa0a8053dc577e66c57203
-  data.tar.gz: 543cedc0d2926d5f4aa27021cd92fb6de38e8e5fb0f09ace7b76a3d27633be36
+  metadata.gz: 9bd9baa9f5c277e22421a1726d4652d2231a4067aabcf2e4f048ac9aa7264fc2
+  data.tar.gz: f698973f8726c227326fd7e0c393af4201c7dd9352f43d669cff9659f310da85
 SHA512:
-  metadata.gz: d7880e669d69504d69850d5e7d3453a0cc62bcb763bf1f7237c8d3328b07f8c7742f77781a9a5417e2f04172e7a9a398846f5cff5a9b503f19bf6791cefdb062
-  data.tar.gz: a0cea1c0b7cb2f3f9e8b53adc820fb5a3043e56a3c3ba68aee888798a543e3438a718a4ea08bbfef7a4230d3e37b7858c7a9075cbb903e9a5307b78855ae53f4
+  metadata.gz: 6c264c4d7a122f598aef1d746766771b408defb9a15e014490f7a2acd43772197c5e66d15a99120c13089f013fe702f9dc5aeaebbb9cbc9f70b2110b54cac55d
+  data.tar.gz: 85241bcb0111ead83629678cfde68fb729d49997890dbc0432857e6f7976f74f3f4296b0e6aecac309b71a84b398ea02fa24f1d346d652912a60eded09c39c0c

data/app/jobs/cdm_migrator/batch_create_files_with_ordered_members_job.rb

@@ -14,32 +14,59 @@ module CdmMigrator
     #     advantage of the same strategy as Hyrax::Actors::FileSetOrderedMembersActor
     #     but you don't need the OrderedMembersActor constant initialized.
 
-    # This rescue is a safeguard against creating lots of orphan file sets if there
-    # are recurring errors (see https://tinyurl.com/nh4c5e9j). Instead, CdmMigrator
-    # will fall back to creating file sets one-by-one if this job fails once.
-    rescue_from(StandardError) do |exception|
-      Rails.logger.error "BatchCreateFilesWithOrderedMembersJob error: #{exception.to_s}"
-      RestartUploadFromMiddleJob.perform_later(arguments[0], arguments[1], arguments[2])
+    def perform work, ingest_work, user
+      # Reload the work to get the most recent and accurate member associations
+      work.reload
+      if work.ordered_members.to_a.empty? && work.file_sets.empty?
+        attach_files(work, ingest_work.files, user)
+      else
+        delete_excess_file_sets(work)
+        ordered_count = work.reload.ordered_members.to_a.count
+        unless ordered_count == ingest_work.files.count
+          # Attach any files that might be missing
+          files = ingest_work[ordered_count..]
+          attach_files(work, files, user)
+        end
+      end
+      first_file_set = work.ordered_members.to_a.first
+      work.representative = first_file_set
+      work.thumbnail = first_file_set
+      work.save!
+      work.file_sets.each { |fs| CdmIngestFilesJob.perform_later(fs, fs.import_url, user, ingest_work) }
     end
 
-    def perform work, ingest_work, user
-        ordered_members = []
-        ingest_work.files.each do |file|
-          url = file[:url]
-          last_file = ingest_work.files.last==file
-          ::FileSet.new(import_url: url, label: file[:title]) do |fs|
-            fs.attributes = file[:metadata]
-            fs.save!
-            ordered_members << fs
-          end
+    private
+
+    def attach_files(work, ingest_work_files, user)
+      ingest_work_files.each do |file|
+        url = file[:url]
+        ordered_members = work.ordered_members
+        # last_file = ingest_work.files.last==file
+        ::FileSet.new(import_url: url, label: file[:title]) do |fs|
+          fs.attributes = file[:metadata]
+          fs.save!
+          ordered_members << fs
         end
-        actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
-        actor.attach_ordered_members_to_work(work)
-        work.representative = work.ordered_members.to_a.first
-        work.thumbnail_id = work.ordered_member_ids.first
+      end
+      work.save!
+      work.reload.ordered_members.to_a.each do |file_set|
+        Hyrax.config.callback.run(:after_create_fileset, file_set, user, warn: false)
+      end
+    end
+
+    # Sometimes when this job fails, file sets are attached to the work
+    # without attaching them as ordered members. This creates "ghost files"
+    # that don't show up in the interface but are still linked to the work as members
+    def delete_excess_file_sets(work)
+      ordered_members = work.ordered_members.to_a
+      ghost_members = work.file_sets.select { |fs| ordered_members.exclude? fs }
+      if ghost_members.any?
+        # Unlink the file sets from the parent work first because it makes deleting them faster
+        work.members = ordered_members
         work.save!
-        work.file_sets.each { |fs| CdmIngestFilesJob.perform_later(fs, fs.import_url, user, ingest_work) }
+        ghost_members.each(&:destroy!)
+      end
     end
-    
+
   end
 end

data/lib/cdm_migrator/version.rb

@@ -1,3 +1,3 @@
 module CdmMigrator
-  VERSION = '3.4.2'
+  VERSION = '3.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdm_migrator
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.2
 platform: ruby
 authors:
 - sephirothkod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails