|
|
|
@ -60,9 +60,10 @@ module ZipService
|
|
|
|
|
bid_homework_path << file_name
|
|
|
|
|
digests << Trustie::Utils.digest(file_name)
|
|
|
|
|
end
|
|
|
|
|
# file_name = "#{Time.now.strftime("%Y%m%d%H:%M:%S").to_s}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_name}" + ".pdf"
|
|
|
|
|
out_file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{exercise.course_id}-#{exercise.exercise_name}.zip"
|
|
|
|
|
out_file_name.gsub!(" ", "-").gsub!("/", "_")
|
|
|
|
|
out_file = find_or_pack(exercise.id, exercise.user_id, digests.sort){
|
|
|
|
|
zipping("#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{exercise.course_id}-#{exercise.exercise_name}.zip",
|
|
|
|
|
zipping(out_file_name,
|
|
|
|
|
bid_homework_path, OUTPUT_FOLDER)
|
|
|
|
|
}
|
|
|
|
|
[{files:[out_file.file_path], count: 1, index: 1,
|
|
|
|
@ -89,8 +90,10 @@ module ZipService
|
|
|
|
|
digests << Trustie::Utils.digest(file_name)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
out_file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{homework_common.course_id}-#{homework_common.name}.zip"
|
|
|
|
|
out_file_name.gsub!(" ", "-").gsub!("/", "_")
|
|
|
|
|
out_file = find_or_pack(homework_common.id, homework_common.user_id, digests.sort){
|
|
|
|
|
zipping("#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{homework_common.course_id}-#{homework_common.name}.zip",
|
|
|
|
|
zipping(out_file_name,
|
|
|
|
|
bid_homework_path, OUTPUT_FOLDER)
|
|
|
|
|
}
|
|
|
|
|
[{files:[out_file.file_path], count: 1, index: 1,
|
|
|
|
|