From 2895a6709cc568bebf3e5cadb0dba1f3a7888f1a Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Thu, 28 Feb 2019 02:38:49 +0900 Subject: [PATCH 1/7] bugfix : Cannot res.send() in on End event bug fix : https://github.com/aguidrevitch/jquery-file-upload-middleware/issues/73 --- lib/filehandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filehandler.js b/lib/filehandler.js index e7e227a..00ce1e4 100644 --- a/lib/filehandler.js +++ b/lib/filehandler.js @@ -10,7 +10,7 @@ module.exports = function (middleware, options) { if (redirect) { files = {files: result}; res.redirect(redirect.replace(/%s/, encodeURIComponent(JSON.stringify(files)))); - } else { + } else if (!res.finished){ res.set({ 'Content-Type': (req.headers.accept || '').indexOf('application/json') !== -1 ? 'application/json' From 0eafe854088e2bc487f8e5b6e5dc40399a6a6c03 Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Fri, 4 Mar 2022 13:29:21 +0900 Subject: [PATCH 2/7] =?UTF-8?q?file=E3=81=AE=E3=83=91=E3=83=A9=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E5=90=8D=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BC=B4?= =?UTF-8?q?=E3=81=86=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/fileinfo.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/fileinfo.js b/lib/fileinfo.js index 873bcd0..c69e0ee 100644 --- a/lib/fileinfo.js +++ b/lib/fileinfo.js @@ -4,11 +4,18 @@ var fs = require('fs'), module.exports = function (options) { var FileInfo = function (file) { - this.name = file.name; - this.originalName = file.name; +// this.name = file.name; +// this.originalName = file.name; +// this.size = file.size; +// this.type = file.type; +// this.deleteType = 'DELETE'; + this.name = file.originalFilename; + this.originalName = file.originalFilename; this.size = file.size; - this.type = file.type; + this.type = file.mimetype; this.deleteType = 'DELETE'; + this.path = file.filepath; + file.path = file.filepath; }; FileInfo.prototype.validate = function () { @@ -39,4 +46,4 @@ module.exports = function (options) { } return FileInfo; -}; \ No newline at end of file +}; From cacc43f814908bbe84193f4aa3660bc989ef62fb Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Wed, 11 May 2022 12:49:11 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=8B=E3=81=AB=E6=88=BB=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/fileinfo.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/fileinfo.js b/lib/fileinfo.js index c69e0ee..e2f5c69 100644 --- a/lib/fileinfo.js +++ b/lib/fileinfo.js @@ -4,18 +4,11 @@ var fs = require('fs'), module.exports = function (options) { var FileInfo = function (file) { -// this.name = file.name; -// this.originalName = file.name; -// this.size = file.size; -// this.type = file.type; -// this.deleteType = 'DELETE'; - this.name = file.originalFilename; - this.originalName = file.originalFilename; - this.size = file.size; - this.type = file.mimetype; - this.deleteType = 'DELETE'; - this.path = file.filepath; - file.path = file.filepath; + this.name = file.name; + this.originalName = file.name; + this.size = file.size; + this.type = file.type; + this.deleteType = 'DELETE'; }; FileInfo.prototype.validate = function () { From 3cb3d93d3ceff82602968f853af2c48c840d0283 Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Thu, 1 Aug 2024 17:19:21 +0900 Subject: [PATCH 4/7] Update uploadhandler.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upload file上限更新 --- lib/uploadhandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uploadhandler.js b/lib/uploadhandler.js index 070f018..b7e11e9 100644 --- a/lib/uploadhandler.js +++ b/lib/uploadhandler.js @@ -65,7 +65,7 @@ module.exports = function (options) { UploadHandler.prototype.post = function () { var self = this, - form = new formidable.IncomingForm(), + form = new formidable.IncomingForm({ maxFileSize: 10000 * 1024 * 1024 }), tmpFiles = [], files = [], map = {}, From 18b35e054e536e892a53b259ac7a57d1709c6c94 Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Fri, 2 Aug 2024 11:50:07 +0900 Subject: [PATCH 5/7] Update package.json "formidable": "^1.2.2" --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc11e0c..b146bc9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "version": "0.1.7", "dependencies": { - "formidable": ">=1.0.11", + "formidable": "^1.2.2", "imagemagick": ">=0.1.2", "lodash": ">= 0.9.2", "mkdirp": ">= 0.3.4", From bc18f5048af298d81437ed4bb23079651a3fd4f3 Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Fri, 2 Aug 2024 12:03:23 +0900 Subject: [PATCH 6/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b146bc9..c57e587 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "version": "0.1.7", "dependencies": { - "formidable": "^1.2.2", + "formidable": "1.2.2", "imagemagick": ">=0.1.2", "lodash": ">= 0.9.2", "mkdirp": ">= 0.3.4", From 3665a3f9f858f30eeb52ff3524a989428ad659e6 Mon Sep 17 00:00:00 2001 From: Kanke Yota Date: Fri, 2 Aug 2024 12:38:47 +0900 Subject: [PATCH 7/7] Update uploadhandler.js --- lib/uploadhandler.js | 53 ++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/lib/uploadhandler.js b/lib/uploadhandler.js index b7e11e9..5700d95 100644 --- a/lib/uploadhandler.js +++ b/lib/uploadhandler.js @@ -137,24 +137,49 @@ module.exports = function (options) { } mkdirp(options.uploadDir() + '/', function(err, made) { - fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) { + fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) { + if (!err) { + generatePreviews(); + finish(); + } else { + var is = fs.createReadStream(file.path); + var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name); + is.on('end', function (err) { if (!err) { + fs.unlink(file.path, function (unlinkErr) { + if (unlinkErr) { + console.error(`Error deleting file: ${file.path}`, unlinkErr); + } else { + console.log(`Deleted file: ${file.path}`); + } generatePreviews(); - finish(); - } else { - var is = fs.createReadStream(file.path); - var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name); - is.on('end', function (err) { - if (!err) { - fs.unlink(file.path); - generatePreviews(); - } - finish(); - }); - is.pipe(os); + }); } - }); + finish(); + }); + is.pipe(os); + } + }); }); + // mkdirp(options.uploadDir() + '/', function(err, made) { + // fs.rename(file.path, options.uploadDir() + '/' + fileInfo.name, function (err) { + // if (!err) { + // generatePreviews(); + // finish(); + // } else { + // var is = fs.createReadStream(file.path); + // var os = fs.createWriteStream(options.uploadDir() + '/' + fileInfo.name); + // is.on('end', function (err) { + // if (!err) { + // fs.unlink(file.path); + // generatePreviews(); + // } + // finish(); + // }); + // is.pipe(os); + // } + // }); + // }); } else finish(); });