Eeeros
/
forgeplus
forked from Gitlink/forgeplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

This commit is contained in:
xxq250 2023-04-04 09:38:51 +08:00
parent 1cd2e712a7 e690a92c5c
commit d249da2d49
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repositories_controller.rb
View File

@ -235,9 +235,9 @@ class RepositoriesController < ApplicationController
def readme
if params[:filepath].present?
result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], current_user&.gitea_token)
result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], @owner&.gitea_token)
else
result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], @owner&.gitea_token)
end
@path = GiteaService.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
@readme = result[:status] === :success ? result[:body] : nil

12
app/interactors/gitea/create_file_interactor.rb
View File

@ -25,7 +25,7 @@ module Gitea
def run
Contents::CreateForm.new(valid_params).validate!
result = Gitea::Repository::Entries::CreateService.call(token,
owner, @params[:identifier], @params[:filepath], file_params)
owner, @params[:identifier], file_path, file_params)
if result[:status] == :success
@result = result[:body]
@ -50,9 +50,17 @@ module Gitea
@result = response
end
def file_path
if @params[:base64_filepath].present?
Base64.decode64(params[:base64_filepath])
else
@params[:filepath]
end
end
def valid_params
{
filepath: @params[:filepath],
filepath: file_path,
branch: @params[:branch],
new_branch: @params[:new_branch]
}

12
app/interactors/gitea/delete_file_interactor.rb
View File

@ -24,7 +24,7 @@ module Gitea
def run
Contents::DeleteForm.new(valid_params).validate!
response = Gitea::Repository::Entries::DeleteService.new(token, owner, @params[:identifier], @params[:filepath], file_params).call
response = Gitea::Repository::Entries::DeleteService.new(token, owner, @params[:identifier], file_path, file_params).call
render_result(response)
rescue Exception => exception
fail!(exception.message)
@ -45,9 +45,17 @@ module Gitea
end
end
def file_path
if @params[:base64_filepath].present?
Base64.decode64(params[:base64_filepath])
else
@params[:filepath]
end
end
def valid_params
{
filepath: @params[:filepath],
filepath: file_path,
sha: @params[:sha]
}
end

22
app/interactors/gitea/update_file_interactor.rb
View File

@ -24,7 +24,7 @@ module Gitea
def run
Contents::UpdateForm.new(valid_params).validate!
response = Gitea::Repository::Entries::UpdateService.new(token, owner, @params[:identifier], @params[:filepath], file_params).call
response = Gitea::Repository::Entries::UpdateService.new(token, owner, @params[:identifier], file_path, file_params).call
render_result(response)
rescue Exception => exception
fail!(exception.message)
@ -45,9 +45,25 @@ module Gitea
end
end
def file_path
if @params[:base64_filepath].present?
Base64.decode64(params[:base64_filepath])
else
@params[:filepath]
end
end
def from_file_path
if @params[:base64_from_path].present?
Base64.decode64(params[:base64_from_path])
else
@params[:from_path]
end
end
def valid_params
{
filepath: @params[:filepath],
filepath: file_path,
branch: @params[:branch],
new_branch: @params[:new_branch],
sha: @params[:sha]
@ -59,7 +75,7 @@ module Gitea
branch: @params[:branch],
sha: @params[:sha],
new_branch: @params[:new_branch],
from_path: @params[:from_path],
from_path: from_file_path,
message: @params[:message],
content: Base64.encode64(@params[:content])
).compact