clean up

oasis-tcs · Sep 17, 2024 · 82473fa · 82473fa
1 parent 820f5cf
commit 82473fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/lib/iterator.js b/lib/iterator.js
@@ -13,12 +13,17 @@ module.exports = function (callback) {
           const meta = yaml.load(
             fs.readFileSync(`${__dirname}/../${doc.name}/${metaname}`),
           );
-          const name =
+          meta.name =
             metaname === "meta.yaml" || !meta.dirname ? doc.name : meta.dirname;
-          callback(doc.name, name, metaname.substring(0, metaname.length - 5), {
-            ...metameta,
-            ...meta,
-          });
+          callback(
+            doc.name,
+            meta.name,
+            metaname.substring(0, metaname.length - 5),
+            {
+              ...metameta,
+              ...meta,
+            },
+          );
         });
     }
   });

diff --git a/lib/number.js b/lib/number.js
@@ -30,7 +30,7 @@ class Number {
       .sort(compareSectionNumbers);
     this.meta = meta;
     this.meta["pandoc-version"] = pandoc;
-    builders[meta.dirname || dir.match(/[^\\/]*$/)] = this;
+    if (meta.name) builders[meta.name] = this;
   }
 
   secno(type) {

diff --git a/lib/server.js b/lib/server.js
@@ -47,7 +47,7 @@ const app = express()
       var number = new Number(
         `${__dirname}/../${req.params.doc}`,
         req.query.variant,
-        { ...metameta, ...meta },
+        { ...metameta, ...meta, name: meta.dirname || req.params.doc },
       );
       delete req.query.variant;
       res.type("html");