mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add function to delay syncs, and connector server endpoint to trigger it

Browse source 
This will allow the connector to delay syncs while the target selector
window is open, and it can probably be used for imports and other
things.
This commit is contained in:
Dan Stillman 2018-03-25 04:56:50 -04:00
parent b9837c690d
commit 2effad4f6a
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome/content/zotero/xpcom/server.js
View file

@ -28,6 +28,7 @@ Zotero.Server = new function() {
this.responseCodes = {
200:"OK",
201:"Created",
204:"No Content",
300:"Multiple Choices",
400:"Bad Request",
404:"Not Found",

11
chrome/content/zotero/xpcom/server_connector.js
View file

@ -799,6 +799,17 @@ Zotero.Server.Connector.UpdateSession.prototype = {
}
};
Zotero.Server.Connector.DelaySync = function () {};
Zotero.Server.Endpoints["/connector/delaySync"] = Zotero.Server.Connector.DelaySync;
Zotero.Server.Connector.DelaySync.prototype = {
supportedMethods: ["POST"],
init: async function (options) {
Zotero.Sync.Runner.delaySync(10000);
return [204];
}
};
/**
* Gets progress for an attachment that is currently being saved
*

25
chrome/content/zotero/xpcom/sync/syncRunner.js
View file

@ -69,6 +69,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
var _enabled = false;
var _autoSyncTimer;
var _delaySyncUntil;
var _firstInSession = true;
var _syncInProgress = false;
var _stopping = false;
@ -139,6 +140,14 @@ Zotero.Sync.Runner_Module = function (options = {}) {
this.updateIcons('animate');
// If a delay is set (e.g., from the connector target selector), wait to sync
while (_delaySyncUntil && new Date() < _delaySyncUntil) {
this.setSyncStatus(Zotero.getString('sync.status.waiting'));
let delay = _delaySyncUntil - new Date();
Zotero.debug(`Waiting ${delay} ms to sync`);
yield Zotero.Promise.delay(delay);
}
// purgeDataObjects() starts a transaction, so if there's an active one then show a
// nice message and wait until there's not. Another transaction could still start
// before purgeDataObjects() and result in a wait timeout, but this should reduce the
@ -884,11 +893,20 @@ Zotero.Sync.Runner_Module = function (options = {}) {
// Implements nsITimerCallback
var callback = {
notify: function (timer) {
notify: async function (timer) {
if (!_getAPIKey()) {
return;
}
// If a delay is set (e.g., from the connector target selector), wait to sync.
// We do this in sync() too for manual syncs, but no need to start spinning if
// it's just an auto-sync.
while (_delaySyncUntil && new Date() < _delaySyncUntil) {
let delay = _delaySyncUntil - new Date();
Zotero.debug(`Waiting ${delay} ms to start auto-sync`);
await Zotero.Promise.delay(delay);
}
if (Zotero.locked) {
Zotero.debug('Zotero is locked -- skipping auto-sync', 4);
return;
@ -935,6 +953,11 @@ Zotero.Sync.Runner_Module = function (options = {}) {
}
this.delaySync = function (ms) {
_delaySyncUntil = new Date(Date.now() + ms);
};
/**
* Trigger updating of the main sync icon, the sync error icon, and
* library-specific sync error icons across all windows