mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

AWS Plugin: Fix crash when attempting to save a missing tiddler

This commit is contained in:
Jermolene 2017-09-15 14:15:56 +01:00
parent 24c325611b
commit 7a714da9cb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/tiddlywiki/aws/modules/command.js
View File

@ -132,7 +132,7 @@ Command.prototype.subCommands["s3-rendertiddlers"] = function() {
saveTypeFilter = this.params[7] || "[[" + type + "]]",
tiddlers = wiki.filterTiddlers(filter);
// Check parameters
if(!filter || !template || !region || !bucket || !filenameFilter) {
if(!filter || !region || !bucket || !filenameFilter) {
throw "Missing parameters";
}
async.eachLimit(
@ -210,12 +210,16 @@ Command.prototype.subCommands["s3-savetiddlers"] = function() {
tiddlers,
20,
function(title,callback) {
var tiddler = wiki.getTiddler(title),
text = tiddler.fields.text || "",
type = tiddler.fields.type || "text/vnd.tiddlywiki",
filename = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0],
saveType = wiki.filterTiddlers(saveTypeFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0];
awsUtils.putFile(region,bucket,filename,text,saveType || type,callback);
var tiddler = wiki.getTiddler(title);
if(tiddler) {
var text = tiddler.fields.text || "",
type = tiddler.fields.type || "text/vnd.tiddlywiki",
filename = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0],
saveType = wiki.filterTiddlers(saveTypeFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0];
awsUtils.putFile(region,bucket,filename,text,saveType || type,callback);
} else {
process.nextTick(callback,null);
}
},
function(err,results) {
self.callback(err,results);