mirror of
https://github.com/discourse/discourse.git
synced 2024-12-01 13:09:33 -06:00
08e625c446
Uppy and Resumable slice up their chunks differently, which causes a difference in this algorithm. Let's take a 131.6MB file (137951695 bytes) with a 5MB (5242880 bytes) chunk size. For resumable, there are 26 chunks, and uppy there are 27. This is controlled by forceChunkSize in resumable which is false by default. The final chunk size is 6879695 (chunk size + remainder) whereas in uppy it is 1636815 (just remainder). This means that the current condition of uploaded_file_size + current_chunk_size >= total_size is hit twice by uppy, because it uses a more correct number of chunks. This can be solved for both uppy and resumable by checking the _previous_ chunk number * chunk_size as the uploaded_file_size. An example of what is happening before that change, using the current chunk number to calculate uploaded_file_size. chunk 26: resumable: uploaded_file_size (26 * 5242880) + current_chunk_size (6879695) = 143194575 >= total_size (137951695) ? YES chunk 26: uppy: uploaded_file_size (26 * 5242880) + current_chunk_size (5242880) = 141557760 >= total_size (137951695) ? YES chunk 27: uppy: uploaded_file_size (27 * 5242880) + current_chunk_size (1636815) = 143194575 >= total_size (137951695) ? YES An example of what this looks like after the change, using the previous chunk number to calculate uploaded_file_size: chunk 26: resumable: uploaded_file_size (25 * 5242880) + current_chunk_size (6879695) = 137951695 >= total_size (137951695) ? YES chunk 26: uppy: uploaded_file_size (25 * 5242880) + current_chunk_size (5242880) = 136314880 >= total_size (137951695) ? NO chunk 27: uppy: uploaded_file_size (26 * 5242880) + current_chunk_size (1636815) = 137951695 >= total_size (137951695) ? YES |
||
|---|---|---|
| .. | ||
| admin_controller.rb | ||
| api_controller.rb | ||
| backups_controller.rb | ||
| badges_controller.rb | ||
| color_schemes_controller.rb | ||
| dashboard_controller.rb | ||
| email_controller.rb | ||
| email_styles_controller.rb | ||
| email_templates_controller.rb | ||
| embeddable_hosts_controller.rb | ||
| embedding_controller.rb | ||
| emojis_controller.rb | ||
| groups_controller.rb | ||
| impersonate_controller.rb | ||
| permalinks_controller.rb | ||
| plugins_controller.rb | ||
| reports_controller.rb | ||
| robots_txt_controller.rb | ||
| screened_emails_controller.rb | ||
| screened_ip_addresses_controller.rb | ||
| screened_urls_controller.rb | ||
| search_logs_controller.rb | ||
| site_settings_controller.rb | ||
| site_texts_controller.rb | ||
| staff_action_logs_controller.rb | ||
| themes_controller.rb | ||
| user_fields_controller.rb | ||
| users_controller.rb | ||
| versions_controller.rb | ||
| watched_words_controller.rb | ||
| web_hooks_controller.rb | ||