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

fix: write image filepath error

This commit is contained in:
yystopf 2021-07-16 16:10:20 +08:00
parent 998381585a
commit a543c3e08f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -74,6 +74,7 @@ vendor/bundle/
/log /log
/public/admin /public/admin
/mysql_data /mysql_data
/public/repo/
.generators .generators

13
app/helpers/repositories_helper.rb
View File

@ -10,7 +10,7 @@ module RepositoriesHelper
end end
def download_type(str) def download_type(str)
default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata doc docx mpp vsdx dot) default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2)
default_type.include?(str&.downcase) default_type.include?(str&.downcase)
end end
@ -82,7 +82,9 @@ module RepositoriesHelper
readme_render_decode64_content(content, path) readme_render_decode64_content(content, path)
else else
file_type = entry['name'].to_s.split(".").last file_type = entry['name'].to_s.split(".").last
return entry['content'] if download_type(file_type) if download_type(file_type)
return entry['content'].nil? ? Gitea::Repository::Entries::GetService.call(owner, repo.identifier, entry['path'], ref: ref)['content'] : entry['content']
end
render_decode64_content(entry['content']) render_decode64_content(entry['content'])
end end
end end
@ -94,14 +96,15 @@ module RepositoriesHelper
end end
def render_download_image_url(dir_path, file_path, content) def render_download_image_url(dir_path, file_path, content)
full_path = file_path.starts_with?("/") ? [dir_path, file_path].join("") : [dir_path, file_path].join("/")
file_name = full_path.split("/")[-1]
# 用户名/项目标识/文件路径 # 用户名/项目标识/文件路径
dir_path = generate_dir_path(dir_path) dir_path = generate_dir_path(full_path.split("/"+file_name)[0])
file_path = [dir_path, file_path].join('/') file_path = [dir_path, file_name].join('/')
puts "##### render_download_image_url file_path: #{file_path}" puts "##### render_download_image_url file_path: #{file_path}"
base64_to_image(file_path, content) base64_to_image(file_path, content)
file_path = file_path.split('public')[1] file_path = file_path.split('public')[1]
File.join(base_url, file_path) File.join(base_url, file_path)
end end