refactor code based on feedback
This commit is contained in:
parent
27442862cf
commit
f1277fbf0b
|
|
@ -191,7 +191,7 @@ class ProjectsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def download_export
|
||||
if @project.export_project_exists?
|
||||
if @project.export_file_exists?
|
||||
send_upload(@project.export_file)
|
||||
else
|
||||
redirect_to(
|
||||
|
|
|
|||
|
|
@ -1738,7 +1738,7 @@ class Project < ActiveRecord::Base
|
|||
:started
|
||||
elsif after_export_in_progress?
|
||||
:after_export_action
|
||||
elsif export_project_exists?
|
||||
elsif export_file_exists?
|
||||
:finished
|
||||
else
|
||||
:none
|
||||
|
|
@ -1754,13 +1754,13 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def remove_exports
|
||||
return unless export_project_exists?
|
||||
return unless export_file_exists?
|
||||
|
||||
import_export_upload.remove_export_file!
|
||||
import_export_upload.save
|
||||
end
|
||||
|
||||
def export_project_exists?
|
||||
def export_file_exists?
|
||||
export_file&.file
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ module API
|
|||
detail 'This feature was introduced in GitLab 10.6.'
|
||||
end
|
||||
get ':id/export/download' do
|
||||
if user_project.export_project_exists?
|
||||
present_carrierwave_file!(user_ project.export_file)
|
||||
if user_project.export_file_exists?
|
||||
present_carrierwave_file!(user_project.export_file)
|
||||
else
|
||||
render_api_error!('404 Not found or has expired', 404)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def self.lock_file_path(project)
|
||||
return unless project.export_path || object_storage?
|
||||
return unless project.export_path || export_file_exists?
|
||||
|
||||
lock_path = project.import_export_shared.archive_path
|
||||
|
||||
|
|
@ -83,8 +83,8 @@ module Gitlab
|
|||
errors.full_messages.each { |msg| project.import_export_shared.add_error_message(msg) }
|
||||
end
|
||||
|
||||
def object_storage?
|
||||
project.export_project_exists?
|
||||
def export_file_exists?
|
||||
project.export_file_exists?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def export_file
|
||||
project.export_file.open
|
||||
project.export_file.open
|
||||
end
|
||||
|
||||
def send_file_options
|
||||
|
|
@ -59,7 +59,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def export_size
|
||||
project.export_file.file.size
|
||||
project.export_file.file.size
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ namespace :gitlab do
|
|||
end
|
||||
|
||||
Projects::ImportExport::ExportService.new(project, admin).execute
|
||||
download_or_copy_upload( project.export_file, template.archive_path)
|
||||
download_or_copy_upload(project.export_file, template.archive_path)
|
||||
Projects::DestroyService.new(admin, project).execute
|
||||
puts "Exported #{template.name}".green
|
||||
end
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do
|
|||
end
|
||||
|
||||
it 'returns if project exported file is not found' do
|
||||
allow(project).to receive(:export_project_exists?).and_return(false)
|
||||
allow(project).to receive(:export_file_exists?).and_return(false)
|
||||
|
||||
expect(service).not_to receive(:strategy_execute)
|
||||
|
||||
|
|
|
|||
|
|
@ -2859,7 +2859,7 @@ describe Project do
|
|||
it 'removes the export' do
|
||||
project.remove_exports
|
||||
|
||||
expect(project.export_project_exists?).to be_falsey
|
||||
expect(project.export_file_exists?).to be_falsey
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ describe API::ProjectExport do
|
|||
end
|
||||
|
||||
it 'has removed the export' do
|
||||
expect(project_after_export.export_project_exists?).to be_falsey
|
||||
expect(project_after_export.export_file_exists?).to be_falsey
|
||||
end
|
||||
|
||||
it_behaves_like '404 response' do
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ module ExportFileHelper
|
|||
# Expands the compressed file for an exported project into +tmpdir+
|
||||
def in_directory_with_expanded_export(project)
|
||||
Dir.mktmpdir do |tmpdir|
|
||||
export_file = project.export_file.path
|
||||
export_file = project.export_file.path
|
||||
_output, exit_status = Gitlab::Popen.popen(%W{tar -zxf #{export_file} -C #{tmpdir}})
|
||||
|
||||
yield(exit_status, tmpdir)
|
||||
|
|
|
|||
Loading…
Reference in New Issue