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

Make the syncer more configurable, including names for sync adaptors

Browse Source 
@danielo515 you may want to add a name to your sync adaptor 😄
This commit is contained in:
Jermolene 2017-02-04 17:25:30 +00:00
parent ced9f315a1
commit 6c65aa2a6d
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/modules/syncer.js
View File

@ -12,6 +12,18 @@ The syncer tracks changes to the store. If a syncadaptor is used then individual
/*global $tw: false */ /*global $tw: false */
"use strict"; "use strict";
/*
Defaults
*/
Syncer.prototype.titleIsLoggedIn = "$:/status/IsLoggedIn";
Syncer.prototype.titleUserName = "$:/status/UserName";
Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter";
Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
Syncer.prototype.pollTimerInterval = 60 * 1000; // Interval for polling for changes from the adaptor
/* /*
Instantiate the syncer with the following options: Instantiate the syncer with the following options:
syncadaptor: reference to syncadaptor to be used syncadaptor: reference to syncadaptor to be used
@ -21,8 +33,17 @@ function Syncer(options) {
var self = this; var self = this;
this.wiki = options.wiki; this.wiki = options.wiki;
this.syncadaptor = options.syncadaptor; this.syncadaptor = options.syncadaptor;
this.titleIsLoggedIn = options.titleIsLoggedIn || this.titleIsLoggedIn;
this.titleUserName = options.titleUserName || this.titleUserName;
this.titleSyncFilter = options.titleSyncFilter || this.titleSyncFilter;
this.titleSavedNotification = options.titleSavedNotification || this.titleSavedNotification;
this.taskTimerInterval = options.taskTimerInterval || this.taskTimerInterval;
this.throttleInterval = options.throttleInterval || this.throttleInterval;
this.fallbackInterval = options.fallbackInterval || this.fallbackInterval;
this.pollTimerInterval = options.pollTimerInterval || this.pollTimerInterval;
this.logging = $tw.utils.hop(options,"logging") ? options.logging : true;
// Make a logger // Make a logger
this.logger = new $tw.utils.Logger("syncer" + ($tw.browser ? "-browser" : "") + ($tw.node ? "-server" : "")); this.logger = new $tw.utils.Logger("syncer" + ($tw.browser ? "-browser" : "") + ($tw.node ? "-server" : "") + (this.syncadaptor.name ? ("-" + this.syncadaptor.name) : ""));
// Compile the dirty tiddler filter // Compile the dirty tiddler filter
this.filterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(this.titleSyncFilter)); this.filterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(this.titleSyncFilter));
// Record information for known tiddlers // Record information for known tiddlers
@ -69,19 +90,6 @@ function Syncer(options) {
}); });
} }
/*
Constants
*/
Syncer.prototype.titleIsLoggedIn = "$:/status/IsLoggedIn";
Syncer.prototype.titleUserName = "$:/status/UserName";
Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter";
Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
Syncer.prototype.pollTimerInterval = 60 * 1000; // Interval for polling for changes from the adaptor
/* /*
Read (or re-read) the latest tiddler info from the store Read (or re-read) the latest tiddler info from the store
*/ */

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

@ -24,6 +24,8 @@ function FileSystemAdaptor(options) {
$tw.utils.createDirectory($tw.boot.wikiTiddlersPath); $tw.utils.createDirectory($tw.boot.wikiTiddlersPath);
} }
FileSystemAdaptor.prototype.name = "filesystem";
FileSystemAdaptor.prototype.isReady = function() { FileSystemAdaptor.prototype.isReady = function() {
// The file system adaptor is always ready // The file system adaptor is always ready
return true; return true;

2
plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
View File

@ -23,6 +23,8 @@ function TiddlyWebAdaptor(options) {
this.logger = new $tw.utils.Logger("TiddlyWebAdaptor"); this.logger = new $tw.utils.Logger("TiddlyWebAdaptor");
} }
TiddlyWebAdaptor.prototype.name = "tiddlyweb";
TiddlyWebAdaptor.prototype.isReady = function() { TiddlyWebAdaptor.prototype.isReady = function() {
return this.hasStatus; return this.hasStatus;
}; };