file walker now read title and thumbnail infos

This commit is contained in:
Klemek
2019-06-19 19:41:29 +02:00
parent 1c30f95677
commit 9300bfbb78
5 changed files with 169 additions and 51 deletions
+4 -1
View File
@@ -10,7 +10,10 @@
"index" : "index.ejs"
},
"article" : {
"index" : "index.md"
"index" : "index.md",
"thumbnail_tag" : "thumbnail",
"default_title": "Untitled",
"default_thumbnail" : null
},
"rss" : {
"endpoint" : "/rss",
+1 -1
View File
@@ -15,7 +15,7 @@ const merge = (ref, src) => {
module.exports = () => {
try {
let configData = fs.readFileSync('./config.json');
let configData = fs.readFileSync('./config.json', {encoding:'UTF-8'});
let config = JSON.parse(configData);
return merge(refConfig, config);
} catch (error) {
+36 -8
View File
@@ -1,6 +1,6 @@
const fs = require('fs');
const fileTree = (path, cb) => {
const getFileTree = (path, cb) => {
let list = [];
let remaining = 0;
fs.readdir(path, {withFileTypes: true}, (err, items) => {
@@ -9,7 +9,7 @@ const fileTree = (path, cb) => {
items.forEach((item) => {
if (item.isDirectory()) {
remaining++;
fileTree(`${path}/${item.name}`, (err, out) => {
getFileTree(`${path}/${item.name}`, (err, out) => {
if (err)
return cb(err);
list.push(...out);
@@ -26,16 +26,30 @@ const fileTree = (path, cb) => {
});
};
const readIndexFile = (path,cb) => {
//TODO reading page title and possibly ![thumbnail](url)
const readIndexFile = (path, thumbnailTag, cb) => {
fs.readFile(path, {encoding: 'UTF-8'}, (err, data) => {
if (err)
return cb(err);
let info = {};
const regRes1 = data.match(/(^|[^#])#([^#\r\n]*)\r?\n?$/m);
info.title = regRes1 ? regRes1[2].trim() : undefined;
const thumbnailRegEx = new RegExp(`!\\[${thumbnailTag}]\\(([^)]*)\\)`, 'i');
const regRes2 = data.match(thumbnailRegEx);
info.thumbnail = regRes2 ? regRes2[1].trim() : undefined;
cb(null, info);
});
};
module.exports = (config) => {
return {
fileTree: config['test'] ? fileTree : undefined,
fileTree: config['test'] ? getFileTree : undefined,
readIndexFile: config['test'] ? readIndexFile : undefined,
fetchArticles: (cb) => {
fileTree(config['data_dir'], (err, fileList) => {
getFileTree(config['data_dir'], (err, fileList) => {
if (err)
return cb(err);
const paths = fileList
@@ -44,16 +58,30 @@ module.exports = (config) => {
.map(path => path.substr(0, path.length - config['article']['index'].length))
.map(path => path.match(/^\/(\d{4})\/(\d{2})\/(\d{2})\/$/))
.filter(path => path && path.length > 1);
if (paths.length === 0)
cb(null, []);
const list = [];
let remaining = 0;
paths.forEach(path => {
list.push({
const article = {
path: config['data_dir'] + path[0] + config['article']['index'],
year: parseInt(path[1]),
month: parseInt(path[2]),
day: parseInt(path[3])
};
remaining++;
readIndexFile(article.path, config['article']['thumbnail_tag'], (err, info) => {
if (err)
return cb(err);
article.title = info.title || config['article']['default_title'];
article.thumbnail = info.thumbnail ? (config['data_dir'] + path[0] + info.thumbnail) : config['article']['default_thumbnail'];
list.push(article);
remaining--;
if (remaining === 0)
cb(null, list);
});
});
cb(null, list);
});
}
};