file server should order filenames (denoland/deno_std#511)

Original: denoland/deno_std@1365d28
ry · Jun 22, 2019 · cd7ed28 · cd7ed28
1 parent a7dbd39
commit cd7ed28
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/http/file_server.ts b/http/file_server.ts
@@ -145,8 +145,12 @@ async function serveDir(
   dirPath: string,
   dirName: string
 ): Promise<Response> {
+  interface ListItem {
+    name: string;
+    template: string;
+  }
   // dirname has no prefix
-  const listEntry: string[] = [];
+  const listEntry: ListItem[] = [];
   const fileInfos = await readDir(dirPath);
   for (const info of fileInfos) {
     let fn = dirPath + "/" + info.name;
@@ -159,21 +163,29 @@ async function serveDir(
     try {
       mode = (await stat(fn)).mode;
     } catch (e) {}
-    listEntry.push(
-      createDirEntryDisplay(
+    listEntry.push({
+      name: info.name,
+      template: createDirEntryDisplay(
         info.name,
         fn.replace(currentDir, ""),
         info.isFile() ? info.len : null,
         mode,
         info.isDirectory()
       )
-    );
+    });
   }
 
   const page = new TextEncoder().encode(
-    dirViewerTemplate
-      .replace("<%DIRNAME%>", dirName + "/")
-      .replace("<%CONTENTS%>", listEntry.join(""))
+    dirViewerTemplate.replace("<%DIRNAME%>", dirName + "/").replace(
+      "<%CONTENTS%>",
+      listEntry
+        .sort(
+          (a, b): number =>
+            a.name.toLowerCase() > b.name.toLowerCase() ? 1 : -1
+        )
+        .map((v): string => v.template)
+        .join("")
+    )
   );
 
   const headers = new Headers();