Commit c3b3bd53 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Refactor FileTransfer initializer

Extract local and remote attributes to its own method
parent 6f468830
......@@ -10,21 +10,9 @@ module Gitlab
class FileTransfer < BaseTransfer
def initialize(file_type, upload)
if upload.local?
super(
file_type: file_type,
file_id: upload.id,
filename: upload.absolute_path,
uploader: upload.build_uploader,
expected_checksum: upload.checksum,
request_data: build_request_data(file_type, upload)
)
super(local_file_attributes(file_type, upload))
else
super(
file_type: file_type,
file_id: upload.id,
uploader: upload.build_uploader,
request_data: build_request_data(file_type, upload)
)
super(remote_file_attributes(file_type, upload))
end
rescue ObjectStorage::RemoteStoreError
......@@ -33,6 +21,26 @@ module Gitlab
private
def local_file_attributes(file_type, upload)
{
file_type: file_type,
file_id: upload.id,
filename: upload.absolute_path,
uploader: upload.build_uploader,
expected_checksum: upload.checksum,
request_data: build_request_data(file_type, upload)
}
end
def remote_file_attributes(file_type, upload)
{
file_type: file_type,
file_id: upload.id,
uploader: upload.build_uploader,
request_data: build_request_data(file_type, upload)
}
end
def build_request_data(file_type, upload)
{
id: upload.model_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment