diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/files.rb | 60 | ||||
-rw-r--r-- | lib/api/repositories.rb | 45 |
2 files changed, 74 insertions, 31 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb index 9c4e43d77cc..5983845d007 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -14,6 +14,19 @@ module API } end + def assign_file_vars! + @commit = user_project.commit(params[:ref]) + not_found!('Commit') unless @commit + + @repo = user_project.repository + @file_path = params[:file_path] + @file_path = [params[:file_path], params[:format]].join('.') if params[:format].present? + @blob = @repo.blob_at(@commit.sha, @file_path) + + not_found!('File') unless @blob + @blob.load_all_data!(@repo) + end + def commit_response(attrs) { file_path: attrs[:file_path], @@ -22,7 +35,7 @@ module API end params :simple_file_params do - requires :file_path, type: String, desc: 'The path to new file. Ex. lib/class.rb' + requires :file_path, type: String, desc: 'The path to the file. Ex. lib/class.rb' requires :branch, type: String, desc: 'The name of branch' requires :commit_message, type: String, desc: 'Commit Message' optional :author_email, type: String, desc: 'The email of the author' @@ -40,34 +53,41 @@ module API requires :id, type: String, desc: 'The project ID' end resource :projects do - desc 'Get a file from repository' + desc 'Get a file from repository in raw format' params do - requires :file_path, type: String, desc: 'The path to the file. Ex. lib/class.rb' requires :ref, type: String, desc: 'The name of branch, tag, or commit' end - get ":id/repository/files" do + get ":id/repository/files/:file_path/raw" do authorize! :download_code, user_project - commit = user_project.commit(params[:ref]) - not_found!('Commit') unless commit + assign_file_vars! + + status(200) + + send_git_blob @repo, @blob + end + + desc 'Get a file from repository in base64 format' + params do + requires :ref, type: String, desc: 'The name of branch, tag, or commit' + end + get ":id/repository/files/:file_path" do + authorize! :download_code, user_project - repo = user_project.repository - blob = repo.blob_at(commit.sha, params[:file_path]) - not_found!('File') unless blob + assign_file_vars! - blob.load_all_data!(repo) status(200) { - file_name: blob.name, - file_path: blob.path, - size: blob.size, + file_name: @blob.name, + file_path: @blob.path, + size: @blob.size, encoding: "base64", - content: Base64.strict_encode64(blob.data), + content: Base64.strict_encode64(@blob.data), ref: params[:ref], - blob_id: blob.id, - commit_id: commit.id, - last_commit_id: repo.last_commit_id_for_path(commit.sha, params[:file_path]) + blob_id: @blob.id, + commit_id: @commit.id, + last_commit_id: @repo.last_commit_id_for_path(@commit.sha, @file_path) } end @@ -75,7 +95,7 @@ module API params do use :extended_file_params end - post ":id/repository/files" do + post ":id/repository/files/:file_path", requirements: { file_path: /.+/ } do authorize! :push_code, user_project file_params = declared_params(include_missing: false) @@ -93,7 +113,7 @@ module API params do use :extended_file_params end - put ":id/repository/files" do + put ":id/repository/files/:file_path", requirements: { file_path: /.+/ } do authorize! :push_code, user_project file_params = declared_params(include_missing: false) @@ -112,7 +132,7 @@ module API params do use :simple_file_params end - delete ":id/repository/files" do + delete ":id/repository/files/:file_path", requirements: { file_path: /.+/ } do authorize! :push_code, user_project file_params = declared_params(include_missing: false) diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index 36166780149..3932512d8da 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -17,6 +17,18 @@ module API end not_found! end + + def assign_blob_vars! + @repo = user_project.repository + + begin + @blob = Gitlab::Git::Blob.raw(@repo, params[:sha]) + rescue + not_found! 'Blob' + end + + not_found! 'Blob' unless @blob + end end desc 'Get a project repository tree' do @@ -45,7 +57,7 @@ module API requires :sha, type: String, desc: 'The commit, branch name, or tag name' requires :filepath, type: String, desc: 'The path to the file to display' end - get [":id/repository/blobs/:sha", ":id/repository/commits/:sha/blob"] do + get ":id/repository/commits/:sha/blob" do repo = user_project.repository commit = repo.commit(params[:sha]) @@ -57,22 +69,33 @@ module API send_git_blob repo, blob end - desc 'Get a raw blob contents by blob sha' + desc 'Get raw blob by sha' params do requires :sha, type: String, desc: 'The commit, branch name, or tag name' end - get ':id/repository/raw_blobs/:sha' do - repo = user_project.repository + get ':id/repository/blobs/:sha/:raw' do + assign_blob_vars! - begin - blob = Gitlab::Git::Blob.raw(repo, params[:sha]) - rescue - not_found! 'Blob' - end + status(200) - not_found! 'Blob' unless blob + send_git_blob @repo, @blob + end - send_git_blob repo, blob + desc 'Get blob base4 encoded content by sha' + params do + requires :sha, type: String, desc: 'The commit, branch name, or tag name' + end + get ':id/repository/blobs/:sha' do + assign_blob_vars! + + status(200) + + { + size: @blob.size, + encoding: "base64", + content: Base64.strict_encode64(@blob.data), + sha: @blob.id + } end desc 'Get an archive of the repository' |