From d14bf35ca1cdca2b32d1448dd287066662b73a36 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Jun 2022 11:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20gitea=20module=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 4 ++-- app/controllers/concerns/acceleratorable.rb | 6 +++--- app/controllers/repositories_controller.rb | 12 ++++++------ app/helpers/projects_helper.rb | 2 +- app/interactors/gitea/register_interactor.rb | 4 ++-- app/libs/ci/drone/server.rb | 2 +- app/libs/{gitea.rb => gitea_service.rb} | 2 +- app/services/educoder/client_service.rb | 2 +- app/services/gitea/accelerator/base_service.rb | 2 +- app/services/gitea/client_service.rb | 4 ++-- app/services/gitea/user/delete_service.rb | 4 ++-- app/services/gitea/user/update_service.rb | 2 +- app/services/repositories/create_service.rb | 2 +- lib/tasks/sync_data_to_gitea.rake | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) rename app/libs/{gitea.rb => gitea_service.rb} (96%) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 3aa98257a..79047b516 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -33,8 +33,8 @@ class AttachmentsController < ApplicationController normal_status(-1, "参数缺失") if params[:download_url].blank? url = URI.encode(params[:download_url].to_s.gsub("http:", "https:")) if url.starts_with?(base_url) - domain = Gitea.gitea_config[:domain] - api_url = Gitea.gitea_config[:base_url] + domain = GiteaService.gitea_config[:domain] + api_url = GiteaService.gitea_config[:base_url] url = url.split(base_url)[1].gsub("api", "repos").gsub('?filepath=', '/').gsub('&', '?') request_url = [domain, api_url, url, "?ref=#{params[:ref]}&access_token=#{current_user&.gitea_token}"].join response = Faraday.get(request_url) diff --git a/app/controllers/concerns/acceleratorable.rb b/app/controllers/concerns/acceleratorable.rb index 5243ac538..88ec4dd63 100644 --- a/app/controllers/concerns/acceleratorable.rb +++ b/app/controllers/concerns/acceleratorable.rb @@ -18,15 +18,15 @@ module Acceleratorable end def accelerator_domain - Gitea.gitea_config[:accelerator]["domain"] + GiteaService.gitea_config[:accelerator]["domain"] end def accelerator_username - Gitea.gitea_config[:accelerator]["access_key_id"] + GiteaService.gitea_config[:accelerator]["access_key_id"] end def config_accelerator? - Gitea.gitea_config[:accelerator].present? + GiteaService.gitea_config[:accelerator].present? end def is_foreign_url?(clone_addr) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index a2ab33b23..34ac97632 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -54,7 +54,7 @@ class RepositoriesController < ApplicationController else @entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : [] - @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/" + @path = GiteaService.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/" end end @@ -222,7 +222,7 @@ class RepositoriesController < ApplicationController else result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token) end - @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/" + @path = GiteaService.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/" @readme = result[:status] === :success ? result[:body] : nil @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path) @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path) @@ -240,8 +240,8 @@ class RepositoriesController < ApplicationController end def archive - domain = Gitea.gitea_config[:domain] - api_url = Gitea.gitea_config[:base_url] + domain = GiteaService.gitea_config[:domain] + api_url = GiteaService.gitea_config[:base_url] archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{Addressable::URI.escape(params[:archive])}" file_path = [domain, api_url, archive_url].join @@ -253,8 +253,8 @@ class RepositoriesController < ApplicationController end def raw - domain = Gitea.gitea_config[:domain] - api_url = Gitea.gitea_config[:base_url] + domain = GiteaService.gitea_config[:domain] + api_url = GiteaService.gitea_config[:base_url] url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{Addressable::URI.escape(params[:filepath])}?ref=#{Addressable::URI.escape(params[:ref])}" file_path = [domain, api_url, url].join diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index cc4a3fe02..0dcb6ca12 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -30,7 +30,7 @@ module ProjectsHelper end def gitea_domain - Gitea.gitea_config[:domain] + GiteaService.gitea_config[:domain] end def find_user_by_login_or_mail(identifier) diff --git a/app/interactors/gitea/register_interactor.rb b/app/interactors/gitea/register_interactor.rb index e188809ac..ebb2bc4af 100644 --- a/app/interactors/gitea/register_interactor.rb +++ b/app/interactors/gitea/register_interactor.rb @@ -44,8 +44,8 @@ module Gitea def token { - username: Gitea.gitea_config[:access_key_id], - password: Gitea.gitea_config[:access_key_secret] + username: GiteaService.gitea_config[:access_key_id], + password: GiteaService.gitea_config[:access_key_secret] } end end diff --git a/app/libs/ci/drone/server.rb b/app/libs/ci/drone/server.rb index add2e4392..de23dd738 100644 --- a/app/libs/ci/drone/server.rb +++ b/app/libs/ci/drone/server.rb @@ -37,7 +37,7 @@ class Ci::Drone::Server private def gitea_url - Gitea.gitea_config[:domain] + GiteaService.gitea_config[:domain] end def database_username diff --git a/app/libs/gitea.rb b/app/libs/gitea_service.rb similarity index 96% rename from app/libs/gitea.rb rename to app/libs/gitea_service.rb index 6679b89d6..b44f79487 100644 --- a/app/libs/gitea.rb +++ b/app/libs/gitea_service.rb @@ -1,4 +1,4 @@ -module Gitea +module GiteaService class << self def gitea_config gitea_config = {} diff --git a/app/services/educoder/client_service.rb b/app/services/educoder/client_service.rb index 6c5c10d99..1e77ad89b 100644 --- a/app/services/educoder/client_service.rb +++ b/app/services/educoder/client_service.rb @@ -81,7 +81,7 @@ class Educoder::ClientService < ApplicationService end def access_key_secret - Gitea.gitea_config[:access_key_secret] + GiteaService.gitea_config[:access_key_secret] end def api_url(url) diff --git a/app/services/gitea/accelerator/base_service.rb b/app/services/gitea/accelerator/base_service.rb index e63d77aab..9a66eb2bd 100644 --- a/app/services/gitea/accelerator/base_service.rb +++ b/app/services/gitea/accelerator/base_service.rb @@ -56,7 +56,7 @@ class Gitea::Accelerator::BaseService < ApplicationService end def accelerator - Gitea.gitea_config[:accelerator] + GiteaService.gitea_config[:accelerator] end def render_status(response) diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index b0c842db1..e2bd9d491 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -96,11 +96,11 @@ class Gitea::ClientService < ApplicationService end def base_url - Gitea.gitea_config[:base_url] + GiteaService.gitea_config[:base_url] end def domain - Gitea.gitea_config[:domain] + GiteaService.gitea_config[:domain] end def api_url diff --git a/app/services/gitea/user/delete_service.rb b/app/services/gitea/user/delete_service.rb index 5df3cb6b2..9011158d2 100644 --- a/app/services/gitea/user/delete_service.rb +++ b/app/services/gitea/user/delete_service.rb @@ -14,8 +14,8 @@ class Gitea::User::DeleteService < Gitea::ClientService private def token { - username: Gitea.gitea_config[:access_key_id], - password: Gitea.gitea_config[:access_key_secret] + username: GiteaService.gitea_config[:access_key_id], + password: GiteaService.gitea_config[:access_key_secret] } end diff --git a/app/services/gitea/user/update_service.rb b/app/services/gitea/user/update_service.rb index 5e6108a9b..9826c7ed0 100644 --- a/app/services/gitea/user/update_service.rb +++ b/app/services/gitea/user/update_service.rb @@ -17,7 +17,7 @@ class Gitea::User::UpdateService < Gitea::ClientService # source_id integer($int64) # website string - def initialize(edit_username, params={}, token={username: Gitea.gitea_config[:access_key_id], password: Gitea.gitea_config[:access_key_secret]}) + def initialize(edit_username, params={}, token={username: GiteaService.gitea_config[:access_key_id], password: GiteaService.gitea_config[:access_key_secret]}) @token = token @params = params @edit_username = edit_username diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb index f0c584e18..e7ff8bd1d 100644 --- a/app/services/repositories/create_service.rb +++ b/app/services/repositories/create_service.rb @@ -63,7 +63,7 @@ class Repositories::CreateService < ApplicationService end def remote_repository_url - [Gitea.gitea_config[:domain], '/', user.login, '/', params[:identifier], ".git"].join("") + [GiteaService.gitea_config[:domain], '/', user.login, '/', params[:identifier], ".git"].join("") end def repository_params diff --git a/lib/tasks/sync_data_to_gitea.rake b/lib/tasks/sync_data_to_gitea.rake index 9e30b290c..85df9c69a 100644 --- a/lib/tasks/sync_data_to_gitea.rake +++ b/lib/tasks/sync_data_to_gitea.rake @@ -128,7 +128,7 @@ namespace :sync_data_to_gitea do end def remote_repository_url(username, identifier) - [Gitea.gitea_config[:domain], '/', username, '/', identifier, ".git"].join("") + [GiteaService.gitea_config[:domain], '/', username, '/', identifier, ".git"].join("") end def generate_identifier