diff --git a/app/services/collection_resources_service.rb b/app/services/collection_resources_service.rb index 50e1fc59a..f347a4ebf 100644 --- a/app/services/collection_resources_service.rb +++ b/app/services/collection_resources_service.rb @@ -8,7 +8,7 @@ class CollectionResourcesService end def get_file(file) - @storage_service.get_file_io(file) + @storage_service.get_file(file) rescue StandardError nil end diff --git a/app/services/storage/local_disk_service.rb b/app/services/storage/local_disk_service.rb index cd99d3d48..56c6b2b79 100644 --- a/app/services/storage/local_disk_service.rb +++ b/app/services/storage/local_disk_service.rb @@ -7,7 +7,7 @@ module Storage Dir.entries(path) end - def get_file_io(filename) + def get_file(filename) path = Rails.root.join("tmp/storage", filename) File.open(path, "r") diff --git a/app/services/storage/s3_service.rb b/app/services/storage/s3_service.rb index de2f6ef65..3329b2ea1 100644 --- a/app/services/storage/s3_service.rb +++ b/app/services/storage/s3_service.rb @@ -31,6 +31,11 @@ module Storage .body end + def get_file(file_name) + @client.get_object(bucket: @configuration.bucket_name, key: file_name) + .body.read + end + def write_file(file_name, data) @client.put_object( body: data,