зеркало из https://github.com/mozilla/gecko-dev.git
Bug 610501: handle smart bookmarks correctly in Sync.
This commit is contained in:
Richard Newman
Родитель
74df0a04ca
Коммит
38886bdf84
|
|
@ -50,6 +50,7 @@ const GUID_ANNO = "sync/guid";
|
|||
const MOBILE_ANNO = "mobile/bookmarksRoot";
|
||||
const PARENT_ANNO = "sync/parent";
|
||||
const SERVICE_NOT_SUPPORTED = "Service not supported on this platform";
|
||||
const SMART_BOOKMARKS_ANNO = "Places/SmartBookmark";
|
||||
const FOLDER_SORTINDEX = 1000000;
|
||||
|
||||
try {
|
||||
|
|
@ -137,7 +138,8 @@ BookmarkQuery.prototype = {
|
|||
_logName: "Record.BookmarkQuery",
|
||||
};
|
||||
|
||||
Utils.deferGetSet(BookmarkQuery, "cleartext", ["folderName"]);
|
||||
Utils.deferGetSet(BookmarkQuery, "cleartext", ["folderName",
|
||||
"queryId"]);
|
||||
|
||||
function BookmarkFolder(collection, id, type) {
|
||||
PlacesItem.call(this, collection, id, type || "folder");
|
||||
|
|
@ -585,6 +587,11 @@ BookmarksStore.prototype = {
|
|||
this._log.debug(["created bookmark", newId, "under", record._parent,
|
||||
"as", record.title, record.bmkUri].join(" "));
|
||||
|
||||
// Smart bookmark annotations are strings.
|
||||
if (record.queryId) {
|
||||
Utils.anno(newId, SMART_BOOKMARKS_ANNO, record.queryId);
|
||||
}
|
||||
|
||||
if (Utils.isArray(record.tags)) {
|
||||
this._tagURI(uri, record.tags);
|
||||
}
|
||||
|
|
@ -735,6 +742,9 @@ BookmarksStore.prototype = {
|
|||
this._log.debug("Could not set microsummary generator URI: " + e);
|
||||
}
|
||||
} break;
|
||||
case "queryId":
|
||||
Utils.anno(itemId, SMART_BOOKMARKS_ANNO, val);
|
||||
break;
|
||||
case "siteUri":
|
||||
this._ls.setSiteURI(itemId, Utils.makeURI(val));
|
||||
break;
|
||||
|
|
@ -884,7 +894,18 @@ BookmarksStore.prototype = {
|
|||
if (folder != null) {
|
||||
folder = folder[1];
|
||||
record.folderName = this._bms.getItemTitle(folder);
|
||||
this._log.debug("query id: " + folder + " = " + record.folderName);
|
||||
this._log.trace("query id: " + folder + " = " + record.folderName);
|
||||
}
|
||||
}
|
||||
catch(ex) {}
|
||||
|
||||
// Persist the Smart Bookmark anno, if found.
|
||||
try {
|
||||
let anno = Utils.anno(placeId, SMART_BOOKMARKS_ANNO);
|
||||
if (anno != null) {
|
||||
this._log.trace("query anno: " + SMART_BOOKMARKS_ANNO +
|
||||
" = " + anno);
|
||||
record.queryId = anno;
|
||||
}
|
||||
}
|
||||
catch(ex) {}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,188 @@
|
|||
Cu.import("resource://services-sync/engines.js");
|
||||
Cu.import("resource://services-sync/engines/bookmarks.js");
|
||||
Cu.import("resource://services-sync/record.js");
|
||||
Cu.import("resource://services-sync/log4moz.js");
|
||||
Cu.import("resource://services-sync/util.js");
|
||||
|
||||
Cu.import("resource://services-sync/service.js");
|
||||
try {
|
||||
Cu.import("resource://gre/modules/PlacesUtils.jsm");
|
||||
}
|
||||
catch(ex) {
|
||||
Cu.import("resource://gre/modules/utils.js");
|
||||
}
|
||||
|
||||
const SMART_BOOKMARKS_ANNO = "Places/SmartBookmark";
|
||||
var IOService = Cc["@mozilla.org/network/io-service;1"]
|
||||
.getService(Ci.nsIIOService);
|
||||
("http://www.mozilla.com", null, null);
|
||||
|
||||
|
||||
Engines.register(BookmarksEngine);
|
||||
let engine = Engines.get("bookmarks");
|
||||
let store = engine._store;
|
||||
|
||||
// Clean up after other tests. Only necessary in XULRunner.
|
||||
store.wipe();
|
||||
|
||||
function makeEngine() {
|
||||
return new BookmarksEngine();
|
||||
}
|
||||
var syncTesting = new SyncTestingInfrastructure(makeEngine);
|
||||
|
||||
function newSmartBookmark(parent, uri, position, title, queryID) {
|
||||
let id = PlacesUtils.bookmarks.insertBookmark(parent, uri, position, title);
|
||||
PlacesUtils.annotations.setItemAnnotation(id, SMART_BOOKMARKS_ANNO,
|
||||
queryID, 0,
|
||||
PlacesUtils.annotations.EXPIRE_NEVER);
|
||||
return id;
|
||||
}
|
||||
|
||||
function smartBookmarkCount() {
|
||||
// We do it this way because PlacesUtils.annotations.getItemsWithAnnotation
|
||||
// doesn't work the same (or at all?) between 3.6 and 4.0.
|
||||
let out = {};
|
||||
Svc.Annos.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO, out);
|
||||
return out.value;
|
||||
}
|
||||
|
||||
function clearBookmarks() {
|
||||
_("Cleaning up existing items.");
|
||||
Svc.Bookmark.removeFolderChildren(Svc.Bookmark.bookmarksMenuFolder);
|
||||
Svc.Bookmark.removeFolderChildren(Svc.Bookmark.tagsFolder);
|
||||
Svc.Bookmark.removeFolderChildren(Svc.Bookmark.toolbarFolder);
|
||||
Svc.Bookmark.removeFolderChildren(Svc.Bookmark.unfiledBookmarksFolder);
|
||||
startCount = smartBookmarkCount();
|
||||
}
|
||||
|
||||
// Verify that Places smart bookmarks have their annotation uploaded and
|
||||
// handled locally.
|
||||
function test_annotation_uploaded() {
|
||||
let startCount = smartBookmarkCount();
|
||||
|
||||
_("Start count is " + startCount);
|
||||
|
||||
if (startCount > 0) {
|
||||
// This can happen in XULRunner.
|
||||
clearBookmarks();
|
||||
_("Start count is now " + startCount);
|
||||
}
|
||||
|
||||
_("Create a smart bookmark in the toolbar.");
|
||||
let parent = PlacesUtils.toolbarFolderId;
|
||||
let uri =
|
||||
Utils.makeURI("place:redirectsMode=" +
|
||||
Ci.nsINavHistoryQueryOptions.REDIRECTS_MODE_TARGET +
|
||||
"&sort=" +
|
||||
Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
|
||||
"&maxResults=10");
|
||||
let title = "Most Visited";
|
||||
|
||||
let mostVisitedID = newSmartBookmark(parent, uri, -1, title, "MostVisited");
|
||||
|
||||
_("New item ID: " + mostVisitedID);
|
||||
do_check_true(!!mostVisitedID);
|
||||
|
||||
let annoValue = Utils.anno(mostVisitedID, SMART_BOOKMARKS_ANNO);
|
||||
_("Anno: " + annoValue);
|
||||
do_check_eq("MostVisited", annoValue);
|
||||
|
||||
let guid = store.GUIDForId(mostVisitedID);
|
||||
_("GUID: " + guid);
|
||||
do_check_true(!!guid);
|
||||
|
||||
_("Create record object and verify that it's sane.");
|
||||
let record = store.createRecord(guid);
|
||||
do_check_true(record instanceof Bookmark);
|
||||
do_check_true(record instanceof BookmarkQuery);
|
||||
|
||||
do_check_eq(record.bmkUri, uri.spec);
|
||||
|
||||
_("Make sure the new record carries with it the annotation.");
|
||||
do_check_eq("MostVisited", record.queryId);
|
||||
|
||||
_("Our count has increased since we started.");
|
||||
do_check_eq(smartBookmarkCount(), startCount + 1);
|
||||
|
||||
_("Sync record to the server.");
|
||||
Svc.Prefs.set("username", "foo");
|
||||
Service.serverURL = "http://localhost:8080/";
|
||||
Service.clusterURL = "http://localhost:8080/";
|
||||
|
||||
let collection = new ServerCollection({}, true);
|
||||
let global = new ServerWBO('global',
|
||||
{engines: {bookmarks: {version: engine.version,
|
||||
syncID: engine.syncID}}});
|
||||
let server = httpd_setup({
|
||||
"/1.0/foo/storage/meta/global": global.handler(),
|
||||
"/1.0/foo/storage/bookmarks": collection.handler()
|
||||
});
|
||||
|
||||
try {
|
||||
engine.sync();
|
||||
let wbos = [id for ([id, wbo] in Iterator(collection.wbos))
|
||||
if (["menu", "toolbar", "mobile"].indexOf(id) == -1)];
|
||||
do_check_eq(wbos.length, 1);
|
||||
|
||||
_("Verify that the server WBO has the annotation.");
|
||||
let serverGUID = wbos[0];
|
||||
do_check_eq(serverGUID, guid);
|
||||
let serverWBO = collection.wbos[serverGUID];
|
||||
do_check_true(!!serverWBO);
|
||||
let body = JSON.parse(JSON.parse(serverWBO.payload).ciphertext);
|
||||
do_check_eq(body.queryId, "MostVisited");
|
||||
|
||||
_("We still have the right count.");
|
||||
do_check_eq(smartBookmarkCount(), startCount + 1);
|
||||
|
||||
_("Clear local records; now we can't find it.");
|
||||
|
||||
// "Clear" by changing attributes: if we delete it, apparently it sticks
|
||||
// around as a deleted record...
|
||||
Svc.Bookmark.setItemGUID(mostVisitedID, "abcdefabcdef");
|
||||
Svc.Bookmark.setItemTitle(mostVisitedID, "Not Most Visited");
|
||||
Svc.Bookmark.changeBookmarkURI(mostVisitedID,
|
||||
Utils.makeURI("http://something/else"));
|
||||
Svc.Annos.removeItemAnnotation(mostVisitedID, SMART_BOOKMARKS_ANNO);
|
||||
store.wipe();
|
||||
engine.resetClient();
|
||||
do_check_eq(smartBookmarkCount(), startCount);
|
||||
|
||||
_("Sync. Verify that the downloaded record carries the annotation.");
|
||||
engine.sync();
|
||||
|
||||
_("Verify that the Places DB now has an annotated bookmark.");
|
||||
_("Our count has increased again.");
|
||||
do_check_eq(smartBookmarkCount(), startCount + 1);
|
||||
|
||||
_("Find by GUID and verify that it's annotated.");
|
||||
let newID = store.idForGUID(serverGUID);
|
||||
let newAnnoValue = Utils.anno(newID, SMART_BOOKMARKS_ANNO);
|
||||
do_check_eq(newAnnoValue, "MostVisited");
|
||||
do_check_eq(Svc.Bookmark.getBookmarkURI(newID).spec, uri.spec);
|
||||
|
||||
_("Test updating.");
|
||||
let newRecord = store.createRecord(serverGUID);
|
||||
do_check_eq(newRecord.queryId, newAnnoValue);
|
||||
newRecord.queryId = "LeastVisited";
|
||||
store.update(newRecord);
|
||||
do_check_eq("LeastVisited", Utils.anno(newID, SMART_BOOKMARKS_ANNO));
|
||||
|
||||
|
||||
} finally {
|
||||
// Clean up.
|
||||
store.wipe();
|
||||
server.stop(do_test_finished);
|
||||
Svc.Prefs.resetBranch("");
|
||||
Records.clearCache();
|
||||
}
|
||||
}
|
||||
|
||||
function run_test() {
|
||||
initTestLogging("Trace");
|
||||
Log4Moz.repository.getLogger("Engine.Bookmarks").level = Log4Moz.Level.Trace;
|
||||
|
||||
CollectionKeys.generateNewKeys();
|
||||
|
||||
test_annotation_uploaded();
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче