From 6350d2e5a90201ef2176b06c3b40bbd02812a4dc Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 8 Dec 2022 17:15:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fixed=20=E4=B8=8B=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=A2=9E=E5=8A=A0xlsx,Makefile=E5=8F=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 4 ++-- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 11d15b751..69491282d 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -10,7 +10,7 @@ module RepositoriesHelper end def download_type(str) - default_type = %w(ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv apk) + default_type = %w(ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv apk xlsx xls) default_type.include?(str&.downcase) || str.blank? end @@ -91,7 +91,7 @@ module RepositoriesHelper new_r_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{path_current}/#{path_last}&ref=#{ref}"].join end content = content.gsub(/src=\"#{r_content}\"/, "src=\"#{new_r_content}\"").gsub(/src='#{r_content}'/, "src=\"#{new_r_content}\"") - rescue + rescue next end end diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index d11d9af43..187c5472d 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -2,7 +2,7 @@ if @project.forge? is_dir = @sub_entries.is_a?(Array) file_name = entry['name'] file_type = File.extname(file_name.to_s)[1..-1] - direct_download = download_type(file_type) + direct_download = file_name.to_s.downcase.include?("Makefile".downcase) || download_type(file_type) image_type = image_type?(file_type) json.name file_name json.sha entry['sha'] From 988ebf3fc3ffb3a4a876a154cd7382099c396d26 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 8 Dec 2022 17:16:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fixed=20=E4=B8=8B=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=A2=9E=E5=8A=A0xlsx,Makefile=E5=8F=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index 187c5472d..7baf799dd 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -2,7 +2,7 @@ if @project.forge? is_dir = @sub_entries.is_a?(Array) file_name = entry['name'] file_type = File.extname(file_name.to_s)[1..-1] - direct_download = file_name.to_s.downcase.include?("Makefile".downcase) || download_type(file_type) + direct_download = file_name.to_s.downcase == "Makefile".downcase || download_type(file_type) image_type = image_type?(file_type) json.name file_name json.sha entry['sha'] From 3db761e2ae810607a32bb3e1e0b9b4f2f647e767 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 8 Dec 2022 17:25:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fixed=20=E4=B8=8B=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=A2=9E=E5=8A=A0xlsx,Makefile=E5=8F=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index 7baf799dd..9b9d0e4bd 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -2,7 +2,7 @@ if @project.forge? is_dir = @sub_entries.is_a?(Array) file_name = entry['name'] file_type = File.extname(file_name.to_s)[1..-1] - direct_download = file_name.to_s.downcase == "Makefile".downcase || download_type(file_type) + direct_download = file_name.to_s.downcase != "Makefile".downcase || download_type(file_type) image_type = image_type?(file_type) json.name file_name json.sha entry['sha'] From 487630ad1ce5b6aa5251ab592a1346b05883d6a7 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 8 Dec 2022 17:28:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fixed=20=E4=B8=8B=E8=BD=BD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=A2=9E=E5=8A=A0xlsx,Makefile=E5=8F=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index 9b9d0e4bd..8adcaeb83 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -2,7 +2,7 @@ if @project.forge? is_dir = @sub_entries.is_a?(Array) file_name = entry['name'] file_type = File.extname(file_name.to_s)[1..-1] - direct_download = file_name.to_s.downcase != "Makefile".downcase || download_type(file_type) + direct_download = file_name.to_s.downcase != "Makefile".downcase && download_type(file_type) image_type = image_type?(file_type) json.name file_name json.sha entry['sha']