2387ef2b4a
File uploads on objects storage should use hashed storage Closes #4952 See merge request gitlab-org/gitlab-ee!4597
46 lines
931 B
Ruby
46 lines
931 B
Ruby
class PersonalFileUploader < FileUploader
|
|
# Re-Override
|
|
def self.root
|
|
options.storage_path
|
|
end
|
|
|
|
def self.base_dir(model, _store = nil)
|
|
File.join(options.base_dir, model_path_segment(model))
|
|
end
|
|
|
|
def self.model_path_segment(model)
|
|
return 'temp/' unless model
|
|
|
|
File.join(model.class.to_s.underscore, model.id.to_s)
|
|
end
|
|
|
|
def object_store
|
|
return Store::LOCAL unless model
|
|
|
|
super
|
|
end
|
|
|
|
# model_path_segment does not require a model to be passed, so we can always
|
|
# generate a path, even when there's no model.
|
|
def model_valid?
|
|
true
|
|
end
|
|
|
|
# Revert-Override
|
|
def store_dir
|
|
store_dirs[object_store]
|
|
end
|
|
|
|
def store_dirs
|
|
{
|
|
Store::LOCAL => File.join(base_dir, dynamic_segment),
|
|
Store::REMOTE => File.join(self.class.model_path_segment(model), dynamic_segment)
|
|
}
|
|
end
|
|
|
|
private
|
|
|
|
def secure_url
|
|
File.join('/', base_dir, secret, file.filename)
|
|
end
|
|
end
|