mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00
Code Issues Releases Wiki Activity

Allow tiddlywiki.files to load directories recursively

Browse Source
This commit is contained in:
Jermolene 2015-09-15 13:35:54 +01:00
parent f917c4da1a
commit 803d70225a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/boot.js
View File

@ -1465,6 +1465,7 @@ $tw.loadTiddlersFromPath = function(filepath,excludeRegExp) {
if(files.indexOf("tiddlywiki.files") !== -1) { if(files.indexOf("tiddlywiki.files") !== -1) {
// If so, process the files it describes // If so, process the files it describes
var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8")); var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
// First the tiddlers
$tw.utils.each(filesInfo.tiddlers,function(tidInfo) { $tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
var type = tidInfo.fields.type || "text/plain", var type = tidInfo.fields.type || "text/plain",
typeInfo = $tw.config.contentTypeInfo[type], typeInfo = $tw.config.contentTypeInfo[type],
@ -1493,6 +1494,13 @@ $tw.loadTiddlersFromPath = function(filepath,excludeRegExp) {
tiddlers.push({tiddlers: [tidInfo.fields]}); tiddlers.push({tiddlers: [tidInfo.fields]});
} }
}); });
// Then any recursive directories
$tw.utils.each(filesInfo.directories,function(dirPath) {
var pathname = path.resolve(filepath,dirPath);
if(fs.existsSync(pathname) && fs.statSync(pathname).isDirectory()) {
tiddlers.push.apply(tiddlers,$tw.loadTiddlersFromPath(pathname,excludeRegExp));
}
});
} else { } else {
// If not, read all the files in the directory // If not, read all the files in the directory
$tw.utils.each(files,function(file) { $tw.utils.each(files,function(file) {

5
editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid
View File

@ -106,6 +106,9 @@ Sub-folders within the `tiddlers` folder can also be given a `tiddlywiki.files`
"title": "A different title" "title": "A different title"
} }
} }
],
"directories": [
"../../mytiddlers/store"
] ]
} }
``` ```
@ -117,3 +120,5 @@ The JSON data consists of an object with a `tiddlers` property that contains an
** `isTiddlerFile`: if `true`, the file will be deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing ** `isTiddlerFile`: if `true`, the file will be deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing
* `fields`: an object containing fields that override any provided in the tiddler file * `fields`: an object containing fields that override any provided in the tiddler file
* `prefix` & `suffix`: (optional) specify strings to be prefixed and suffixed to the tiddler file text content * `prefix` & `suffix`: (optional) specify strings to be prefixed and suffixed to the tiddler file text content
The ''directories'' property allows a list of directories to be specified. All tiddlers will be recursively loaded from each directory listed.