web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add timeout when downloading a file in drive export

Browse Source
This commit is contained in:
yflory
2018-10-23 14:22:18 +02:00
parent 3c99302c32
commit d748620129
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
www/settings/make-backup.js
View File

@@ -65,6 +65,32 @@ define([
ctx.sem.take(function (give) {
var g = give();
if (ctx.stop) { return; }
var to;
var done = function () {
if (ctx.stop) { return; }
if (to) { clearTimeout(to); }
//setTimeout(g, 2000);
g();
w();
ctx.done++;
ctx.updateProgress('download', {max: ctx.max, current: ctx.done});
};
var error = function (err) {
if (ctx.stop) { return; }
done();
return void ctx.errors.push({
error: err,
data: fData
});
};
to = setTimeout(function () {
error('TIMEOUT');
}, 60000);
setTimeout(function () {
if (ctx.stop) { return; }
var opts = {
@@ -73,23 +99,6 @@ define([
var rawName = fData.filename || fData.title || 'File';
console.log(rawName);
var done = function () {
if (ctx.stop) { return; }
//setTimeout(g, 2000);
g();
w();
ctx.done++;
ctx.updateProgress('download', {max: ctx.max, current: ctx.done});
};
var error = function (err) {
if (ctx.stop) { return; }
done();
return void ctx.errors.push({
error: err,
data: fData
});
};
// Pads (pad,code,slide,kanban,poll,...)
var todoPad = function () {
ctx.get({