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
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/import_export/zip_utils.rb
View File

@@ -2,57 +2,59 @@
require 'zip'
class ZipUtils
def zip_directory(path, export_name)
zip_filename = "#{export_name}.zip"
absolute_path = "#{path}/#{export_name}"
entries = Dir.entries(absolute_path) - %w[. ..]
module ImportExport
class ZipUtils
def zip_directory(path, export_name)
zip_filename = "#{export_name}.zip"
absolute_path = "#{path}/#{export_name}"
entries = Dir.entries(absolute_path) - %w[. ..]
Zip::File.open(zip_filename, Zip::File::CREATE) do |zipfile|
write_entries(entries, absolute_path, '', zipfile)
Zip::File.open(zip_filename, Zip::File::CREATE) do |zipfile|
write_entries(entries, absolute_path, '', zipfile)
end
"#{absolute_path}.zip"
end
"#{absolute_path}.zip"
end
def unzip_directory(path, zip_filename, allow_non_root_folder: false)
Zip::File.open(zip_filename) do |zip_file|
root = root_folder_present?(zip_file, allow_non_root_folder) ? '' : 'unzipped/'
zip_file.each do |entry|
entry_path = File.join(path, "#{root}#{entry.name}")
FileUtils.mkdir_p(File.dirname(entry_path))
entry.extract(entry_path)
def unzip_directory(path, zip_filename, allow_non_root_folder: false)
Zip::File.open(zip_filename) do |zip_file|
root = root_folder_present?(zip_file, allow_non_root_folder) ? '' : 'unzipped/'
zip_file.each do |entry|
entry_path = File.join(path, "#{root}#{entry.name}")
FileUtils.mkdir_p(File.dirname(entry_path))
entry.extract(entry_path)
end
end
end
end
private
private
def root_folder_present?(filenames, allow_non_root_folder)
filenames.map { |p| p.name.split('/').first }.uniq!.size == 1 || allow_non_root_folder
end
def root_folder_present?(filenames, 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.
def write_entries(entries, base_path, path, zipfile)
entries.each do |e|
zipfile_path = path == '' ? e : File.join(path, e)
disk_file_path = File.join(base_path, zipfile_path)
# A helper method to make the recursion work.
def write_entries(entries, base_path, path, zipfile)
entries.each do |e|
zipfile_path = path == '' ? e : File.join(path, e)
disk_file_path = File.join(base_path, zipfile_path)
if File.directory? disk_file_path
recursively_deflate_directory(disk_file_path, zipfile, base_path, zipfile_path)
else
put_into_archive(disk_file_path, zipfile, zipfile_path)
if File.directory? disk_file_path
recursively_deflate_directory(disk_file_path, zipfile, base_path, zipfile_path)
else
put_into_archive(disk_file_path, zipfile, zipfile_path)
end
end
end
end
def recursively_deflate_directory(disk_file_path, zipfile, base_path, zipfile_path)
zipfile.mkdir zipfile_path
subdir = Dir.entries(disk_file_path) - %w[. ..]
write_entries subdir, base_path, zipfile_path, zipfile
end
def recursively_deflate_directory(disk_file_path, zipfile, base_path, zipfile_path)
zipfile.mkdir zipfile_path
subdir = Dir.entries(disk_file_path) - %w[. ..]
write_entries subdir, base_path, zipfile_path, zipfile
end
def put_into_archive(disk_file_path, zipfile, zipfile_path)
zipfile.add(zipfile_path, disk_file_path)
def put_into_archive(disk_file_path, zipfile, zipfile_path)
zipfile.add(zipfile_path, disk_file_path)
end
end
end