github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 01:17:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FEATURE: admin/user exports are compressed using the zip format (#7784)"

Browse Source 
This reverts commit 8b2580e20fc508f4e639210f7e64cbf096f95cfc.
This commit is contained in:
romanrizzi
2019-07-10 11:38:51 -03:00
parent 90fcdad3cd
commit f89bd55576
14 changed files with 30 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/theme_store/tgz_exporter.rb
View File

@ -1,7 +1,5 @@
# frozen_string_literal: true
require 'zip'
module ThemeStore; end
class ThemeStore::TgzExporter
@ -60,19 +58,11 @@ class ThemeStore::TgzExporter
private
def export_package
export_to_folder
Dir.chdir(@temp_folder) do
tar_filename = "#{@export_name}.tar"
Discourse::Utils.execute_command('tar', '--create', '--file', tar_filename, @export_name, failure_message: "Failed to tar theme.")
zip_filename = "#{tar_filename}.zip"
absolute_path = "#{@temp_folder}/#{tar_filename}"
Zip::File.open(zip_filename, Zip::File::CREATE) do |zipfile|
zipfile.add(tar_filename, absolute_path)
zipfile.close
end
"#{absolute_path}.zip"
Discourse::Utils.execute_command('gzip', '-5', tar_filename, failure_message: "Failed to gzip archive.")
"#{@temp_folder}/#{tar_filename}.gz"
end
end

19
lib/theme_store/tgz_importer.rb
View File

@ -1,7 +1,5 @@
# frozen_string_literal: true
require 'zip'
module ThemeStore; end
class ThemeStore::TgzImporter
@ -15,21 +13,8 @@ class ThemeStore::TgzImporter
def import!
FileUtils.mkdir(@temp_folder)
if @filename.include?('.zip')
name = @filename.split('/').last.gsub('.zip', '')
Dir.chdir(@temp_folder) do
Zip::File.open(@filename) do |zip_file|
zip_file.each { |entry| entry.extract(name) }
end
Discourse::Utils.execute_command("tar", "-xvf", name, "--strip", "1")
end
else
Dir.chdir(@temp_folder) do
Discourse::Utils.execute_command("tar", "-xzvf", @filename, "--strip", "1")
end
Dir.chdir(@temp_folder) do
Discourse::Utils.execute_command("tar", "-xzvf", @filename, "--strip", "1")
end
rescue RuntimeError
raise RemoteTheme::ImportError, I18n.t("themes.import_error.unpack_failed")