floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'README文件中的图片显示问题' (#262) from xxq250/forgeplus:fix_issue_xxq into standalone_develop

This commit is contained in:
xxq250 2021-11-25 10:41:00 +08:00
parent 0a3df09089 a4a431e9bb
commit 1eb1d25040
1 changed files with 359 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

717
app/controllers/repositories_controller.rb
View File

@ -1,358 +1,359 @@
class RepositoriesController < ApplicationController class RepositoriesController < ApplicationController
include RepositoriesHelper include RepositoriesHelper
include ApplicationHelper include ApplicationHelper
include OperateProjectAbilityAble include OperateProjectAbilityAble
include Repository::LanguagesPercentagable include Repository::LanguagesPercentagable
before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror] before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
before_action :require_profile_completed, only: [:create_file] before_action :require_profile_completed, only: [:create_file]
before_action :load_repository before_action :load_repository
before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive] before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror] before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
before_action :get_ref, only: %i[entries sub_entries top_counts file archive] before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
before_action :get_latest_commit, only: %i[entries sub_entries top_counts] before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
before_action :get_statistics, only: %i[top_counts] before_action :get_statistics, only: %i[top_counts]
def files def files
result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token) result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
render json: result render json: result
end end
# 新版项目详情 # 新版项目详情
def detail def detail
@user = current_user @user = current_user
@result = Repositories::DetailService.call(@owner, @repository, @user) @result = Repositories::DetailService.call(@owner, @repository, @user)
@project_fork_id = @project.try(:forked_from_project_id) @project_fork_id = @project.try(:forked_from_project_id)
if @project_fork_id.present? if @project_fork_id.present?
@fork_project = Project.find_by(id: @project_fork_id) @fork_project = Project.find_by(id: @project_fork_id)
@fork_project_user = @fork_project.owner @fork_project_user = @fork_project.owner
end end
rescue Exception => e rescue Exception => e
uid_logger_error(e.message) uid_logger_error(e.message)
tip_exception(e.message) tip_exception(e.message)
end end
def show def show
@user = current_user @user = current_user
@repo = @project.repository @repo = @project.repository
@result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil @result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil
@project_fork_id = @project.try(:forked_from_project_id) @project_fork_id = @project.try(:forked_from_project_id)
if @project_fork_id.present? if @project_fork_id.present?
@fork_project = Project.find_by(id: @project_fork_id) @fork_project = Project.find_by(id: @project_fork_id)
@fork_project_user = @fork_project.owner @fork_project_user = @fork_project.owner
end end
rescue Exception => e rescue Exception => e
uid_logger_error(e.message) uid_logger_error(e.message)
tip_exception(e.message) tip_exception(e.message)
end end
def entries def entries
@project.increment!(:visits) @project.increment!(:visits)
CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id) CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
if @project.educoder? if @project.educoder?
@entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name) @entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
else else
@entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
@entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : [] @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
@path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/" @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
end end
end end
def top_counts def top_counts
@result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call @result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
end end
def sub_entries def sub_entries
file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
@path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/" @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
if @project.educoder? if @project.educoder?
if params[:type] === 'file' if params[:type] === 'file'
@sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri) @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
logger.info "######### sub_entries: #{@sub_entries}" logger.info "######### sub_entries: #{@sub_entries}"
return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1 return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
tmp_entries = [{ tmp_entries = [{
"content" => @sub_entries['data']['content'], "content" => @sub_entries['data']['content'],
"type" => "blob" "type" => "blob"
}] }]
@sub_entries = { @sub_entries = {
"trees"=>tmp_entries, "trees"=>tmp_entries,
"commits" => [{}] "commits" => [{}]
} }
else else
@sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri}) @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
end end
else else
interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref) interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
if interactor.success? if interactor.success?
result = interactor.result result = interactor.result
@sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result @sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result
else else
render_error(interactor.error) render_error(interactor.error)
end end
end end
end end
def commits def commits
if params[:filepath].present? if params[:filepath].present?
file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
@hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri, @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
else else
@hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier, @hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
end end
end end
def commits_slice def commits_slice
@hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier, @hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier,
sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token) sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token)
end end
def commit def commit
@sha = params[:sha] @sha = params[:sha]
@commit = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token) @commit = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
@commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true}) @commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
end end
def tags def tags
result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]}) result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
@tags = result.is_a?(Hash) && result.key?(:status) ? [] : result @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
end end
def contributors def contributors
if params[:filepath].present? if params[:filepath].present?
@contributors = [] @contributors = []
else else
@contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier) @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
end end
end end
def edit def edit
return render_forbidden if !@project.manager?(current_user) && !current_user.admin? return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
end end
def create_file def create_file
interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params) interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
if interactor.success? if interactor.success?
@file = interactor.result @file = interactor.result
# create_new_pr(params) # create_new_pr(params)
#如果是更新流水线文件 #如果是更新流水线文件
if params[:pipeline_id] if params[:pipeline_id]
update_pipeline(params[:pipeline_id]) update_pipeline(params[:pipeline_id])
end end
else else
render_error(interactor.error) render_error(interactor.error)
end end
end end
def update_pipeline(pipeline_id) def update_pipeline(pipeline_id)
pipeline = Ci::Pipeline.find(pipeline_id) pipeline = Ci::Pipeline.find(pipeline_id)
if pipeline if pipeline
pipeline.update!(sync: 1) pipeline.update!(sync: 1)
end end
end end
def update_file def update_file
interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier)) interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
if interactor.success? if interactor.success?
@file = interactor.result @file = interactor.result
# TODO: 是否创建pr # TODO: 是否创建pr
# create_new_pr(params) # create_new_pr(params)
render_result(1, "更新成功") render_result(1, "更新成功")
else else
render_error(interactor.error) render_error(interactor.error)
end end
end end
def delete_file def delete_file
interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier)) interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
if interactor.success? if interactor.success?
@file = interactor.result @file = interactor.result
render_result(1, "文件删除成功") render_result(1, "文件删除成功")
else else
render_error(interactor.error) render_error(interactor.error)
end end
end end
def repo_hook def repo_hook
end end
def sync_mirror def sync_mirror
return render_error("正在镜像中..") if @repository.mirror.waiting? return render_error("正在镜像中..") if @repository.mirror.waiting?
@repository.sync_mirror! @repository.sync_mirror!
SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id) SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id)
render_ok render_ok
end end
def readme def readme
if params[:filepath].present? 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], current_user&.gitea_token)
else 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], current_user&.gitea_token)
end end
@readme = result[:status] === :success ? result[:body] : nil @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
@readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref]) @readme = result[:status] === :success ? result[:body] : nil
render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha") @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
rescue render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
render json: nil rescue
end render json: nil
end
def languages
render json: languages_precentagable def languages
end render json: languages_precentagable
end
def archive
domain = Gitea.gitea_config[:domain] def archive
api_url = Gitea.gitea_config[:base_url] domain = Gitea.gitea_config[:domain]
archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}" api_url = Gitea.gitea_config[:base_url]
archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}"
file_path = [domain, api_url, archive_url].join
file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden? file_path = [domain, api_url, archive_url].join
file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
return render_not_found if !request.format.zip? && !request.format.gzip?
return render_not_found if !request.format.zip? && !request.format.gzip?
redirect_to file_path
end redirect_to file_path
end
def raw
domain = Gitea.gitea_config[:domain] def raw
api_url = Gitea.gitea_config[:base_url] domain = Gitea.gitea_config[:domain]
api_url = Gitea.gitea_config[:base_url]
url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{params[:filepath]}?ref=#{params[:ref]}"
file_path = [domain, api_url, url].join url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{params[:filepath]}?ref=#{params[:ref]}"
file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") if @repository.hidden? file_path = [domain, api_url, url].join
file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") if @repository.hidden?
redirect_to URI.escape(file_path)
end redirect_to URI.escape(file_path)
end
private
private
def find_project
@project = Project.find params[:id] def find_project
render_not_found("未找到相关的仓库") unless @project @project = Project.find params[:id]
end render_not_found("未找到相关的仓库") unless @project
end
def find_project_with_includes
@project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id] def find_project_with_includes
end @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
end
def authorizate!
return if current_user && current_user.admin? def authorizate!
if @project.repository.hidden? && !@project.member?(current_user) return if current_user && current_user.admin?
render_forbidden if @project.repository.hidden? && !@project.member?(current_user)
end render_forbidden
end end
end
# TODO 获取最新commit信息
def project_commits # TODO 获取最新commit信息
if params[:filepath].present? def project_commits
file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) if params[:filepath].present?
Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri, file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri,
else sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier, else
sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
end sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
end end
end
def get_statistics
@branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size def get_statistics
@tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size @branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
end @tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
end
def get_ref
@ref = params[:ref] || @project&.default_branch def get_ref
end @ref = params[:ref] || @project&.default_branch
end
def get_latest_commit
latest_commit = @project.educoder? ? nil : project_commits def get_latest_commit
@latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil latest_commit = @project.educoder? ? nil : project_commits
@commits_count = latest_commit.present? ? latest_commit[:total_count] : 0 @latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil
end @commits_count = latest_commit.present? ? latest_commit[:total_count] : 0
end
def content_params
{ def content_params
filepath: params[:filepath], {
branch: params[:branch], filepath: params[:filepath],
new_branch: params[:new_branch], branch: params[:branch],
content: params[:content], new_branch: params[:new_branch],
message: params[:message], content: params[:content],
committer: { message: params[:message],
email: current_user.mail, committer: {
name: current_user.login email: current_user.mail,
}, name: current_user.login
identifier: @project.identifier },
} identifier: @project.identifier
end }
end
def hook_params(hook_type, params)
# if hook_type == "push" def hook_params(hook_type, params)
# # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算 # if hook_type == "push"
# uploadPushInfo = { # # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算
# "sha": params["commits"].present? ? params["commits"].last : "", # uploadPushInfo = {
# "branch": params["ref"].to_s.split("/").last, # "sha": params["commits"].present? ? params["commits"].last : "",
# "modification_lines": params["commits"].length # "branch": params["ref"].to_s.split("/").last,
# } # "modification_lines": params["commits"].length
# elsif hook_type == "pull_request" && params["action"].to_s == "closed" #合并请求合并后才会有上链操作 # }
# uploadPushInfo = { # elsif hook_type == "pull_request" && params["action"].to_s == "closed" #合并请求合并后才会有上链操作
# "branch": params["base"]["ref"].to_s.split("/").last, # uploadPushInfo = {
# "sha": params["pull_request"]["merge_base"], # "branch": params["base"]["ref"].to_s.split("/").last,
# "modification_lines": 1 #pull_request中没有commits数量 # "sha": params["pull_request"]["merge_base"],
# } # "modification_lines": 1 #pull_request中没有commits数量
# else # }
# uploadPushInfo = {} # else
# end # uploadPushInfo = {}
# end
# uploadPushInfo
end # uploadPushInfo
end
def create_new_pr(params)
if params[:new_branch].present? && params[:new_branch] != params[:branch] def create_new_pr(params)
local_params = { if params[:new_branch].present? && params[:new_branch] != params[:branch]
title: params[:message], #标题 local_params = {
body: params[:content], #内容 title: params[:message], #标题
head: params[:new_branch], #源分支 body: params[:content], #内容
base: params[:branch], #目标分支 head: params[:new_branch], #源分支
milestone: 0 #里程碑,未与本地的里程碑关联 base: params[:branch], #目标分支
milestone: 0 #里程碑,未与本地的里程碑关联
}
requests_params = local_params.merge({ }
assignee: current_user.try(:login), requests_params = local_params.merge({
assignees: [], assignee: current_user.try(:login),
labels: [], assignees: [],
due_date: Time.now labels: [],
}) due_date: Time.now
})
issue_params = {
author_id: current_user.id, issue_params = {
project_id: @project.id, author_id: current_user.id,
subject: params[:message], project_id: @project.id,
description: params[:content], subject: params[:message],
assigned_to_id: nil, description: params[:content],
fixed_version_id: nil, assigned_to_id: nil,
issue_tags_value: nil, fixed_version_id: nil,
issue_classify: "pull_request", issue_tags_value: nil,
issue_type: "1", issue_classify: "pull_request",
tracker_id: 2, issue_type: "1",
status_id: 1, tracker_id: 2,
priority_id: params[:priority_id] || "2" status_id: 1,
} priority_id: params[:priority_id] || "2"
@pull_issue = Issue.new(issue_params) }
if @pull_issue.save! @pull_issue = Issue.new(issue_params)
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id)) if @pull_issue.save!
if local_requests.save local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call if local_requests.save
if gitea_request[:status] == :success && local_requests.update_attributes(gitea_number: gitea_request["body"]["number"]) gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create") if gitea_request[:status] == :success && local_requests.update_attributes(gitea_number: gitea_request["body"]["number"])
end local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
end end
end end
end end
end end
end
end
end