From 82473fa8ea060daa8e45561950efc2ba113f6b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= Date: Tue, 17 Sep 2024 14:51:53 +0200 Subject: [PATCH] clean up --- lib/iterator.js | 15 ++++++++++----- lib/number.js | 2 +- lib/server.js | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/iterator.js b/lib/iterator.js index f2e8cc8b..f16b3ffb 100644 --- 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 index 426c2920..d90e1228 100644 --- 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 index e2c6a25c..82c9adea 100644 --- 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");