Skip to content

cleanup show-dir, fix node version showing as "undefined" #941

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

Merged
jelveh merged 1 commit into from
Jan 8, 2026
+15 −11
Merged

cleanup show-dir, fix node version showing as "undefined" #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions lib/core/show-dir/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ module.exports = (opts) => {
res.setHeader('etag', etag(stat, weakEtags));
res.setHeader('last-modified', (new Date(stat.mtime)).toUTCString());
res.setHeader('cache-control', cache);

// A step before render() is called to gives items additional
// information so that render() can deliver the best user experience
// possible.
function process(dirs, renderFiles, lolwuts) {
function prerender(dirs, renderFiles, errs) {
const filenamesThatExist = new Set();

// Putting filenames in a set first keeps us in O(n) time complexity
Expand All @@ -87,7 +87,7 @@ module.exports = (opts) => {
const renderOptions = {};
renderFiles[i] = [name, stat, renderOptions];
}

// Set render options for compressed files
for (const [name, _stat, renderOptions] of renderFiles) {
if (
Expand Down Expand Up @@ -115,10 +115,10 @@ module.exports = (opts) => {
renderOptions.uncompressedName = uncompressedName;
}
}
render(dirs, renderFiles, lolwuts);
render(dirs, renderFiles, errs);
}

function render(dirs, renderFiles, lolwuts) {
function render(dirs, renderFiles, errs) {
// each entry in the array is a [name, stat] tuple

let html = `${[
Expand Down Expand Up @@ -150,7 +150,7 @@ module.exports = (opts) => {
// Handle compressed files with uncompressed names
let displayNameHTML;
let fileSize = sizeToString(file[1], humanReadable, si);

if (file[2] && file[2].uncompressedName) {
// This is a compressed file, show both names with separate links
const uncompressedName = he.encode(file[2].uncompressedName);
Expand Down Expand Up @@ -184,7 +184,7 @@ module.exports = (opts) => {

dirs.sort((a, b) => a[0].toString().localeCompare(b[0].toString())).forEach(writeRow);
renderFiles.sort((a, b) => a.toString().localeCompare(b.toString())).forEach(writeRow);
lolwuts.sort((a, b) => a[0].toString().localeCompare(b[0].toString())).forEach(writeRow);
errs.sort((a, b) => a[0].toString().localeCompare(b[0].toString())).forEach(writeRow);

html += '</table>\n';
html += `<br><address>Node.js ${
Expand All @@ -201,7 +201,7 @@ module.exports = (opts) => {
}
}

sortFiles(dir, files, (lolwuts, dirs, sortedFiles) => {
sortFiles(dir, files, (errs, dirs, sortedFiles) => {
// It's possible to get stat errors for all sorts of reasons here.
// Unfortunately, our two choices are to either bail completely,
// or just truck along as though everything's cool. In this case,
Expand All @@ -222,10 +222,10 @@ module.exports = (opts) => {
return;
}
dirs.unshift(['..', s]);
process(dirs, sortedFiles, lolwuts);
prerender(dirs, sortedFiles, errs);
});
} else {
process(dirs, sortedFiles, lolwuts);
prerender(dirs, sortedFiles, errs);
}
});
});
Expand Down
4 changes: 4 additions & 0 deletions lib/core/show-dir/last-modified-to-string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
'use strict';

module.exports = function lastModifiedToString(stat) {
if (!stat.mtime) {
// stat error (eg, broken symlink)
return 'Unknown Date';
}
const t = new Date(stat.mtime);
return (('0' + (t.getDate())).slice(-2) + '-' +
t.toLocaleString('default', { month: 'short' }) + '-' +
Expand Down
2 changes: 1 addition & 1 deletion lib/core/show-dir/perms-to-string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module.exports = function permsToString(stat) {
if (!stat.isDirectory || !stat.mode) {
return '???!!!???';
return '????!!!???';
}

const dir = stat.isDirectory() ? 'd' : '-';
Expand Down
Loading