add subdirectory support

Hadron67 · Jul 5, 2019 · d6f2021 · d6f2021
1 parent 692349b
commit d6f2021
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -91,6 +91,7 @@ function createMainContext(){
     main.invalidateID = invalidateID;
     main.applyConfig = applyConfig;
     main.initPages = initPages;
+    main.path = p => pathd.join(pathd.join('/', main.config.webRoot || '/'), p);
 
     // Internal variables
     main.logger = logger;

diff --git a/lib/modules/category_manager.js b/lib/modules/category_manager.js
@@ -13,9 +13,9 @@ function indexToPageName(i){
 
 module.exports = params => async (app) => {
     let postArg = {
-        tags: params.tags.path,
-        archive: params.archive.path,
-        category: params.categories.path,
+        tags: app.path(params.tags.path),
+        archive: app.path(params.archive.path),
+        category: app.path(params.categories.path),
     };
 
     let ext = app.ext;
@@ -24,18 +24,20 @@ module.exports = params => async (app) => {
     ext.archive = postArg.archive;
     ext.category = postArg.category;
 
+    params.mainPage.path = app.path(params.mainPage.path);
+
     let mainPage = app.helper.createPaginator(compareDate, arg => app.layouts.page(arg), indexToPageName, params.mainPage.pagesPerPage, params.mainPage.path, {arg: postArg});
-    let archive = app.helper.createPaginator(compareDate, a => app.layouts.archive(a), indexToPageName, params.archive.pagesPerPage, params.archive.path, {arg: postArg});
+    let archive = app.helper.createPaginator(compareDate, a => app.layouts.archive(a), indexToPageName, params.archive.pagesPerPage, postArg.archive, {arg: postArg});
     let tags = app.helper.createTags(
-        params.tags.path,
+        postArg.tags,
         a => app.layouts.tag(a),
         indexToPageName,
         compareDate,
         params.tags.pagesPerPage,
         {arg: postArg}
     );
     let category = app.helper.createCategorizer(
-        params.categories.path,
+        postArg.category,
         a => app.layouts.category(a),
         indexToPageName,
         compareDate,
@@ -66,7 +68,7 @@ module.exports = params => async (app) => {
     };
 
     app.on('init-pages', () => {
-        tags.registerTemplate(path.join(params.tags.path, 'index.html'), a => app.layouts.tagCloud(a), {arg: postArg});
+        tags.registerTemplate(path.join(postArg.tags, 'index.html'), a => app.layouts.tagCloud(a), {arg: postArg});
         category.init();
     });
 }
diff --git a/lib/modules/cname.js b/lib/modules/cname.js
@@ -3,7 +3,7 @@
 module.exports = () => app => {
     app.on('init-pages', () => {
         app.pageRegistry.register({
-            path: '/CNAME',
+            path: app.path('/CNAME'),
             isStatic: false,
             handle(os, cb){
                 os.end(app.config.domain.replace(/^https?:\/\//, ''));

diff --git a/lib/modules/index_generator.js b/lib/modules/index_generator.js
@@ -57,5 +57,5 @@ class Handler {
 module.exports = path => app => {
     // let e = new TextExtractor();
     // app.markdown.on('post-compile', (article, node) => article.text = e.render(node));
-    app.on('init-pages', () => app.pageRegistry.register(new Handler(app, path)));
+    app.on('init-pages', () => app.pageRegistry.register(new Handler(app, app.path(path))));
 }
diff --git a/lib/modules/post.js b/lib/modules/post.js
@@ -24,6 +24,7 @@ async function readPostFiles(dirs){
 
 module.exports = (posts, pathBase) => async (app) => {
     posts = await readPostFiles(posts);
+    pathBase = app.path(pathBase);
     app.on('init-pages', () => {
         posts = posts.map(p => app.markdown.register(app.markdown.dateToPath(pathBase), p));
 

diff --git a/lib/modules/rss.js b/lib/modules/rss.js
@@ -102,6 +102,7 @@ class Handler {
 }
 
 module.exports = params => app => {
+    params.path = app.path(params.path);
     params.limit === void 0 && (params.limit = -1);
     app.ext.rssPath = params.path;
     app.on('init-pages', () => {

diff --git a/lib/modules/staticDir.js b/lib/modules/staticDir.js
@@ -10,11 +10,12 @@ function find(dir){
 
 module.exports = (dir, outDir) => async (app) => {
     let files = await find(dir);
+    outDir = app.path(outDir);
 
     app.on('init-pages', () => {
         for (let file of files){
             let fn = file.toString();
-            app.file.register(path.join('/', outDir, fn), path.join(dir, fn));
+            app.file.register(path.join(outDir, fn), path.join(dir, fn));
         }
     });
     // await Promise.all(config.staticDirs.map(dir => registerStaticDir(app, config.webRoot, dir)));

diff --git a/lib/util/complete.js b/lib/util/complete.js
@@ -6,7 +6,7 @@ function completeURL(main, path){
         return path;
     }
     else {
-        return main.config.domain + pathd.join('/', path);
+        return path.charAt(0) === '/' ? path : main.path(path);
     }
 }
 
@@ -15,7 +15,7 @@ function completeImageURL(main, path){
         return path;
     }
     else {
-        return pathd.join('/', main.config.imagePath, path);
+        return main.path(pathd.join(main.config.imagePath, path));
     }
 }