mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-17 23:34:50 +00:00
Code Issues Releases Wiki Activity

Remove unused file watching code from filesystemadaptor

Browse Source 
This code was contributed by @natecain and added in #176. It was almost
immediately disabled because of problems in the field.

I’m removing the code now to simplify the adaptor in advance of some
planned refactoring.
This commit is contained in:
Jermolene 2014-09-28 23:46:55 +01:00
parent 860a7070a9
commit 459133cc57
1 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,33 +19,9 @@ var fs = !$tw.browser ? require("fs") : null,
function FileSystemAdaptor(options) { function FileSystemAdaptor(options) {
var self = this; var self = this;
this.wiki = options.wiki; this.wiki = options.wiki;
this.watchers = {};
this.pending = {};
this.logger = new $tw.utils.Logger("FileSystem"); this.logger = new $tw.utils.Logger("FileSystem");
this.setwatcher = function(filename, title) {
return undefined;
//return this.watchers[filename] = this.watchers[filename] ||
// fs.watch(filename, {persistent: false}, function(e) {
// self.logger.log("Error:",e,filename);
// if(e === "change") {
// var tiddlers = $tw.loadTiddlersFromFile(filename).tiddlers;
// for(var t in tiddlers) {
// if(tiddlers[t].title) {
// self.wiki.addTiddler(tiddlers[t]);
// }
// }
// }
// });
};
for(var f in $tw.boot.files) {
var fileInfo = $tw.boot.files[f];
this.setwatcher(fileInfo.filepath, f);
}
// Create the <wiki>/tiddlers folder if it doesn't exist // Create the <wiki>/tiddlers folder if it doesn't exist
// TODO: we should create the path recursively $tw.utils.createDirectory($tw.boot.wikiTiddlersPath);
if(!fs.existsSync($tw.boot.wikiTiddlersPath)) {
fs.mkdirSync($tw.boot.wikiTiddlersPath);
}
} }
FileSystemAdaptor.prototype.getTiddlerInfo = function(tiddler) { FileSystemAdaptor.prototype.getTiddlerInfo = function(tiddler) {
@ -92,7 +68,6 @@ FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) {
fileInfo.hasMetaFile = typeInfo.hasMetaFile; fileInfo.hasMetaFile = typeInfo.hasMetaFile;
// Save the newly created fileInfo // Save the newly created fileInfo
$tw.boot.files[title] = fileInfo; $tw.boot.files[title] = fileInfo;
self.pending[fileInfo.filepath] = title;
// Pass it to the callback // Pass it to the callback
callback(null,fileInfo); callback(null,fileInfo);
}); });
@ -128,22 +103,13 @@ Save a tiddler and invoke the callback with (err,adaptorInfo,revision)
FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback) { FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback) {
var self = this; var self = this;
this.getTiddlerFileInfo(tiddler,function(err,fileInfo) { this.getTiddlerFileInfo(tiddler,function(err,fileInfo) {
var template, content, encoding; var template, content, encoding,
function _finish() { _finish = function() {
if(self.pending[fileInfo.filepath]) {
self.setwatcher(fileInfo.filepath, tiddler.fields.title);
delete self.pending[fileInfo.filepath];
}
callback(null, {}, 0); callback(null, {}, 0);
} };
if(err) { if(err) {
return callback(err); return callback(err);
} }
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) { 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];
@ -192,11 +158,6 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
fileInfo = $tw.boot.files[title]; fileInfo = $tw.boot.files[title];
// Only delete the tiddler if we have writable information for the file // Only delete the tiddler if we have writable information for the file
if(fileInfo) { if(fileInfo) {
if(this.watchers[fileInfo.filepath]) {
this.watchers[fileInfo.filepath].close();
delete this.watchers[fileInfo.filepath];
}
delete this.pending[fileInfo.filepath];
// Delete the file // Delete the file
fs.unlink(fileInfo.filepath,function(err) { fs.unlink(fileInfo.filepath,function(err) {
if(err) { if(err) {