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

FIX: use uniq instead of uniq! when checking for uncompressed root path. Use rails naming convention for ZipUtils

Browse Source
This commit is contained in:
romanrizzi 2019-07-23 07:57:06 -03:00
parent afe2be4f62
commit c4be8541f6
5 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/import_export/zip_utils.rb
View File

@ -2,7 +2,8 @@
require 'zip'
class ZipUtils
module ImportExport
class ZipUtils
def zip_directory(path, export_name)
zip_filename = "#{export_name}.zip"
absolute_path = "#{path}/#{export_name}"
@ -29,7 +30,7 @@ class ZipUtils
private
def root_folder_present?(filenames, allow_non_root_folder)
filenames.map { |p| p.name.split('/').first }.uniq!.size == 1 || allow_non_root_folder
filenames.map { |p| p.name.split('/').first }.uniq.size == 1 || allow_non_root_folder
end
# A helper method to make the recursion work.
@ -55,4 +56,5 @@ class ZipUtils
def put_into_archive(disk_file_path, zipfile, zipfile_path)
zipfile.add(zipfile_path, disk_file_path)
end
end
end

4
lib/theme_store/tgz_exporter.rb
View File

@ -1,5 +1,7 @@
# frozen_string_literal: true
require 'import_export/zip_utils'
module ThemeStore; end
class ThemeStore::TgzExporter
@ -60,6 +62,6 @@ class ThemeStore::TgzExporter
def export_package
export_to_folder
Dir.chdir(@temp_folder) { ZipUtils.new.zip_directory(@temp_folder, @export_name) }
Dir.chdir(@temp_folder) { ImportExport::ZipUtils.new.zip_directory(@temp_folder, @export_name) }
end
end

2
lib/theme_store/tgz_importer.rb
View File

@ -18,7 +18,7 @@ class ThemeStore::TgzImporter
Dir.chdir(@temp_folder) do
if @filename.include?('.zip')
ZipUtils.new.unzip_directory(@temp_folder, @filename)
ImportExport::ZipUtils.new.unzip_directory(@temp_folder, @filename)
# --strip 1 equivalent
FileUtils.mv(Dir.glob("#{@temp_folder}/*/*"), @temp_folder)

3
spec/components/theme_store/tgz_exporter_spec.rb
View File

@ -2,7 +2,6 @@
require 'rails_helper'
require 'theme_store/tgz_exporter'
require 'import_export/zip_utils'
describe ThemeStore::TgzExporter do
let!(:theme) do
@ -64,7 +63,7 @@ describe ThemeStore::TgzExporter do
file = 'discourse-header-icons.zip'
dest = 'discourse-header-icons'
Dir.chdir(dir) do
ZipUtils.new.unzip_directory(dir, file, allow_non_root_folder: true)
ImportExport::ZipUtils.new.unzip_directory(dir, file, allow_non_root_folder: true)
`rm #{file}`
folders = Dir.glob("**/*").reject { |f| File.file?(f) }

2
spec/components/theme_store/tgz_importer_spec.rb
View File

@ -24,7 +24,7 @@ describe ThemeStore::TgzImporter do
it "can import a simple zipped theme" do
Dir.chdir(@temp_folder) do
ZipUtils.new.zip_directory(@temp_folder, 'test')
ImportExport::ZipUtils.new.zip_directory(@temp_folder, 'test')
FileUtils.rm_rf('test/')
end