Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 679279 - Part 4: bookmarks engine cleanup. r=philikon

Browse Source 
This patch reformats some definitions to more closely follow the style guide
and allow for easier extension in subsequent patches, and eliminates the
archiveBookmarks helper.
This commit is contained in:
Richard Newman 2011-08-19 17:17:58 -07:00
parent 7e417183c2
commit 1fa15dde52
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
services/sync/modules/engines/bookmarks.js
View File

@ -113,8 +113,9 @@ PlacesItem.prototype = {
_logName: "Sync.Record.PlacesItem",
};
Utils.deferGetSet(PlacesItem, "cleartext", ["hasDupe", "parentid", "parentName",
"type"]);
Utils.deferGetSet(PlacesItem,
"cleartext",
["hasDupe", "parentid", "parentName", "type"]);
function Bookmark(collection, id, type) {
PlacesItem.call(this, collection, id, type || "bookmark");
@ -124,8 +125,10 @@ Bookmark.prototype = {
_logName: "Sync.Record.Bookmark",
};
Utils.deferGetSet(Bookmark, "cleartext", ["title", "bmkUri", "description",
"loadInSidebar", "tags", "keyword"]);
Utils.deferGetSet(Bookmark,
"cleartext",
["title", "bmkUri", "description",
"loadInSidebar", "tags", "keyword"]);
function BookmarkQuery(collection, id) {
Bookmark.call(this, collection, id, "query");
@ -135,8 +138,9 @@ BookmarkQuery.prototype = {
_logName: "Sync.Record.BookmarkQuery",
};
Utils.deferGetSet(BookmarkQuery, "cleartext", ["folderName",
"queryId"]);
Utils.deferGetSet(BookmarkQuery,
"cleartext",
["folderName", "queryId"]);
function BookmarkFolder(collection, id, type) {
PlacesItem.call(this, collection, id, type || "folder");
@ -170,14 +174,6 @@ BookmarkSeparator.prototype = {
Utils.deferGetSet(BookmarkSeparator, "cleartext", "pos");
function archiveBookmarks() {
// Some nightly builds of 3.7 don't have this function
try {
PlacesUtils.archiveBookmarksFile(null, true);
}
catch(ex) {}
}
let kSpecialIds = {
// Special IDs. Note that mobile can attempt to create a record on
@ -389,8 +385,9 @@ BookmarksEngine.prototype = {
SyncEngine.prototype._syncStartup.call(this);
// For first-syncs, make a backup for the user to restore
if (this.lastSync == 0)
archiveBookmarks();
if (this.lastSync == 0) {
PlacesUtils.archiveBookmarksFile(null, true);
}
this.__defineGetter__("_guidMap", function() {
// Create a mapping of folder titles and separator positions to GUID.
@ -1174,7 +1171,7 @@ BookmarksStore.prototype = {
if (record.parentid == "toolbar")
index += 150;
// Add in the bookmark's frecency if we have something
// Add in the bookmark's frecency if we have something.
if (record.bmkUri != null) {
this._frecencyStm.params.url = record.bmkUri;
let result = Async.querySpinningly(this._frecencyStm, this._frecencyCols);
@ -1217,10 +1214,10 @@ BookmarksStore.prototype = {
},
_tagURI: function BStore_tagURI(bmkURI, tags) {
// Filter out any null/undefined/empty tags
// Filter out any null/undefined/empty tags.
tags = tags.filter(function(t) t);
// Temporarily tag a dummy uri to preserve tag ids when untagging
// Temporarily tag a dummy URI to preserve tag ids when untagging.
let dummyURI = Utils.makeURI("about:weave#BStore_tagURI");
PlacesUtils.tagging.tagURI(dummyURI, tags);
PlacesUtils.tagging.untagURI(bmkURI, null);
@ -1239,8 +1236,8 @@ BookmarksStore.prototype = {
},
wipe: function BStore_wipe() {
// Save a backup before clearing out all bookmarks
archiveBookmarks();
// Save a backup before clearing out all bookmarks.
PlacesUtils.archiveBookmarksFile(null, true);
for each (let guid in kSpecialIds.guids)
if (guid != "places") {
@ -1310,10 +1307,10 @@ BookmarksTracker.prototype = {
]),
/**
* Add a bookmark guid to be uploaded and bump up the sync score
* Add a bookmark GUID to be uploaded and bump up the sync score.
*
* @param itemGuid
* Guid of the bookmark to upload
* GUID of the bookmark to upload.
*/
_add: function BMT__add(itemId, guid) {
guid = kSpecialIds.specialGUIDForId(itemId) || guid;
@ -1321,14 +1318,14 @@ BookmarksTracker.prototype = {
this._upScore();
},
/* Every add/remove/change will trigger a sync for MULTI_DEVICE */
/* Every add/remove/change will trigger a sync for MULTI_DEVICE. */
_upScore: function BMT__upScore() {
this.score += SCORE_INCREMENT_XLARGE;
},
/**
* Determine if a change should be ignored: we're ignoring everything or the
* folder is for livemarks
* folder is for livemarks.
*
* @param itemId
* Item under consideration to ignore