holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing sometimes too small files caused by last chunk being bigger then other chunks

Browse Source
This commit is contained in:
Ralf Becker 2018-12-14 16:21:12 +01:00
parent fc2cd455ca
commit 339819f406
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_file.js
View File

@ -99,7 +99,7 @@ var et2_file = (function(){ "use strict"; return et2_inputWidget.extend(
"name": "Chunk size", "name": "Chunk size",
"type": "integer", "type": "integer",
"default": 1024*1024, "default": 1024*1024,
"description": "Max chunk size, gets set from server-side PHP max_upload_size/2 (must be 2^N)" "description": "Max chunk size, gets set from server-side PHP (max_upload_size-1M)/2" // last chunk can be up to 2*chunk_size!
} }
}, },

24
api/src/Etemplate/Widget/File.php
View File

@ -190,7 +190,7 @@ class File extends Etemplate\Widget
{ {
// check if all the parts present, and create the final destination file // check if all the parts present, and create the final destination file
$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']), $new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
$_POST['resumableChunkSize'], $_POST['resumableTotalSize']); $_POST['resumableTotalSize']);
} }
if( $new_file) { if( $new_file) {
$file['tmp_name'] = $new_file; $file['tmp_name'] = $new_file;
@ -214,22 +214,23 @@ class File extends Etemplate\Widget
* From Resumable samples - http://resumablejs.com/ * From Resumable samples - http://resumablejs.com/
* @param string $temp_dir - the temporary directory holding all the parts of the file * @param string $temp_dir - the temporary directory holding all the parts of the file
* @param string $fileName - the original file name * @param string $fileName - the original file name
* @param string $chunkSize - each chunk size (in bytes)
* @param string $totalSize - original file size (in bytes) * @param string $totalSize - original file size (in bytes)
*/ */
private static function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize) { private static function createFileFromChunks($temp_dir, $fileName, $totalSize) {
// count all the parts of this file // count all the parts of this file
$total_files = 0; $total_files = $sum_size = 0;
foreach(scandir($temp_dir) as $file) { foreach(scandir($temp_dir) as $file) {
if (stripos($file, $fileName) !== false) { if (stripos($file, $fileName) !== false) {
$total_files++; $total_files++;
$sum_size += filesize($temp_dir.'/'.$file);
} }
} }
// check that all the parts are present // check that all the parts are present
// the size of the last part is between chunkSize and 2*$chunkSize // the size of the last part is between chunkSize and 2*$chunkSize
if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) { if ($sum_size >= $totalSize)
{
if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir'])) if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
{ {
$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_'); $new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
@ -341,7 +342,10 @@ class File extends Etemplate\Widget
} }
/** /**
* Set default chunk_size attribute to max_upload_size/2 * Set default chunk_size attribute to (max_upload_size-1M)/2
*
* Last chunk can be 2*chunk_size, therefore we can only set max_upload_size/2
* minus "some" for other transfered fields.
* *
* @param string $cname * @param string $cname
* @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
@ -355,13 +359,7 @@ class File extends Etemplate\Widget
if (!is_numeric($unit)) $upload_max_filesize *= $unit == 'm' ? 1024*1024 : 1024; if (!is_numeric($unit)) $upload_max_filesize *= $unit == 'm' ? 1024*1024 : 1024;
if ($upload_max_filesize > 1024*1024) if ($upload_max_filesize > 1024*1024)
{ {
// resumable chunkSize has to be 2^N self::setElementAttribute($form_name, 'chunk_size', ($upload_max_filesize-1024*1024)/2);
$n = 10;
while(1<<(1+$n) < $upload_max_filesize-1024*1024)
{
$n++;
}
self::setElementAttribute($form_name, 'chunk_size', 1 << $n);
} }
} }
} }