From c4b2d5e0fa3e6fcf5dff745be8cfb2f6a6e6a451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Sat, 26 Mar 2016 19:49:11 +0100
Subject: [PATCH] Also write other rendered types
---
sitegin/nunjucks.js | 2 +-
sitegin/theme.js | 2 +-
sitegin/writeFiles.js | 20 ++++++++++++++++----
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/sitegin/nunjucks.js b/sitegin/nunjucks.js
index 7ad4405c..0a364b95 100644
--- a/sitegin/nunjucks.js
+++ b/sitegin/nunjucks.js
@@ -101,7 +101,7 @@ module.exports = function(data, type) {
//reject(new Error('Error rendering template '+o.file));
reject(err);
}
- resolve({val: val, type: o.type});
+ resolve({content: val, type: o.type});
});
}));
});
diff --git a/sitegin/theme.js b/sitegin/theme.js
index 441c0e19..1b00c187 100644
--- a/sitegin/theme.js
+++ b/sitegin/theme.js
@@ -12,7 +12,7 @@ module.exports = function(obj) {
jobs.run('nunjucks', obj, type)
.then(function(data) {
data.forEach(function(o){
- if(o.type == 'html') obj.content = o.val;
+ if(o.type == 'html') obj.content = o.content;
else {
if(!obj.otherContent) obj.otherContent = [];
obj.otherContent.push(o);
diff --git a/sitegin/writeFiles.js b/sitegin/writeFiles.js
index 295a6fea..786c4c02 100644
--- a/sitegin/writeFiles.js
+++ b/sitegin/writeFiles.js
@@ -8,16 +8,28 @@ module.exports = function(obj) {
var builddir = obj.config.builddir;
var todo = 0;
- var writeFile = function(article) {
- var filename = path.join(builddir,article.file,'index.html');
- mkdirp(path.dirname(filename), function() {
- fs.writeFile(filename, article.content, function(err) {
+ var doWrite = function(file, content) {
+ todo++;
+ mkdirp(path.dirname(file), function() {
+ fs.writeFile(file, content, function(err) {
if(err) reject(err);
todo--;
if(todo <= 0) resolve(obj);
});
});
}
+
+ var writeFile = function(article) {
+ var filename = path.join(builddir,article.file,'index.html');
+ doWrite(filename, article.content);
+ if(article.otherContent) {
+ article.otherContent.forEach(function(o) {
+ var f = path.join(builddir,article.file,'index.'+o.type);
+ console.log(f);
+ doWrite(f, o.content);
+ })
+ }
+ }
obj.pages.forEach(function(o) { writeFile(o); })
obj.redirects.forEach(function(o) { writeFile(o); })
obj.tags.forEach(function(o) { writeFile(o); })
--
GitLab