ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't fail zipping empty folders. fixes #5002 

Change-Id: I510facebfc85fd617013741d862d3417b66ce341
Reviewed-on: https://gerrit.instructure.com/4949
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
This commit is contained in:
Cody Cutrer 2011-08-04 12:32:50 -06:00
parent aa69f2bc02
commit 828a58b9e3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/content_zipper.rb
View File

@ -225,7 +225,7 @@ class ContentZipper
end end
def zip_base_folder(zip_attachment, folder) def zip_base_folder(zip_attachment, folder)
@files_added = false @files_added = true
@logger.debug("zipping into attachment: #{zip_attachment.id}") @logger.debug("zipping into attachment: #{zip_attachment.id}")
zip_attachment.workflow_state = 'zipping' #!(:workflow_state => 'zipping') zip_attachment.workflow_state = 'zipping' #!(:workflow_state => 'zipping')
zip_attachment.scribd_attempts += 1 zip_attachment.scribd_attempts += 1
@ -285,9 +285,7 @@ class ContentZipper
@context = folder.context @context = folder.context
@logger.debug(" found attachment: #{attachment.unencoded_filename}") @logger.debug(" found attachment: #{attachment.unencoded_filename}")
path = folder_names.empty? ? attachment.filename : File.join(folder_names, attachment.unencoded_filename) path = folder_names.empty? ? attachment.filename : File.join(folder_names, attachment.unencoded_filename)
if add_attachment_to_zip(attachment, zipfile, path) @files_added = false unless add_attachment_to_zip(attachment, zipfile, path)
@files_added = true
end
end end
folder.active_sub_folders.select{|f| !@user || f.grants_right?(@user, nil, :read_contents)}.each do |sub_folder| folder.active_sub_folders.select{|f| !@user || f.grants_right?(@user, nil, :read_contents)}.each do |sub_folder|
new_names = Array.new(folder_names) << sub_folder.name new_names = Array.new(folder_names) << sub_folder.name

12
spec/lib/content_zipper_spec.rb
View File

@ -47,5 +47,17 @@ describe ContentZipper do
end end
names.sort.should == ['visible.png', 'visible/sub-vis.png'] names.sort.should == ['visible.png', 'visible/sub-vis.png']
end end
it "should not error on empty folders" do
course_with_student(:active_all => true)
folder = Folder.root_folders(@course).first
attachment = Attachment.new(:display_name => 'my_download.zip')
attachment.user_id = @user.id
attachment.workflow_state = 'to_be_zipped'
attachment.context = folder
attachment.save!
ContentZipper.process_attachment(attachment, @user)
attachment.workflow_state.should == 'zipped'
end
end end
end end