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

Fix string vs. number confusion for revisions

Browse Source
This commit is contained in:
Jeremy Ruston 2024-05-28 09:08:17 +01:00
parent 9b6d677726
commit d8fd9af63a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js
View File

@ -213,6 +213,7 @@ MultiWikiClientAdaptor.prototype.connectServerStream = function(options) {
type: data.is_deleted ? "deletion" : "update", type: data.is_deleted ? "deletion" : "update",
tiddler_id: data.tiddler_id tiddler_id: data.tiddler_id
}; };
console.log(`Oustanding requests is ${JSON.stringify(self.outstandingRequests[data.title])}`)
// Process the update if the tiddler is not the subject of an outstanding request // Process the update if the tiddler is not the subject of an outstanding request
if(!self.outstandingRequests[data.title]) { if(!self.outstandingRequests[data.title]) {
if(data.is_deleted) { if(data.is_deleted) {
@ -224,7 +225,7 @@ MultiWikiClientAdaptor.prototype.connectServerStream = function(options) {
} else { } else {
var result = self.incomingUpdatesFilterFn.call(self.wiki,self.wiki.makeTiddlerIterator([data.title])); var result = self.incomingUpdatesFilterFn.call(self.wiki,self.wiki.makeTiddlerIterator([data.title]));
if(result.length > 0) { if(result.length > 0) {
self.setTiddlerInfo(data.title,data.tiddler_id,data.bag_name); self.setTiddlerInfo(data.title,data.tiddler_id.toString(),data.bag_name);
options.syncer.storeTiddler(data.tiddler); options.syncer.storeTiddler(data.tiddler);
} }
} }
@ -283,9 +284,9 @@ Queue a load for a tiddler if there has been an update for it since the specifie
MultiWikiClientAdaptor.prototype.checkLastRecordedUpdate = function(title,revision,syncer) { MultiWikiClientAdaptor.prototype.checkLastRecordedUpdate = function(title,revision,syncer) {
var lru = this.lastRecordedUpdate[title]; var lru = this.lastRecordedUpdate[title];
if(lru) { if(lru) {
var numTiddlerId = $tw.utils.parseNumber(lru.tiddler_id), var numRevision = $tw.utils.getInt(revision);
numRevision = $tw.utils.parseNumber(revision); console.log(`Checking for updates to ${title} since ${JSON.stringify(revision)} comparing to ${numRevision}`)
if(numTiddlerId > numRevision) { if(lru.tiddler_id > numRevision) {
options.syncer.enqueueLoadTiddler(title); options.syncer.enqueueLoadTiddler(title);
} }
} }
@ -309,7 +310,7 @@ MultiWikiClientAdaptor.prototype.saveTiddler = function(tiddler,callback,options
}, },
data: JSON.stringify(tiddler.getFieldStrings()), data: JSON.stringify(tiddler.getFieldStrings()),
callback: function(err,data,request) { callback: function(err,data,request) {
delete self.outstandingRequests.title; delete self.outstandingRequests[title];
if(err) { if(err) {
return callback(err); return callback(err);
} }
@ -339,7 +340,7 @@ MultiWikiClientAdaptor.prototype.loadTiddler = function(title,callback,options)
$tw.utils.httpRequest({ $tw.utils.httpRequest({
url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(title), url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(title),
callback: function(err,data,request) { callback: function(err,data,request) {
delete self.outstandingRequests.title; delete self.outstandingRequests[title];
if(err === 404) { if(err === 404) {
return callback(null,null); return callback(null,null);
} else if(err) { } else if(err) {
@ -377,7 +378,7 @@ MultiWikiClientAdaptor.prototype.deleteTiddler = function(title,callback,options
url: this.host + "bags/" + encodeURIComponent(bag) + "/tiddlers/" + encodeURIComponent(title), url: this.host + "bags/" + encodeURIComponent(bag) + "/tiddlers/" + encodeURIComponent(title),
type: "DELETE", type: "DELETE",
callback: function(err,data,request) { callback: function(err,data,request) {
delete self.outstandingRequests.title; delete self.outstandingRequests[title];
if(err) { if(err) {
return callback(err); return callback(err);
} }