diff --git a/src/site/_data/filetree.js b/src/site/_data/filetree.js index ca62e6f..ccb26fc 100644 --- a/src/site/_data/filetree.js +++ b/src/site/_data/filetree.js @@ -2,18 +2,25 @@ const fsFileTree = require("fs-file-tree"); const matter = require('gray-matter'); const fs = require('fs'); +module.exports = async () => { + const tree = await fsFileTree("src/site/notes"); + populateWithPermalink(tree); + + return sortTree(tree); +} + const sortTree = (unsorted) => { //Sort by folder before file, then by name - const orderedTree = Object.keys(unsorted).sort((a,b)=>{ - if (a.indexOf(".md") > -1 && b.indexOf(".md") === -1){ + const orderedTree = Object.keys(unsorted).sort((a, b) => { + if (a.indexOf(".md") > -1 && b.indexOf(".md") === -1) { return 1; } - if (a.indexOf(".md") === -1 && b.indexOf(".md") > -1){ + if (a.indexOf(".md") === -1 && b.indexOf(".md") > -1) { return -1; } - if (a.toLowerCase() > b.toLowerCase()){ + if (a.toLowerCase() > b.toLowerCase()) { return 1; } @@ -36,13 +43,6 @@ const sortTree = (unsorted) => { return orderedTree; } -module.exports = async () => { - const tree = await fsFileTree("src/site/notes"); - populateWithPermalink(tree); - - return sortTree(tree); -} - function getPermalinkAndName(path, key) { let permalink = "/" let name = key.replace(".md", ""); @@ -52,14 +52,14 @@ function getPermalinkAndName(path, key) { if (frontMatter.data.permalink) { permalink = frontMatter.data.permalink; } - if (frontMatter.data.title){ + if (frontMatter.data.title) { name = frontMatter.data.title } } catch { //ignore } - return {permalink, name}; + return { permalink, name }; } function populateWithPermalink(tree) {