add a few comments to reduce the sanity-blasting-ness

git-svn-id: file:///home/svn/framework3/trunk@13942 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2011-10-16 00:17:13 +00:00
parent 020abd926b
commit 5c9ddb293d
1 changed files with 4 additions and 0 deletions

View File

@ -2538,12 +2538,16 @@ class DBManager
end end
@import_filedata[:zip_tmp] = new_tmp @import_filedata[:zip_tmp] = new_tmp
# Grab the list of unique basedirs over all entries.
@import_filedata[:zip_tmp_subdirs] = @import_filedata[:zip_entry_names].map {|x| ::File.split(x)}.map {|x| x[0]}.uniq.reject {|x| x == "."} @import_filedata[:zip_tmp_subdirs] = @import_filedata[:zip_entry_names].map {|x| ::File.split(x)}.map {|x| x[0]}.uniq.reject {|x| x == "."}
# mkdir all of the base directores we just pulled out, if they don't
# already exist
@import_filedata[:zip_tmp_subdirs].each {|sub| @import_filedata[:zip_tmp_subdirs].each {|sub|
tmp_subdirs = ::File.join(@import_filedata[:zip_tmp],sub) tmp_subdirs = ::File.join(@import_filedata[:zip_tmp],sub)
if File.exists? tmp_subdirs if File.exists? tmp_subdirs
unless (::File.directory?(tmp_subdirs) && File.writable?(tmp_subdirs)) unless (::File.directory?(tmp_subdirs) && File.writable?(tmp_subdirs))
# if it exists but we can't write to it, give up
raise DBImportError.new("Could not extract zip file to #{tmp_subdirs}") raise DBImportError.new("Could not extract zip file to #{tmp_subdirs}")
end end
else else