Merge pull request #707 from IU-Libraries-Joint-Development/essi-2156_prederivation_for_multisegment_filename_r4

[ESSI-2156] fix FileSet#find_or_retrieve for s3 case

Author: aploshay

app/models/file_set.rb

@@ -49,7 +49,7 @@ def find_or_retrieve(file_id: original_file&.id, filepath: nil, restore_filename
     if restore_filename && (File.basename(filepath) != self.label)
       if self.label.present?
         original_filepath = filepath.dup
-        filepath = original_filepath.sub(File.basename(original_filepath), self.label)
+        filepath = Pathname.new(original_filepath).dirname.join(self.label).to_s
         FileUtils.mv(original_filepath, filepath)
       else
         Rails.logger.warn "FileSet #{self.id} missing label"