Skip to content

Internal improvements 6 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
blocknotes wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Internal improvements 6 #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions app/controllers/active_storage_db/files_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ class FilesController < ActiveStorage::BaseController

def show
if (key = decode_verified_key)
serve_file(key[:key], content_type: key[:content_type], disposition: key[:disposition])
attrs = key.slice(:content_type, :disposition, :service_name)
serve_file(key[:key], **attrs)
else
head(:not_found)
end
Expand All @@ -32,8 +33,12 @@ def acceptable_content?(token)
token[:content_length] == request.content_length
end

def db_service
ActiveStorage::Blob.service
def db_service_for(service_name)
if service_name && ActiveStorage::Blob.respond_to?(:services)
ActiveStorage::Blob.services.fetch(service_name) { ActiveStorage::Blob.service }
else
ActiveStorage::Blob.service
end
end

def decode_verified_key
Expand All @@ -46,18 +51,19 @@ def decode_verified_token
token&.deep_symbolize_keys
end

def serve_file(key, content_type:, disposition:)
def serve_file(key, content_type:, disposition:, service_name: nil)
options = {
type: content_type || DEFAULT_SEND_FILE_TYPE,
disposition: disposition || DEFAULT_SEND_FILE_DISPOSITION
}
send_data(db_service.download(key), options)
send_data(db_service_for(service_name).download(key), options)
end

def upload_file(token) # rubocop:disable Naming/PredicateMethod
return false unless acceptable_content?(token)

db_service.upload(token[:key], request.body, checksum: token[:checksum])
service = db_service_for(token[:service_name])
service.upload(token[:key], request.body, checksum: token[:checksum])
true
end
end
Expand Down
Loading