diff --git a/app/controllers/v1/learning_objects/chunks_controller.rb b/app/controllers/v1/learning_objects/chunks_controller.rb index b82de243c5fe91ad65b9d32d283dfd37e671eca1..45587b30e30a9ab098052d30e35b672f477336d1 100644 --- a/app/controllers/v1/learning_objects/chunks_controller.rb +++ b/app/controllers/v1/learning_objects/chunks_controller.rb @@ -30,7 +30,17 @@ class V1::LearningObjects::ChunksController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def chunks_params - params.permit(:id, :file, :flowChunkNumber, :flowTotalChunks, :flowFilename, :flowIdentifier) + params.permit( + :id, + :file, + :_chunkNumber, + :_totalChunks, + :_chunkFilename, + :_chunkIdentifier, + :_chunkSize, + :_currentChunkSize, + :_totalSize + ) end def post_file! @@ -68,37 +78,37 @@ class V1::LearningObjects::ChunksController < ApplicationController def valid_mime_type? mime_types = @learning_object.object_type.mime_types.map(&:extension) return true if mime_types.empty? - mime_types.include? chunks_params[:flowFilename].split('.').last + mime_types.include? chunks_params[:_chunkFilename].split('.').last end ## # Determine if this is the last chunk based in parts count. def last_chunk? - Dir["#{chunk_file_directory}/#{chunks_params[:flowFilename]}.part*"].count == chunks_params[:flowTotalChunks].to_i + Dir["#{chunk_file_directory}/#{chunks_params[:_chunkFilename]}.part*"].count == chunks_params[:_totalChunks].to_i end ## - # ./tmp/flow/abc-123/upload.txt.part1 + # ./tmp/file-chunks/abc-123/upload.txt.part1 def chunk_file_path - File.join(chunk_file_directory, "#{chunks_params[:flowFilename]}.part#{chunks_params[:flowChunkNumber]}") + File.join(chunk_file_directory, "#{chunks_params[:_chunkFilename]}.part#{chunks_params[:_chunkNumber]}") end ## - # ./tmp/flow/abc-123 + # ./tmp/file-chunks/abc-123 def chunk_file_directory - File.join('tmp', 'flow', chunks_params[:flowIdentifier]) + File.join('tmp', 'file-chunks', chunks_params[:_chunkIdentifier]) end ## - # /tmp/flow/upload.txt + # /tmp/file-chunks/upload.txt def final_file_path - File.join(final_file_directory, chunks_params[:flowFilename]) + File.join(final_file_directory, chunks_params[:_chunkFilename]) end ## - # /tmp/flow + # /tmp/file-chunks def final_file_directory - File.join('tmp', 'flow') + File.join('tmp', 'file-chunks') end ##