fix omitted base.css

replace "summary.md" to "readme.md"
add compasibility
2023-02-15 00:04:09 +09:00 · 2023-02-15 00:02:58 +09:00 · 2023-02-14 21:42:56 +09:00
10 changed files with 29 additions and 13 deletions
--- a/islands/DirList.tsx
+++ b/islands/DirList.tsx
@ -37,12 +37,18 @@ interface DirListProps {
 }
 const natsortCompare = natsort();

+function toSorted<T>(arr: T[], compareFn: (a:T,b:T) => number): T[]{
+  const ret = Array.from(arr);
+  ret.sort(compareFn);
+  return ret;
+}
+
 export function DirList(props: DirListProps) {
  const data = props;
  const [files, setFiles] = useState(
-    data.files.toSorted(
+    toSorted(data.files,(
      (a,b)=> natsortCompare(a.name,b.name)
-      )
+      ))
    );

  return (
--- a/routes/dir/[...path].tsx
+++ b/routes/dir/[...path].tsx
@ -179,7 +179,6 @@ export default function DirLists(props: PageProps<DirOrFileProps>) {
    cover = searchFiles(data.files, (f) => isImageFile(f.name));
    index = searchFiles(data.files, (f) => f.name === "index.html");
    const contentFilenameCandidate = [
-      "SUMMARY.md",
      "README.md",
      "readme.md",
      "README.txt",
--- a/routes/doc/index.tsx
+++ b/routes/doc/index.tsx
@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head, asset } from "$fresh/runtime.ts";
 import { HandlerContext, Handlers, PageProps, Status } from "$fresh/server.ts";
 import DocSearch from "../../islands/DocSearch.tsx";
 import { Doc } from "../../src/collect.ts";
@ -24,6 +24,7 @@ export default function Docs(props: PageProps<{ docs: Doc[] }>) {
    <>
      <Head>
        <title>Simple file server - Doc</title>
+        <link rel="stylesheet" href={asset("/base.css")} />
      </Head>
      <div class="p-4 mx-auto max-w-screen-md">
        <DocSearch docs={docs}></DocSearch>
--- a/src/collect.ts
+++ b/src/collect.ts
@ -24,6 +24,13 @@ export interface DocCollectorOptions {
  dropContent?: boolean;
 }

+function isDESCFile(filename: string): boolean {
+  const filenameUpperCase = filename.toUpperCase();
+  return (filenameUpperCase === "README.MD" ||
+    filenameUpperCase === "DESCRIPTION.MD")
+}
+
+
 export class DocCollector {
  private doc_map: Map<string, Doc>;
  private options: DocCollectorOptions;
@ -59,12 +66,15 @@ export class DocCollector {
      fileList.push(entry);
    }

-    if (fileList.some((entry) => entry.name === "SUMMARY.md")) {
-      const { content, metadata } = await readMarkdownDoc(
-        join(path, "SUMMARY.md"),
-      );
+    const entryName = fileList.find(x => {
+      return isDESCFile(x.name) && x.isFile
+    }
+    );
+    if (entryName) {
+      const readmePath = join(path, entryName.name);
+      const { content, metadata } = await readMarkdownDoc(readmePath);
      this.setDoc({
-        path: join(path, "SUMMARY.md"),
+        path: readmePath,
        content: content,
        attributes: metadata,
      });
@ -123,9 +133,9 @@ export class DocCollector {
    };
  }
  async watchDir(path: string, {
-    onRemove = (_path: string) => {},
-    onAdd = (_doc: Doc) => {},
-    onChange = (_doc: Doc) => {},
+    onRemove = (_path: string) => { },
+    onAdd = (_doc: Doc) => { },
+    onChange = (_doc: Doc) => { },
    abort = undefined,
  }: {
    onRemove?: (path: string) => void | Promise<void>;
@ -152,7 +162,7 @@ export class DocCollector {
      for (const path of event.paths) {
        const relpath = relative(Deno.cwd(), path);
        const filename = basename(relpath);
-        if (filename === "SUMMARY.md") {
+        if (isDESCFile(filename)) {
          if (event.kind === "remove") {
            this.doc_map.delete(relpath);
            await onRemove(relpath);
--- a/test_data/d/SUMMARY.md
+++ b/test_data/d/SUMMARY.md
--- a/test_data/e/SUMMARY.md
+++ b/test_data/e/SUMMARY.md
--- a/test_data/f/SUMMARY.md
+++ b/test_data/f/SUMMARY.md
--- a/test_data/h#1/SUMMARY.md
+++ b/test_data/h#1/SUMMARY.md
--- a/test_data/sample/readme.md
+++ b/test_data/sample/readme.md
--- a/test_data/한글/SUMMARY.md
+++ b/test_data/한글/SUMMARY.md
Author	SHA1	Message	Date
monoid	c53ca6440c	fix omitted base.css	2023-02-15 00:04:09 +09:00
monoid	84fb327256	replace "summary.md" to "readme.md"	2023-02-15 00:02:58 +09:00
monoid	5e518a2ad3	add compasibility	2023-02-14 21:42:56 +09:00