Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
This commit is contained in:
commit
536c33895f
|
@ -177,11 +177,9 @@ OC.Upload = {
|
||||||
checkExistingFiles: function (selection, callbacks) {
|
checkExistingFiles: function (selection, callbacks) {
|
||||||
// TODO check filelist before uploading and show dialog on conflicts, use callbacks
|
// TODO check filelist before uploading and show dialog on conflicts, use callbacks
|
||||||
callbacks.onNoConflicts(selection);
|
callbacks.onNoConflicts(selection);
|
||||||
}
|
},
|
||||||
};
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
|
|
||||||
|
init: function() {
|
||||||
if ( $('#file_upload_start').exists() ) {
|
if ( $('#file_upload_start').exists() ) {
|
||||||
|
|
||||||
var file_upload_param = {
|
var file_upload_param = {
|
||||||
|
@ -208,6 +206,7 @@ $(document).ready(function() {
|
||||||
add: function(e, data) {
|
add: function(e, data) {
|
||||||
OC.Upload.log('add', e, data);
|
OC.Upload.log('add', e, data);
|
||||||
var that = $(this);
|
var that = $(this);
|
||||||
|
var freeSpace;
|
||||||
|
|
||||||
// we need to collect all data upload objects before starting the upload so we can check their existence
|
// we need to collect all data upload objects before starting the upload so we can check their existence
|
||||||
// and set individual conflict actions. unfortunately there is only one variable that we can use to identify
|
// and set individual conflict actions. unfortunately there is only one variable that we can use to identify
|
||||||
|
@ -263,7 +262,8 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// check free space
|
// check free space
|
||||||
if (selection.totalBytes > $('#free_space').val()) {
|
freeSpace = $('#free_space').val();
|
||||||
|
if (freeSpace >= 0 && selection.totalBytes > freeSpace) {
|
||||||
data.textStatus = 'notenoughspace';
|
data.textStatus = 'notenoughspace';
|
||||||
data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
|
data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
|
||||||
'size1': humanFileSize(selection.totalBytes),
|
'size1': humanFileSize(selection.totalBytes),
|
||||||
|
@ -722,4 +722,11 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
window.file_upload_param = file_upload_param;
|
window.file_upload_param = file_upload_param;
|
||||||
|
return file_upload_param;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
OC.Upload.init();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,127 @@
|
||||||
|
/**
|
||||||
|
* ownCloud
|
||||||
|
*
|
||||||
|
* @author Vincent Petry
|
||||||
|
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public
|
||||||
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* global OC */
|
||||||
|
describe('OC.Upload tests', function() {
|
||||||
|
var $dummyUploader;
|
||||||
|
var testFile;
|
||||||
|
|
||||||
|
beforeEach(function() {
|
||||||
|
testFile = {
|
||||||
|
name: 'test.txt',
|
||||||
|
size: 5000, // 5 KB
|
||||||
|
type: 'text/plain',
|
||||||
|
lastModifiedDate: new Date()
|
||||||
|
};
|
||||||
|
// need a dummy button because file-upload checks on it
|
||||||
|
$('#testArea').append(
|
||||||
|
'<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' +
|
||||||
|
'<input type="hidden" id="upload_limit" name="upload_limit" value="10000000">' + // 10 MB
|
||||||
|
'<input type="hidden" id="free_space" name="free_space" value="50000000">' // 50 MB
|
||||||
|
);
|
||||||
|
$dummyUploader = $('#file_upload_start');
|
||||||
|
});
|
||||||
|
afterEach(function() {
|
||||||
|
delete window.file_upload_param;
|
||||||
|
$dummyUploader = undefined;
|
||||||
|
});
|
||||||
|
describe('Adding files for upload', function() {
|
||||||
|
var params;
|
||||||
|
var failStub;
|
||||||
|
|
||||||
|
beforeEach(function() {
|
||||||
|
params = OC.Upload.init();
|
||||||
|
failStub = sinon.stub();
|
||||||
|
$dummyUploader.on('fileuploadfail', failStub);
|
||||||
|
});
|
||||||
|
afterEach(function() {
|
||||||
|
params = undefined;
|
||||||
|
failStub = undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add file for upload
|
||||||
|
* @param file file data
|
||||||
|
*/
|
||||||
|
function addFile(file) {
|
||||||
|
return params.add.call(
|
||||||
|
$dummyUploader[0],
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
originalFiles: {},
|
||||||
|
files: [file]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
it('adds file when size is below limits', function() {
|
||||||
|
var result = addFile(testFile);
|
||||||
|
expect(result).toEqual(true);
|
||||||
|
});
|
||||||
|
it('adds file when free space is unknown', function() {
|
||||||
|
var result;
|
||||||
|
$('#free_space').val(-2);
|
||||||
|
|
||||||
|
result = addFile(testFile);
|
||||||
|
|
||||||
|
expect(result).toEqual(true);
|
||||||
|
expect(failStub.notCalled).toEqual(true);
|
||||||
|
});
|
||||||
|
it('does not add file if it exceeds upload limit', function() {
|
||||||
|
var result;
|
||||||
|
$('#upload_limit').val(1000);
|
||||||
|
|
||||||
|
result = addFile(testFile);
|
||||||
|
|
||||||
|
expect(result).toEqual(false);
|
||||||
|
expect(failStub.calledOnce).toEqual(true);
|
||||||
|
expect(failStub.getCall(0).args[1].textStatus).toEqual('sizeexceedlimit');
|
||||||
|
expect(failStub.getCall(0).args[1].errorThrown).toEqual(
|
||||||
|
'Total file size 5 kB exceeds upload limit 1000 B'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
it('does not add file if it exceeds free space', function() {
|
||||||
|
var result;
|
||||||
|
$('#free_space').val(1000);
|
||||||
|
|
||||||
|
result = addFile(testFile);
|
||||||
|
|
||||||
|
expect(result).toEqual(false);
|
||||||
|
expect(failStub.calledOnce).toEqual(true);
|
||||||
|
expect(failStub.getCall(0).args[1].textStatus).toEqual('notenoughspace');
|
||||||
|
expect(failStub.getCall(0).args[1].errorThrown).toEqual(
|
||||||
|
'Not enough free space, you are uploading 5 kB but only 1000 B is left'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
it('does not add file if it has invalid characters', function() {
|
||||||
|
var result;
|
||||||
|
testFile.name = 'stars*stars.txt';
|
||||||
|
|
||||||
|
result = addFile(testFile);
|
||||||
|
|
||||||
|
expect(result).toEqual(false);
|
||||||
|
expect(failStub.calledOnce).toEqual(true);
|
||||||
|
expect(failStub.getCall(0).args[1].textStatus).toEqual('invalidcharacters');
|
||||||
|
expect(failStub.getCall(0).args[1].errorThrown.substr(0, 12)).toEqual(
|
||||||
|
'Invalid name'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -68,9 +68,14 @@ window.oc_defaults = {};
|
||||||
// global setup for all tests
|
// global setup for all tests
|
||||||
(function setupTests() {
|
(function setupTests() {
|
||||||
var fakeServer = null,
|
var fakeServer = null,
|
||||||
|
$testArea = null,
|
||||||
routesRequestStub;
|
routesRequestStub;
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
|
// test area for elements that need absolute selector access or measure widths/heights
|
||||||
|
// which wouldn't work for detached or hidden elements
|
||||||
|
$testArea = $('<div id="testArea" style="position: absolute; width: 1280px; height: 800px; top: -3000px; left: -3000px;"></div>');
|
||||||
|
$('body').append($testArea);
|
||||||
// enforce fake XHR, tests should not depend on the server and
|
// enforce fake XHR, tests should not depend on the server and
|
||||||
// must use fake responses for expected calls
|
// must use fake responses for expected calls
|
||||||
fakeServer = sinon.fakeServer.create();
|
fakeServer = sinon.fakeServer.create();
|
||||||
|
@ -92,6 +97,8 @@ window.oc_defaults = {};
|
||||||
// uncomment this to log requests
|
// uncomment this to log requests
|
||||||
// console.log(window.fakeServer.requests);
|
// console.log(window.fakeServer.requests);
|
||||||
fakeServer.restore();
|
fakeServer.restore();
|
||||||
|
|
||||||
|
$testArea.remove();
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
|
@ -839,7 +839,7 @@ class OC_Helper {
|
||||||
* @return int number of bytes representing
|
* @return int number of bytes representing
|
||||||
*/
|
*/
|
||||||
public static function maxUploadFilesize($dir, $freeSpace = null) {
|
public static function maxUploadFilesize($dir, $freeSpace = null) {
|
||||||
if (is_null($freeSpace)){
|
if (is_null($freeSpace) || $freeSpace < 0){
|
||||||
$freeSpace = self::freeSpace($dir);
|
$freeSpace = self::freeSpace($dir);
|
||||||
}
|
}
|
||||||
return min($freeSpace, self::uploadLimit());
|
return min($freeSpace, self::uploadLimit());
|
||||||
|
|
Loading…
Reference in New Issue