Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check extensions on a directory before redirecting #107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check extensions on a directory before redirecting #107

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c3f44
Check extensions on a directory before redirecting
Apr 5, 2016
7ab28ae
Fixed up code and tests
Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,14 +612,16 @@ SendStream.prototype.sendFile = function sendFile(path) {

debug('stat "%s"', path);
fs.stat(path, function onstat(err, stat) {
if (err && err.code === 'ENOENT'
var isDirectory = stat && stat.isDirectory();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stat will be undefined if there's an err.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's why I prefixed it with stat &&. That's idiomatic, right?

if ((err && err.code === 'ENOENT'
&& !extname(path)
&& path[path.length - 1] !== sep) {
// not found, check extensions
&& path[path.length - 1] !== sep) ||
isDirectory) {
// not found or is directory, check extensions first
return next(err)
}
if (err) return self.onStatError(err)
if (stat.isDirectory()) return self.redirect(self.path)
if (isDirectory) return self.redirect(self.path)
self.emit('file', path, stat)
self.send(path, stat)
})
Expand Down