зеркало из https://github.com/mozilla/pjs.git
status label now has service status instead of username; service [un]lock observer notifications are gone; don't error when async methods don't call done() - consider them methods with no return value; don't require passing null into login() to cause the identity to look up the password in the pw mgr; make some wrapper 'method generators' to make lock handling and observer notification simpler
This commit is contained in:
Dan Mills
Родитель
152ac86226
Коммит
38ed71b0a2
|
|
@ -5,3 +5,5 @@
|
|||
<!ENTITY shareItem.label "Share Bookmarks...">
|
||||
<!ENTITY openPrefsItem.label "Weave Preferences...">
|
||||
<!ENTITY openLogItem.label "Activity Log...">
|
||||
<!ENTITY status.offline.label "Offline">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,6 @@
|
|||
# %S is the date and time at which the last sync successfully completed
|
||||
lastSync.label = Last Update: %S
|
||||
status.idle = Idle
|
||||
status.active = Working...
|
||||
status.offline = Offline
|
||||
status.error = Error
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ const Cu = Components.utils;
|
|||
|
||||
Cu.import("resource://weave/log4moz.js");
|
||||
Cu.import("resource://weave/util.js");
|
||||
Cu.import("resource://weave/constants.js");
|
||||
|
||||
/*
|
||||
* Asynchronous generator helpers
|
||||
|
|
@ -101,7 +100,7 @@ Generator.prototype = {
|
|||
set errorOnStop(value) { this._errorOnStop = value; },
|
||||
|
||||
get cb() {
|
||||
let cb = Utils.bind2(this, function(data) { this.cont(data); });
|
||||
let self = this, cb = function(data) { self.cont(data); };
|
||||
cb.parentGenerator = this;
|
||||
return cb;
|
||||
},
|
||||
|
|
@ -141,8 +140,6 @@ Generator.prototype = {
|
|||
|
||||
_handleException: function AsyncGen__handleException(e) {
|
||||
if (e instanceof StopIteration) {
|
||||
if (!this._timer)
|
||||
this._log.trace("[" + this.name + "] Generator stopped unexpectedly");
|
||||
if (this.errorOnStop) {
|
||||
this._log.error("[" + this.name + "] Generator stopped unexpectedly");
|
||||
this._log.trace("Stack trace:\n" + this.trace);
|
||||
|
|
@ -182,18 +179,25 @@ Generator.prototype = {
|
|||
this.generator.next(); // must initialize before sending
|
||||
this.generator.send(this);
|
||||
} catch (e) {
|
||||
if (!(e instanceof StopIteration) || !this._timer)
|
||||
this._handleException(e);
|
||||
}
|
||||
},
|
||||
|
||||
cont: function AsyncGen_cont(data) {
|
||||
try { this.generator.send(data); }
|
||||
catch (e) { this._handleException(e); }
|
||||
catch (e) {
|
||||
if (!(e instanceof StopIteration) || !this._timer)
|
||||
this._handleException(e);
|
||||
}
|
||||
},
|
||||
|
||||
throw: function AsyncGen_throw(exception) {
|
||||
try { this.generator.throw(exception); }
|
||||
catch (e) { this._handleException(e); }
|
||||
catch (e) {
|
||||
if (!(e instanceof StopIteration) || !this._timer)
|
||||
this._handleException(e);
|
||||
}
|
||||
},
|
||||
|
||||
// async generators can't simply call a callback with the return
|
||||
|
|
@ -250,7 +254,7 @@ Async = {
|
|||
// where fooGen is a generator function, and gen is a Generator instance
|
||||
// ret is whatever the generator 'returns' via Generator.done().
|
||||
|
||||
run: function Async_run(object, method, onComplete, args) {
|
||||
run: function Async_run(object, method, onComplete /* , arg1, arg2, ... */) {
|
||||
let args = Array.prototype.slice.call(arguments, 3);
|
||||
let gen = new Generator(object, method, onComplete, args);
|
||||
gen.run();
|
||||
|
|
@ -270,7 +274,7 @@ Async = {
|
|||
// Note that 'this' refers to the method being called, not the
|
||||
// Async object.
|
||||
|
||||
sugar: function Async_sugar(object, onComplete, extra_args) {
|
||||
sugar: function Async_sugar(object, onComplete /* , arg1, arg2, ... */) {
|
||||
let args = Array.prototype.slice.call(arguments, 1);
|
||||
args.unshift(object, this);
|
||||
Async.run.apply(Async, args);
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ Identity.prototype = {
|
|||
|
||||
_password: null,
|
||||
get password() {
|
||||
if (this._password === null)
|
||||
if (!this._password)
|
||||
return findPassword(this.realm, this.username);
|
||||
return this._password;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
|||
Cu.import("resource://weave/log4moz.js");
|
||||
Cu.import("resource://weave/constants.js");
|
||||
Cu.import("resource://weave/util.js");
|
||||
Cu.import("resource://weave/wrap.js");
|
||||
Cu.import("resource://weave/crypto.js");
|
||||
Cu.import("resource://weave/engines.js");
|
||||
Cu.import("resource://weave/dav.js");
|
||||
|
|
@ -72,9 +73,26 @@ Utils.lazy(Weave, 'Service', WeaveSvc);
|
|||
* Main entry point into Weave's sync framework
|
||||
*/
|
||||
|
||||
function WeaveSvc() { this._init(); }
|
||||
function WeaveSvc() {
|
||||
this._initLogs();
|
||||
this._log.info("Weave Sync Service Initializing");
|
||||
|
||||
Utils.prefs.addObserver("", this, false);
|
||||
|
||||
if (!this.enabled) {
|
||||
this._log.info("Weave Sync disabled");
|
||||
return;
|
||||
}
|
||||
|
||||
this._setSchedule(this.schedule);
|
||||
}
|
||||
WeaveSvc.prototype = {
|
||||
|
||||
_notify: Wrap.notify,
|
||||
_lock: Wrap.lock,
|
||||
_localLock: Wrap.localLock,
|
||||
_osPrefix: "weave:service:",
|
||||
|
||||
__os: null,
|
||||
get _os() {
|
||||
if (!this.__os)
|
||||
|
|
@ -173,20 +191,6 @@ WeaveSvc.prototype = {
|
|||
return Utils.prefs.getIntPref("schedule");
|
||||
},
|
||||
|
||||
_init: function WeaveSync__init() {
|
||||
this._initLogs();
|
||||
this._log.info("Weave Sync Service Initializing");
|
||||
|
||||
Utils.prefs.addObserver("", this, false);
|
||||
|
||||
if (!this.enabled) {
|
||||
this._log.info("Weave Sync disabled");
|
||||
return;
|
||||
}
|
||||
|
||||
this._setSchedule(this.schedule);
|
||||
},
|
||||
|
||||
_setSchedule: function Weave__setSchedule(schedule) {
|
||||
switch (this.schedule) {
|
||||
case 0:
|
||||
|
|
@ -267,42 +271,6 @@ WeaveSvc.prototype = {
|
|||
root.addAppender(vapp);
|
||||
},
|
||||
|
||||
_lock: function weaveSync__lock() {
|
||||
let self = yield;
|
||||
|
||||
this._dav.lock.async(this._dav, self.cb);
|
||||
let locked = yield;
|
||||
|
||||
if (!locked) {
|
||||
this._log.warn("Service lock failed: already locked");
|
||||
this._os.notifyObservers(null, "weave:service-lock:error", "");
|
||||
self.done(false);
|
||||
return;
|
||||
}
|
||||
|
||||
this._log.debug("Service lock acquired");
|
||||
this._os.notifyObservers(null, "weave:service-lock:success", "");
|
||||
self.done(true);
|
||||
},
|
||||
|
||||
_unlock: function WeaveSync__unlock() {
|
||||
let self = yield;
|
||||
|
||||
this._dav.unlock.async(this._dav, self.cb);
|
||||
let unlocked = yield;
|
||||
|
||||
if (!unlocked) {
|
||||
this._log.error("Service unlock failed");
|
||||
this._os.notifyObservers(null, "weave:service-unlock:error", "");
|
||||
self.done(false);
|
||||
return;
|
||||
}
|
||||
|
||||
this._log.debug("Service lock released");
|
||||
this._os.notifyObservers(null, "weave:service-unlock:success", "");
|
||||
self.done(true);
|
||||
},
|
||||
|
||||
_createUserDir: function WeaveSync__createUserDir(serverURL) {
|
||||
let self = yield;
|
||||
|
||||
|
|
@ -320,8 +288,6 @@ WeaveSvc.prototype = {
|
|||
let success = yield;
|
||||
if (!success)
|
||||
throw "Created user directory, but login still failed. Aborting.";
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_uploadVersion: function WeaveSync__uploadVersion() {
|
||||
|
|
@ -335,8 +301,6 @@ WeaveSvc.prototype = {
|
|||
this._dav.PUT("meta/version", STORAGE_FORMAT_VERSION, self.cb);
|
||||
ret = yield;
|
||||
Utils.ensureStatus(ret.status, "Could not upload server version file");
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
// force a server wipe when the version is lower than ours (or there is none)
|
||||
|
|
@ -363,8 +327,6 @@ WeaveSvc.prototype = {
|
|||
} else if (ret.responseText > STORAGE_FORMAT_VERSION) {
|
||||
// FIXME: should we do something here?
|
||||
}
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_generateKeys: function WeaveSync__generateKeys() {
|
||||
|
|
@ -394,8 +356,6 @@ WeaveSvc.prototype = {
|
|||
this._dav.PUT("public/pubkey", pubkey, self.cb);
|
||||
ret = yield;
|
||||
Utils.ensureStatus(ret.status, "Could not upload public key");
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_login: function WeaveSync__login(password, passphrase) {
|
||||
|
|
@ -462,10 +422,12 @@ WeaveSvc.prototype = {
|
|||
}
|
||||
},
|
||||
|
||||
// NOTE: doesn't lock because it's called from _login() which already holds the lock
|
||||
_serverWipe: function WeaveSync__serverWipe() {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_serverWipe() {
|
||||
let innerSelf = yield;
|
||||
|
||||
this._dav.listFiles.async(this._dav, self.cb);
|
||||
let names = yield;
|
||||
|
||||
|
|
@ -474,159 +436,12 @@ WeaveSvc.prototype = {
|
|||
let resp = yield;
|
||||
this._log.debug(resp.status);
|
||||
}
|
||||
};
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
// NOTE: can't lock because it assumes the lock is being held ;)
|
||||
_resetLock: function WeaveSync__resetLock() {
|
||||
let self = yield;
|
||||
let success = false;
|
||||
|
||||
try {
|
||||
this._log.debug("Resetting server lock");
|
||||
this._os.notifyObservers(null, "weave:server-lock-reset:start", "");
|
||||
|
||||
this._dav.forceUnlock.async(this._dav, self.cb);
|
||||
success = yield;
|
||||
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
if (success) {
|
||||
this._log.debug("Server lock reset successful");
|
||||
this._os.notifyObservers(null, "weave:server-lock-reset:success", "");
|
||||
} else {
|
||||
this._log.debug("Server lock reset failed");
|
||||
this._os.notifyObservers(null, "weave:server-lock-reset:error", "");
|
||||
}
|
||||
self.done(success);
|
||||
}
|
||||
},
|
||||
|
||||
_syncEngine: function WeaveSync__syncEngine(eng) {
|
||||
let self = yield;
|
||||
|
||||
this._os.notifyObservers(null, "weave:" + eng.name + ":sync:start", "");
|
||||
|
||||
let ret;
|
||||
try {
|
||||
eng.sync(self.cb);
|
||||
ret = yield;
|
||||
} catch (e) {
|
||||
this._log.warn("Engine failed with error: " + Utils.exceptionStr(e));
|
||||
if (e.trace)
|
||||
this._log.debug("Engine stack trace: " + Utils.stackTrace(e.trace));
|
||||
}
|
||||
|
||||
if (ret)
|
||||
this._os.notifyObservers(null, "weave:" + eng.name + ":sync:success", "");
|
||||
else
|
||||
this._os.notifyObservers(null, "weave:" + eng.name + ":sync:error", "");
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_sync: function WeaveSync__sync() {
|
||||
let self = yield;
|
||||
|
||||
try {
|
||||
this._lock.async(this, self.cb)
|
||||
let locked = yield;
|
||||
if (!locked)
|
||||
return;
|
||||
|
||||
this._os.notifyObservers(null, "weave:service:sync:start", "");
|
||||
|
||||
if (Utils.prefs.getBoolPref("bookmarks")) {
|
||||
this._syncEngine.async(this, self.cb, this._bmkEngine);
|
||||
// NOTE: doesn't lock because it's called from _login() which
|
||||
// already holds the lock
|
||||
this._notify("server-wipe", cb).async(this, self.cb);
|
||||
yield;
|
||||
}
|
||||
if (Utils.prefs.getBoolPref("history")) {
|
||||
this._syncEngine.async(this, self.cb, this._histEngine);
|
||||
yield;
|
||||
}
|
||||
|
||||
this._unlock.async(this, self.cb)
|
||||
yield;
|
||||
this._os.notifyObservers(null, "weave:service:sync:success", "");
|
||||
|
||||
} catch (e) {
|
||||
this._unlock.async(this, self.cb)
|
||||
yield;
|
||||
this._os.notifyObservers(null, "weave:service:sync:error", "");
|
||||
throw e;
|
||||
}
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_resetServer: function WeaveSync__resetServer() {
|
||||
let self = yield;
|
||||
|
||||
this._lock.async(this, self.cb);
|
||||
let locked = yield;
|
||||
if (!locked)
|
||||
return;
|
||||
|
||||
try {
|
||||
this._bmkEngine.resetServer(self.cb);
|
||||
this._histEngine.resetServer(self.cb);
|
||||
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
this._unlock.async(this, self.cb)
|
||||
yield;
|
||||
}
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_resetClient: function WeaveSync__resetClient() {
|
||||
let self = yield;
|
||||
|
||||
if (this._dav.locked)
|
||||
throw "Reset client data failed: could not acquire lock";
|
||||
this._dav.allowLock = false;
|
||||
|
||||
try {
|
||||
this._bmkEngine.resetClient(self.cb);
|
||||
this._histEngine.resetClient(self.cb);
|
||||
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
this._dav.allowLock = true;
|
||||
}
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
_shareBookmarks: function WeaveSync__shareBookmarks(username) {
|
||||
let self = yield;
|
||||
|
||||
try {
|
||||
this._lock.async(this, self.cb);
|
||||
let locked = yield;
|
||||
if (!locked)
|
||||
return;
|
||||
|
||||
this._bmkEngine.share(self.cb, username);
|
||||
yield;
|
||||
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
this._unlock.async(this, self.cb);
|
||||
yield;
|
||||
}
|
||||
|
||||
self.done();
|
||||
},
|
||||
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupports]),
|
||||
|
|
@ -647,8 +462,8 @@ WeaveSvc.prototype = {
|
|||
|
||||
// These are global (for all engines)
|
||||
|
||||
login: function WeaveSync_login(password, passphrase) {
|
||||
this._login.async(this, null, password, passphrase);
|
||||
login: function WeaveSync_login(onComplete, password, passphrase) {
|
||||
this._login.async(this, onComplete, password, passphrase);
|
||||
},
|
||||
|
||||
logout: function WeaveSync_logout() {
|
||||
|
|
@ -659,14 +474,106 @@ WeaveSvc.prototype = {
|
|||
this._os.notifyObservers(null, "weave:service-logout:success", "");
|
||||
},
|
||||
|
||||
resetLock: function WeaveSync_resetLock() { this._resetLock.async(this); },
|
||||
resetLock: function WeaveSync_resetLock(onComplete) {
|
||||
this._resetLock.async(this, onComplete);
|
||||
},
|
||||
_resetLock: function WeaveSync__resetLock() {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_resetLock() {
|
||||
let innerSelf = yield;
|
||||
this._dav.forceUnlock.async(this._dav, innerSelf.cb);
|
||||
yield;
|
||||
};
|
||||
|
||||
this._notify("reset-server-lock", cb).async(this, self.cb);
|
||||
yield;
|
||||
},
|
||||
|
||||
|
||||
// These are per-engine
|
||||
|
||||
sync: function WeaveSync_sync() { this._sync.async(this); },
|
||||
resetServer: function WeaveSync_resetServer() { this._resetServer.async(this); },
|
||||
resetClient: function WeaveSync_resetClient() { this._resetClient.async(this); },
|
||||
shareBookmarks: function WeaveSync_shareBookmarks(username) {
|
||||
this._shareBookmarks.async(this, function() {}, username);
|
||||
sync: function WeaveSync_sync(onComplete) {
|
||||
this._sync.async(this, onComplete);
|
||||
},
|
||||
_sync: function WeaveSync__sync() {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_sync() {
|
||||
let innerSelf = yield;
|
||||
|
||||
let engineCb = function WeaveSvc_syncEngine(engine) {
|
||||
let innerInnerSelf = yield;
|
||||
engine.sync(innerInnerSelf.cb);
|
||||
yield;
|
||||
};
|
||||
|
||||
if (Utils.prefs.getBoolPref("bookmarks")) {
|
||||
this._notify(this._bmkEngine.name + ":sync",
|
||||
engineCb, this._bmkEngine).async(this, innerSelf.cb);
|
||||
yield;
|
||||
}
|
||||
if (Utils.prefs.getBoolPref("history")) {
|
||||
this._notify(this._histEngine.name + ":sync",
|
||||
engineCb, this._histEngine).async(this, innerSelf.cb);
|
||||
yield;
|
||||
}
|
||||
};
|
||||
|
||||
this._lock(this._notify("sync", cb)).async(this, self.cb);
|
||||
yield;
|
||||
},
|
||||
|
||||
resetServer: function WeaveSync_resetServer(onComplete) {
|
||||
this._resetServer.async(this, onComplete);
|
||||
},
|
||||
_resetServer: function WeaveSync__resetServer() {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_resetServer() {
|
||||
let innerSelf = yield;
|
||||
this._bmkEngine.resetServer(innerSelf.cb);
|
||||
yield;
|
||||
this._histEngine.resetServer(innerSelf.cb);
|
||||
yield;
|
||||
};
|
||||
|
||||
this._lock(this._notify("reset-server",cb)).async(this, self.cb);
|
||||
yield;
|
||||
},
|
||||
|
||||
resetClient: function WeaveSync_resetClient(onComplete) {
|
||||
this._resetClient.async(this, onComplete);
|
||||
},
|
||||
_resetClient: function WeaveSync__resetClient() {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_resetClient() {
|
||||
let innerSelf = yield;
|
||||
this._bmkEngine.resetClient(innerSelf.cb);
|
||||
yield;
|
||||
this._histEngine.resetClient(innerSelf.cb);
|
||||
yield;
|
||||
};
|
||||
|
||||
this._localLock(this._notify("reset-client", cb)).async(this, self.cb);
|
||||
yield;
|
||||
},
|
||||
|
||||
shareBookmarks: function WeaveSync_shareBookmarks(onComplete, username) {
|
||||
this._shareBookmarks.async(this, onComplete, username);
|
||||
},
|
||||
_shareBookmarks: function WeaveSync__shareBookmarks(username) {
|
||||
let self = yield;
|
||||
|
||||
let cb = function Weave_shareBookmarks() {
|
||||
let innerSelf = yield;
|
||||
this._bmkEngine.share(innerSelf.cb, username);
|
||||
yield;
|
||||
};
|
||||
|
||||
this._lock(this._notify("share-bookmarks", cb)).async(this, self.cb);
|
||||
yield;
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,159 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Bookmarks Sync.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Mozilla.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2007
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Dan Mills <thunder@mozilla.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
const EXPORTED_SYMBOLS = ['Wrap'];
|
||||
|
||||
const Cc = Components.classes;
|
||||
const Ci = Components.interfaces;
|
||||
const Cr = Components.results;
|
||||
const Cu = Components.utils;
|
||||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://weave/log4moz.js");
|
||||
Cu.import("resource://weave/async.js");
|
||||
|
||||
Function.prototype.async = Async.sugar;
|
||||
|
||||
/*
|
||||
* Wrapper utility functions
|
||||
*
|
||||
* Not in util.js because that would cause a circular dependency
|
||||
* between util.js and async.js (we include async.js so that our
|
||||
* returned generator functions have the .async sugar defined)
|
||||
*/
|
||||
|
||||
let Wrap = {
|
||||
|
||||
// NOTE: requires _osPrefix string property in your object
|
||||
// NOTE2: copy this function over to your objects, use like this:
|
||||
//
|
||||
// MyObj.prototype = {
|
||||
// _notify: Wrap.notify,
|
||||
// ...
|
||||
// method: function MyMethod() {
|
||||
// let self = yield;
|
||||
// ...
|
||||
// // doFoo is assumed to be an asynchronous method
|
||||
// this._notify("foo", this._doFoo, arg1, arg2).async(this, self.cb);
|
||||
// let ret = yield;
|
||||
// ...
|
||||
// }
|
||||
// };
|
||||
notify: function Weave_notify(name, method /* , arg1, arg2, ... */) {
|
||||
let savedName = name;
|
||||
let savedMethod = method;
|
||||
let args = Array.prototype.slice.call(arguments, 2);
|
||||
|
||||
return function WeaveNotifyWrapper() {
|
||||
let self = yield;
|
||||
let ret;
|
||||
|
||||
try {
|
||||
this._os.notifyObservers(null, this._osPrefix + savedName + ":start", "");
|
||||
|
||||
args.unshift(this, savedMethod, self.cb);
|
||||
Async.run.apply(Async, args);
|
||||
ret = yield;
|
||||
|
||||
this._os.notifyObservers(null, this._osPrefix + savedName + ":success", "");
|
||||
|
||||
} catch (e) {
|
||||
this._os.notifyObservers(null, this._osPrefix + savedName + ":error", "");
|
||||
throw e;
|
||||
}
|
||||
|
||||
self.done(ret);
|
||||
};
|
||||
},
|
||||
|
||||
// NOTE: see notify, this works the same way. they can be
|
||||
// chained together as well.
|
||||
lock: function WeaveSync_lock(method /* , arg1, arg2, ... */) {
|
||||
let savedMethod = method;
|
||||
let args = Array.prototype.slice.call(arguments, 1);
|
||||
|
||||
return function WeaveLockWrapper() {
|
||||
let self = yield;
|
||||
let ret;
|
||||
|
||||
this._dav.lock.async(this._dav, self.cb);
|
||||
let locked = yield;
|
||||
if (!locked)
|
||||
throw "Could not acquire lock";
|
||||
|
||||
try {
|
||||
args.unshift(this, savedMethod, self.cb);
|
||||
Async.run.apply(Async, args);
|
||||
ret = yield;
|
||||
|
||||
} catch (e) {
|
||||
throw e;
|
||||
|
||||
} finally {
|
||||
this._dav.unlock.async(this._dav, self.cb);
|
||||
yield;
|
||||
}
|
||||
|
||||
self.done(ret);
|
||||
};
|
||||
},
|
||||
|
||||
// NOTE: see notify, this works the same way. they can be
|
||||
// chained together as well.
|
||||
localLock: function WeaveSync_localLock(method /* , arg1, arg2, ... */) {
|
||||
let savedMethod = method;
|
||||
let args = Array.prototype.slice.call(arguments, 1);
|
||||
|
||||
return function WeaveLocalLockWrapper() {
|
||||
let self = yield;
|
||||
let ret;
|
||||
|
||||
if (this._dav.locked)
|
||||
throw "Could not acquire lock";
|
||||
this._dav.allowLock = false;
|
||||
|
||||
try {
|
||||
args.unshift(this, savedMethod, self.cb);
|
||||
Async.run.apply(Async, args);
|
||||
ret = yield;
|
||||
}
|
||||
catch (e) { throw e; }
|
||||
finally { this._dav.allowLock = true; }
|
||||
|
||||
self.done(ret);
|
||||
};
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче