From b8e5df67034ee93c8a44044cf28192c8bebd379a Mon Sep 17 00:00:00 2001 From: welefen Date: Thu, 27 Jul 2017 09:29:07 +0800 Subject: [PATCH] Optimize download method --- lib/extend/context.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/extend/context.js b/lib/extend/context.js index e6523d5f..96117a27 100644 --- a/lib/extend/context.js +++ b/lib/extend/context.js @@ -298,10 +298,12 @@ module.exports = { * @param {String} filepath * @param {String} filename */ - download(filepath, filename) { + download(filepath, filename = path.basename(filepath)) { assert(filepath, 'filepath can not be empty'); - this.type = path.extname(filepath); - filename = filename || path.basename(filepath); + const contentType = this.response.get('Content-Type'); + if (!contentType) { + this.type = path.extname(filename); + } const contentDisposition = this.response.get('Content-Disposition'); if (!contentDisposition) { this.attachment(filename);