app/models/concerns/bulkrax/file_factory.rb in bulkrax-3.0.0.beta3 vs app/models/concerns/bulkrax/file_factory.rb in bulkrax-3.0.0.beta4
- old
+ new
@@ -43,10 +43,12 @@
@parsed_remote_files.delete(nil)
@parsed_remote_files
end
def new_remote_files
+ return if object.is_a? FileSet
+
@new_remote_files ||= if object.present? && object.file_sets.present?
parsed_remote_files.select do |file|
# is the url valid?
is_valid = file[:url]&.match(URI::ABS_URI)
# does the file already exist
@@ -99,10 +101,15 @@
::CreateDerivativesJob.set(wait: 1.minute).perform_later(fileset, fileset.files.first.id)
end
end
def local_file_sets
- @local_file_sets ||= object&.ordered_file_sets
+ @local_file_sets ||= ordered_file_sets
+ end
+
+ def ordered_file_sets
+ # OVERRIDE Hyrda-works 1.2.0 - this method was deprecated in v1.0
+ object&.ordered_members.to_a.select(&:file_set?)
end
def import_files
paths = file_paths.map { |path| import_file(path) }.compact
set_removed_filesets if local_file_sets.present?