186526/unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use req.filename directly

Browse Source
This commit is contained in:
MICHAEL JACKSON 2017-08-26 18:08:46 -07:00
parent e33d49a8cb
commit 30de36aa40
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/middleware/fetchFile.js
View File

@ -123,7 +123,7 @@ function fetchFile(req, res, next) {
'Cache-Tag': 'redirect,module-redirect' 'Cache-Tag': 'redirect,module-redirect'
}).redirect(302, createPackageURL(req.packageName, req.packageVersion, filename, req.search)) }).redirect(302, createPackageURL(req.packageName, req.packageVersion, filename, req.search))
} else { } else {
req.file = filename req.filename = filename
req.stats = stats req.stats = stats
next() next()
} }

6
server/middleware/serveFile.js
View File

@ -35,7 +35,7 @@ const FileTransforms = {
*/ */
function serveFile(req, res, next) { function serveFile(req, res, next) {
if (req.query.meta != null) { if (req.query.meta != null) {
getMetadata(req.packageDir, req.file, req.stats, MaximumDepth, function (error, metadata) { getMetadata(req.packageDir, req.filename, req.stats, MaximumDepth, function (error, metadata) {
if (error) { if (error) {
console.error(error) console.error(error)
res.status(500).type('text').send(`Cannot generate metadata for ${req.packageSpec}${req.filename}`) res.status(500).type('text').send(`Cannot generate metadata for ${req.packageSpec}${req.filename}`)
@ -48,7 +48,7 @@ function serveFile(req, res, next) {
} }
}) })
} else if (req.stats.isFile()) { } else if (req.stats.isFile()) {
const file = path.join(req.packageDir, req.file) const file = path.join(req.packageDir, req.filename)
let contentType = getFileContentType(file) let contentType = getFileContentType(file)
@ -90,7 +90,7 @@ function serveFile(req, res, next) {
}) })
} }
} else if (AutoIndex && req.stats.isDirectory()) { } else if (AutoIndex && req.stats.isDirectory()) {
getIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.file, function (error, html) { getIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.filename, function (error, html) {
if (error) { if (error) {
console.error(error) console.error(error)
res.status(500).type('text').send(`Cannot generate index page for ${req.packageSpec}${req.filename}`) res.status(500).type('text').send(`Cannot generate index page for ${req.packageSpec}${req.filename}`)