From 930805704a144ce898a8dd47e73c9b22a72ad6cc Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Fri, 18 Mar 2022 17:32:29 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/helpers/repositories_helper.rb | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index c46bf8933..9fef22fc5 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -224,7 +224,7 @@ class RepositoriesController < ApplicationController end @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/" @readme = result[:status] === :success ? result[:body] : nil - @readme['content'] = decode64_readme_content(@readme, @owner, @repository, params[:ref], @path) + @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path) render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha") rescue render json: nil diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 506263a8e..62d27a743 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -110,18 +110,10 @@ module RepositoriesHelper date.to_time.strftime("%Y-%m-%d %H:%M") end - def decode64_readme_content(entry, owner, repo, ref, path=nil) - if is_readme?(entry['type'], entry['name']) - path = URI.escape(entry['path']).to_s.downcase.gsub("/readme.md","") - readme_render_decode64_content(entry['content'], owner, repo, ref, path) - else - render_decode64_content(entry['content']) - end - end - def decode64_content(entry, owner, repo, ref, path=nil) if is_readme?(entry['type'], entry['name']) - content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content'] + # content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content'] + content = entry['content'] path = URI.escape(entry['path']).to_s.downcase.gsub("/readme.md","") readme_render_decode64_content(content, owner, repo, ref, path) else