Skip to content

Commit d3af44f

Browse files
committed
pulled over
1 parent c18703d commit d3af44f

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

app/actors/hyrax/actors/file_actor_decorator.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module Actors
33
# Actions for a file identified by file_set and relation (maps to use predicate)
44
# @note Spawns asynchronous jobs
55
module FileActorDecorator
6-
76
def perform_ingest_file_through_active_fedora(io)
87
# Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
98
# these are files too big to send to S3 w/o Streaming
@@ -20,16 +19,15 @@ def perform_ingest_file_through_active_fedora(io)
2019
Rails.logger.error("[FileActor] writing to fcrepo #{file_set.id}")
2120
# Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
2221
Hydra::Works::AddFileToFileSet.call(file_set,
23-
io,
24-
relation,
25-
versioning: false)
22+
io,
23+
relation,
24+
versioning: false)
2625
end
2726
return false unless file_set.save
2827
repository_file = related_file
2928
create_version(repository_file, user)
3029
CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
3130
end
32-
3331
end
3432
end
3533
end

app/controllers/hyrax/downloads_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ def send_file_contents
4949
end
5050
if s3_object.exists?
5151
redirect_to s3_object.presigned_url(
52-
:get,
53-
expires_in: 3600,
52+
:get,
53+
expires_in: 3600,
5454
response_content_disposition: "attachment\; filename=#{file.original_name}"
5555
)
5656
return
5757
end
5858
end
59-
# from here on this is effectively `super` if this was a decorator
59+
# from here on this is effectively `super` if this was a decorator
6060
# will fall back to streaming object via fedora
6161
self.status = 200
6262
prepare_file_headers

app/models/file_set.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ class FileSet < ActiveFedora::Base
55
include Ubiquity::UniversalMetadata
66

77
property :s3_only,
8-
predicate: ::RDF::URI("https://hykucommons.org/terms/s3_only"),
9-
multiple: false do |index|
10-
index.as :stored_searchable, :facetable
11-
end
8+
predicate: ::RDF::URI("https://hykucommons.org/terms/s3_only"),
9+
multiple: false do |index|
10+
index.as :stored_searchable, :facetable
11+
end
1212

1313
include ::Hyrax::FileSetBehavior
1414
end

0 commit comments

Comments
 (0)