clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-04-30 12:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix etag handling

Browse Source
This commit is contained in:
Jeremy Ruston
2024-03-20 17:56:47 +00:00
parent 891f0fd599
commit 60e6c8bcb2
9 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
View File

@@ -219,7 +219,7 @@ SqlTiddlerStore.prototype.saveRecipeTiddler = function(incomingTiddlerFields,rec
};
SqlTiddlerStore.prototype.deleteTiddler = function(title,bag_name) {
this.sqlTiddlerDatabase.deleteTiddler(title,bag_name);
return this.sqlTiddlerDatabase.deleteTiddler(title,bag_name);
};
/*
@@ -241,14 +241,19 @@ SqlTiddlerStore.prototype.getBagTiddler = function(title,bag_name) {
/*
Get an attachment ready to stream. Returns null if there is an error or:
tiddler_id: revision of tiddler
stream: stream of file
type: type of file
Returns {tiddler_id:}
*/
SqlTiddlerStore.prototype.getBagTiddlerStream = function(title,bag_name) {
const tiddlerInfo = this.sqlTiddlerDatabase.getBagTiddler(title,bag_name);
if(tiddlerInfo) {
if(tiddlerInfo.attachment_blob) {
return this.attachmentStore.getAttachmentStream(tiddlerInfo.attachment_blob);
return $tw.utils.extend(
{},
this.attachmentStore.getAttachmentStream(tiddlerInfo.attachment_blob),
{tiddler_id: tiddlerInfo.tiddler_id});
} else {
const { Readable } = require('stream');
const stream = new Readable();
@@ -260,6 +265,7 @@ SqlTiddlerStore.prototype.getBagTiddlerStream = function(title,bag_name) {
stream.push(null);
};
return {
tiddler_id: tiddlerInfo.tiddler_id,
stream: stream,
type: tiddlerInfo.tiddler.type || "text/plain"
}