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

Remove watcher while saving, and use AddTiddler instead of modifying tiddlers directly

Browse Source
This commit is contained in:
natecain 2013-10-11 18:43:51 -04:00
parent 4849bd43c8
commit 2c02b6d6bc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/tiddlywiki/filesystem/filesystemadaptor.js
View File

@ -17,6 +17,7 @@ var fs = !$tw.browser ? require("fs") : null;
function FileSystemAdaptor(syncer) { function FileSystemAdaptor(syncer) {
var self = this;
this.syncer = syncer; this.syncer = syncer;
this.watchers = {}; this.watchers = {};
this.pending = {}; this.pending = {};
@ -28,7 +29,9 @@ function FileSystemAdaptor(syncer) {
if(e === "change") { if(e === "change") {
var tiddlers = $tw.loadTiddlersFromFile(filename).tiddlers; var tiddlers = $tw.loadTiddlersFromFile(filename).tiddlers;
for(var t in tiddlers) { for(var t in tiddlers) {
$tw.wiki.tiddlers[tiddlers[t].title] = new $tw.Tiddler(tiddlers[t]); if(tiddlers[t].title) {
$tw.wiki.addTiddler(tiddlers[t]);
}
} }
} }
}); });
@ -134,8 +137,14 @@ FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback) {
} }
if($tw.boot.wikiInfo.doNotSave && $tw.boot.wikiInfo.doNotSave.indexOf(tiddler.fields.title) !== -1) { if($tw.boot.wikiInfo.doNotSave && $tw.boot.wikiInfo.doNotSave.indexOf(tiddler.fields.title) !== -1) {
// Don't save the tiddler if it is on the blacklist // Don't save the tiddler if it is on the blacklist
callback(null,{},0); return callback(null,{},0);
} else if(fileInfo.hasMetaFile) { }
if(self.watchers[fileInfo.filepath]) {
self.watchers[fileInfo.filepath].close();
delete self.watchers[fileInfo.filepath];
self.pending[fileInfo.filepath] = tiddler.fields.title;
}
if(fileInfo.hasMetaFile) {
// Save the tiddler as a separate body and meta file // Save the tiddler as a separate body and meta file
var typeInfo = $tw.config.contentTypeInfo[fileInfo.type]; var typeInfo = $tw.config.contentTypeInfo[fileInfo.type];
fs.writeFile(fileInfo.filepath,tiddler.fields.text,{encoding: typeInfo.encoding},function(err) { fs.writeFile(fileInfo.filepath,tiddler.fields.text,{encoding: typeInfo.encoding},function(err) {