From 57f97960f5d6a8239b236f438ee635a86e1dbf19 Mon Sep 17 00:00:00 2001 From: Mason Ballengee Date: Fri, 5 Apr 2024 13:18:28 -0400 Subject: [PATCH] Improve guard clause in attach_datastreams method --- lib/avalon/batch/entry.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/avalon/batch/entry.rb b/lib/avalon/batch/entry.rb index b91f54ade5..53b023c808 100644 --- a/lib/avalon/batch/entry.rb +++ b/lib/avalon/batch/entry.rb @@ -183,16 +183,14 @@ def self.attach_datastreams_to_master_file( master_file, filename, captions ) master_file.structuralMetadata.original_name = structural_file end captions.each do |c| - return unless c.present? - if c[:caption_file].present? && FileLocator.new(c[:caption_file]).exist? - filename = c[:caption_file].split('/').last - label = c[:caption_label].presence || filename - language = c[:caption_language].present? ? caption_language(c[:caption_language]) : Settings.caption_default.language - supplemental_file = SupplementalFile.new(label: label, tags: ['caption'], language: language) - supplemental_file.file.attach(io: FileLocator.new(c[:caption_file]).reader, filename: filename) - supplemental_file.save - master_file.supplemental_files += [supplemental_file] - end + next unless c.present? && c[:caption_file].present? && FileLocator.new(c[:caption_file]).exist? + filename = c[:caption_file].split('/').last + label = c[:caption_label].presence || filename + language = c[:caption_language].present? ? caption_language(c[:caption_language]) : Settings.caption_default.language + supplemental_file = SupplementalFile.new(label: label, tags: ['caption'], language: language) + supplemental_file.file.attach(io: FileLocator.new(c[:caption_file]).reader, filename: filename) + supplemental_file.save + master_file.supplemental_files += [supplemental_file] end end