wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

better log viewer performance thanks to chris; small bugfixes in the component; temporarily disable some very verbose logging output

Browse Source
This commit is contained in:
Dan Mills 2007-09-27 14:40:21 -07:00
parent fc5f98b819
commit 1ee32be4b4
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/sync/nsBookmarksSyncService.js
View File

@ -110,8 +110,7 @@ BookmarksSyncService.prototype = {
// DAVCollection object
_dav: null,
// Last synced tree
// FIXME: this should be serialized to disk
// Last synced tree and version
_snapshot: {},
_snapshotVersion: 0,
@ -263,7 +262,7 @@ BookmarksSyncService.prototype = {
},
_nodeParentsInt: function BSS__nodeParentsInt(guid, tree, parents) {
if (tree[guid] && tree[guid].parentGuid == null)
if (!tree[guid] || !tree[guid].parentGuid)
return parents;
parents.push(tree[guid].parentGuid);
return this._nodeParentsInt(tree[guid].parentGuid, tree, parents);
@ -317,7 +316,6 @@ BookmarksSyncService.prototype = {
return true;
if ((a.guid == b.guid) && !this._deepEquals(a, b))
return true;
// FIXME - how else can two commands conflict?
return false;
},
@ -608,13 +606,16 @@ BookmarksSyncService.prototype = {
case "uri":
this._bms.changeBookmarkURI(itemId, makeURI(command.data.uri));
break;
case "index": // FIXME: what if we do this one before parentGuid ? that'd be wrong
case "index":
this._bms.moveItem(itemId, this._bms.getFolderIdForItem(itemId),
command.data.index);
break;
case "parentGuid":
let index = -1;
if (command.data.index && command.data.index >= 0)
index = command.data.index;
this._bms.moveItem(
itemId, this._bms.getItemIdForGUID(command.data.parentGuid), -1);
itemId, this._bms.getItemIdForGUID(command.data.parentGuid), index);
break;
default:
this.notice("Warning: Can't change item property: " + key);
@ -791,9 +792,15 @@ BookmarksSyncService.prototype = {
this._wrapNode(localBookmarks));
this._snapshotVersion = server['version'];
this._applyCommands(clientChanges);
// FIXME: should wrapNode to a separate variable and make sure
// that snapshot -> that is an empty diff.
this._snapshot = this._wrapNode(localBookmarks);
let newSnapshot = this._wrapNode(localBookmarks);
let diff = this._detectUpdates(this._snapshot, newSnapshot);
if (diff.length != 0) {
this.notice("Error: commands did not apply correctly. Diff:\n" +
uneval(diff));
this._snapshot = this._wrapNode(localBookmarks);
// FIXME: What else can we do?
}
this._saveSnapshot();
}
@ -810,7 +817,8 @@ BookmarksSyncService.prototype = {
this.notice("Successfully updated deltas on server");
this._saveSnapshot();
} else {
// FIXME: revert snapshot here?
// FIXME: revert snapshot here? - can't, we already applied
// updates locally! - need to save and retry
this.notice("Error: could not update deltas on server");
}
}
@ -857,6 +865,7 @@ BookmarksSyncService.prototype = {
var tmp = eval(uneval(this._snapshot)); // fixme hack hack hack
// FIXME: debug here for conditional below...
/*
this.notice("[sync bowels] local version: " + this._snapshotVersion);
for (var z in ret.deltas) {
this.notice("[sync bowels] remote version: " + z);
@ -866,6 +875,7 @@ BookmarksSyncService.prototype = {
this.notice("-> is true");
else
this.notice("-> is false");
*/
if (ret.deltas[this._snapshotVersion + 1]) {
// Merge the matching deltas into one, find highest version
@ -877,10 +887,10 @@ BookmarksSyncService.prototype = {
ret.version = v;
}
keys = keys.sort();
this.notice("TMP: " + uneval(tmp));
//this.notice("TMP: " + uneval(tmp));
for (var i = 0; i < keys.length; i++) {
tmp = this._applyCommandsToObj(ret.deltas[keys[i]], tmp);
this.notice("TMP: " + uneval(tmp));
//this.notice("TMP: " + uneval(tmp));
}
ret.status = 1;
ret["updates"] = this._detectUpdates(this._snapshot, tmp);