Baguette/filestoraged
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send the number of the next chunk to be uploaded.

Browse Source
This commit is contained in:
Karchnu 2020-06-08 20:03:17 +02:00
parent 60b9d9fa01
commit 854f383172
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/requests/errors.cr
View File

@ -20,9 +20,9 @@ class FileStorage::Errors
property mid : String property mid : String
property reason = "Chunk already present" property reason = "Chunk already present"
property filedigest : String property filedigest : String
property chunk : Chunk property next_chunk : Int32
def initialize(@mid, @filedigest, @chunk) def initialize(@mid, @filedigest, @next_chunk)
end end
end end
FileStorage.errors << ChunkAlreadyUploaded FileStorage.errors << ChunkAlreadyUploaded

5
src/server/storage.cr
View File

@ -105,8 +105,9 @@ class FileStorage::Storage
if transfer_info.chunks.select do |v| v == chunk_number end.size == 1 if transfer_info.chunks.select do |v| v == chunk_number end.size == 1
write_a_chunk file_digest, chunk_size, chunk_number, data write_a_chunk file_digest, chunk_size, chunk_number, data
else else
# TODO: send the remaining chunks to upload. # Send the next remaining chunk to upload.
raise "non existent chunk or already uploaded" next_chunk = transfer_info.chunks.sort.first
return FileStorage::Errors::ChunkAlreadyUploaded.new mid, file_digest, next_chunk
end end
remove_chunk_from_db transfer_info, chunk_number remove_chunk_from_db transfer_info, chunk_number