IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Gz to zip for exports (#7889)

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

This reverts commit f89bd55576.

* Replace .tar.zip with .zip
This commit is contained in:
Roman Rizzi
2019-07-18 09:34:48 -03:00
committed by GitHub
parent c1b58613a2
commit f5c707c97a
15 changed files with 127 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/theme_store/tgz_importer.rb
+12 -2
View File
@@ -1,5 +1,7 @@
# frozen_string_literal: true
require 'import_export/zip_utils'
module ThemeStore; end
class ThemeStore::TgzImporter
@@ -13,8 +15,16 @@ class ThemeStore::TgzImporter
def import!
FileUtils.mkdir(@temp_folder)
Dir.chdir(@temp_folder) do
Discourse::Utils.execute_command("tar", "-xzvf", @filename, "--strip", "1")
if @filename.include?('.zip')
ZipUtils.new.unzip_directory(@temp_folder, @filename)
# --strip 1 equivalent
FileUtils.mv(Dir.glob("#{@temp_folder}/*/*"), @temp_folder)
else
Discourse::Utils.execute_command("tar", "-xzvf", @filename, "--strip", "1")
end
end
rescue RuntimeError
raise RemoteTheme::ImportError, I18n.t("themes.import_error.unpack_failed")
@@ -44,7 +54,7 @@ class ThemeStore::TgzImporter
def all_files
Dir.chdir(@temp_folder) do
Dir.glob("**/*").reject { |f| File.directory?(f) }
Dir.glob("**/**").reject { |f| File.directory?(f) }
end
end