mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-08 12:22:34 +00:00
Bug 885205 - Extremely slow reflect bookmarks menu items after restoring bookmarks. And disk access abnormal. And Firefox process does not disappear from task manager on exit. r=mak
This commit is contained in:
Raymond Lee
parent
cd546780e3
commit
27894c74c7
@ -85,7 +85,9 @@ this.BookmarkJSONUtils = Object.freeze({
|
||||
importJSONNode: function BJU_importJSONNode(aData, aContainer, aIndex,
|
||||
aGrandParentId) {
|
||||
let importer = new BookmarkImporter();
|
||||
return importer.importJSONNode(aData, aContainer, aIndex, aGrandParentId);
|
||||
// Can't make importJSONNode a task until we have made the
|
||||
// runInBatchMode in BI_importFromJSON to run asynchronously. Bug 890203
|
||||
return Promise.resolve(importer.importJSONNode(aData, aContainer, aIndex, aGrandParentId));
|
||||
},
|
||||
|
||||
/**
|
||||
@ -268,56 +270,54 @@ BookmarkImporter.prototype = {
|
||||
let searchIds = [];
|
||||
let folderIdMap = [];
|
||||
|
||||
Task.spawn(function() {
|
||||
for (let node of batch.nodes) {
|
||||
if (!node.children || node.children.length == 0)
|
||||
continue; // Nothing to restore for this root
|
||||
for (let node of batch.nodes) {
|
||||
if (!node.children || node.children.length == 0)
|
||||
continue; // Nothing to restore for this root
|
||||
|
||||
if (node.root) {
|
||||
let container = PlacesUtils.placesRootId; // Default to places root
|
||||
switch (node.root) {
|
||||
case "bookmarksMenuFolder":
|
||||
container = PlacesUtils.bookmarksMenuFolderId;
|
||||
break;
|
||||
case "tagsFolder":
|
||||
container = PlacesUtils.tagsFolderId;
|
||||
break;
|
||||
case "unfiledBookmarksFolder":
|
||||
container = PlacesUtils.unfiledBookmarksFolderId;
|
||||
break;
|
||||
case "toolbarFolder":
|
||||
container = PlacesUtils.toolbarFolderId;
|
||||
break;
|
||||
}
|
||||
|
||||
// Insert the data into the db
|
||||
for (let child of node.children) {
|
||||
let index = child.index;
|
||||
let [folders, searches] =
|
||||
yield this.importJSONNode(child, container, index, 0);
|
||||
for (let i = 0; i < folders.length; i++) {
|
||||
if (folders[i])
|
||||
folderIdMap[i] = folders[i];
|
||||
}
|
||||
searchIds = searchIds.concat(searches);
|
||||
}
|
||||
} else {
|
||||
yield this.importJSONNode(
|
||||
node, PlacesUtils.placesRootId, node.index, 0);
|
||||
if (node.root) {
|
||||
let container = PlacesUtils.placesRootId; // Default to places root
|
||||
switch (node.root) {
|
||||
case "bookmarksMenuFolder":
|
||||
container = PlacesUtils.bookmarksMenuFolderId;
|
||||
break;
|
||||
case "tagsFolder":
|
||||
container = PlacesUtils.tagsFolderId;
|
||||
break;
|
||||
case "unfiledBookmarksFolder":
|
||||
container = PlacesUtils.unfiledBookmarksFolderId;
|
||||
break;
|
||||
case "toolbarFolder":
|
||||
container = PlacesUtils.toolbarFolderId;
|
||||
break;
|
||||
}
|
||||
|
||||
// Insert the data into the db
|
||||
for (let child of node.children) {
|
||||
let index = child.index;
|
||||
let [folders, searches] =
|
||||
this.importJSONNode(child, container, index, 0);
|
||||
for (let i = 0; i < folders.length; i++) {
|
||||
if (folders[i])
|
||||
folderIdMap[i] = folders[i];
|
||||
}
|
||||
searchIds = searchIds.concat(searches);
|
||||
}
|
||||
} else {
|
||||
this.importJSONNode(
|
||||
node, PlacesUtils.placesRootId, node.index, 0);
|
||||
}
|
||||
}
|
||||
|
||||
// Fixup imported place: uris that contain folders
|
||||
searchIds.forEach(function(aId) {
|
||||
let oldURI = PlacesUtils.bookmarks.getBookmarkURI(aId);
|
||||
let uri = fixupQuery(oldURI, folderIdMap);
|
||||
if (!uri.equals(oldURI)) {
|
||||
PlacesUtils.bookmarks.changeBookmarkURI(aId, uri);
|
||||
}
|
||||
});
|
||||
// Fixup imported place: uris that contain folders
|
||||
searchIds.forEach(function(aId) {
|
||||
let oldURI = PlacesUtils.bookmarks.getBookmarkURI(aId);
|
||||
let uri = fixupQuery(oldURI, folderIdMap);
|
||||
if (!uri.equals(oldURI)) {
|
||||
PlacesUtils.bookmarks.changeBookmarkURI(aId, uri);
|
||||
}
|
||||
});
|
||||
|
||||
deferred.resolve();
|
||||
}.bind(this));
|
||||
deferred.resolve();
|
||||
}.bind(this)
|
||||
};
|
||||
|
||||
@ -341,138 +341,137 @@ BookmarkImporter.prototype = {
|
||||
*/
|
||||
importJSONNode: function BI_importJSONNode(aData, aContainer, aIndex,
|
||||
aGrandParentId) {
|
||||
return Task.spawn(function() {
|
||||
let folderIdMap = [];
|
||||
let searchIds = [];
|
||||
let id = -1;
|
||||
switch (aData.type) {
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER:
|
||||
if (aContainer == PlacesUtils.tagsFolderId) {
|
||||
// Node is a tag
|
||||
if (aData.children) {
|
||||
aData.children.forEach(function(aChild) {
|
||||
try {
|
||||
PlacesUtils.tagging.tagURI(
|
||||
NetUtil.newURI(aChild.uri), [aData.title]);
|
||||
} catch (ex) {
|
||||
// Invalid tag child, skip it
|
||||
}
|
||||
});
|
||||
throw new Task.Result([folderIdMap, searchIds]);
|
||||
}
|
||||
} else if (aData.livemark && aData.annos) {
|
||||
// Node is a livemark
|
||||
let feedURI = null;
|
||||
let siteURI = null;
|
||||
aData.annos = aData.annos.filter(function(aAnno) {
|
||||
switch (aAnno.name) {
|
||||
case PlacesUtils.LMANNO_FEEDURI:
|
||||
feedURI = NetUtil.newURI(aAnno.value);
|
||||
return false;
|
||||
case PlacesUtils.LMANNO_SITEURI:
|
||||
siteURI = NetUtil.newURI(aAnno.value);
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
let folderIdMap = [];
|
||||
let searchIds = [];
|
||||
let id = -1;
|
||||
switch (aData.type) {
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER:
|
||||
if (aContainer == PlacesUtils.tagsFolderId) {
|
||||
// Node is a tag
|
||||
if (aData.children) {
|
||||
aData.children.forEach(function(aChild) {
|
||||
try {
|
||||
PlacesUtils.tagging.tagURI(
|
||||
NetUtil.newURI(aChild.uri), [aData.title]);
|
||||
} catch (ex) {
|
||||
// Invalid tag child, skip it
|
||||
}
|
||||
});
|
||||
|
||||
if (feedURI) {
|
||||
PlacesUtils.livemarks.addLivemark({
|
||||
title: aData.title,
|
||||
feedURI: feedURI,
|
||||
parentId: aContainer,
|
||||
index: aIndex,
|
||||
lastModified: aData.lastModified,
|
||||
siteURI: siteURI
|
||||
}, function(aStatus, aLivemark) {
|
||||
if (Components.isSuccessCode(aStatus)) {
|
||||
let id = aLivemark.id;
|
||||
if (aData.dateAdded)
|
||||
PlacesUtils.bookmarks.setItemDateAdded(id, aData.dateAdded);
|
||||
if (aData.annos && aData.annos.length)
|
||||
PlacesUtils.setAnnotationsForItem(id, aData.annos);
|
||||
}
|
||||
});
|
||||
return [folderIdMap, searchIds];
|
||||
}
|
||||
} else if (aData.livemark && aData.annos) {
|
||||
// Node is a livemark
|
||||
let feedURI = null;
|
||||
let siteURI = null;
|
||||
aData.annos = aData.annos.filter(function(aAnno) {
|
||||
switch (aAnno.name) {
|
||||
case PlacesUtils.LMANNO_FEEDURI:
|
||||
feedURI = NetUtil.newURI(aAnno.value);
|
||||
return false;
|
||||
case PlacesUtils.LMANNO_SITEURI:
|
||||
siteURI = NetUtil.newURI(aAnno.value);
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
id = PlacesUtils.bookmarks.createFolder(
|
||||
aContainer, aData.title, aIndex);
|
||||
folderIdMap[aData.id] = id;
|
||||
// Process children
|
||||
if (aData.children) {
|
||||
for (let i = 0; i < aData.children.length; i++) {
|
||||
let child = aData.children[i];
|
||||
let [folders, searches] =
|
||||
yield this.importJSONNode(child, id, i, aContainer);
|
||||
for (let j = 0; j < folders.length; j++) {
|
||||
if (folders[j])
|
||||
folderIdMap[j] = folders[j];
|
||||
}
|
||||
searchIds = searchIds.concat(searches);
|
||||
});
|
||||
|
||||
if (feedURI) {
|
||||
PlacesUtils.livemarks.addLivemark({
|
||||
title: aData.title,
|
||||
feedURI: feedURI,
|
||||
parentId: aContainer,
|
||||
index: aIndex,
|
||||
lastModified: aData.lastModified,
|
||||
siteURI: siteURI
|
||||
}, function(aStatus, aLivemark) {
|
||||
if (Components.isSuccessCode(aStatus)) {
|
||||
let id = aLivemark.id;
|
||||
if (aData.dateAdded)
|
||||
PlacesUtils.bookmarks.setItemDateAdded(id, aData.dateAdded);
|
||||
if (aData.annos && aData.annos.length)
|
||||
PlacesUtils.setAnnotationsForItem(id, aData.annos);
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
id = PlacesUtils.bookmarks.createFolder(
|
||||
aContainer, aData.title, aIndex);
|
||||
folderIdMap[aData.id] = id;
|
||||
// Process children
|
||||
if (aData.children) {
|
||||
for (let i = 0; i < aData.children.length; i++) {
|
||||
let child = aData.children[i];
|
||||
let [folders, searches] =
|
||||
this.importJSONNode(child, id, i, aContainer);
|
||||
for (let j = 0; j < folders.length; j++) {
|
||||
if (folders[j])
|
||||
folderIdMap[j] = folders[j];
|
||||
}
|
||||
searchIds = searchIds.concat(searches);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE:
|
||||
id = PlacesUtils.bookmarks.insertBookmark(
|
||||
aContainer, NetUtil.newURI(aData.uri), aIndex, aData.title);
|
||||
if (aData.keyword)
|
||||
PlacesUtils.bookmarks.setKeywordForBookmark(id, aData.keyword);
|
||||
if (aData.tags) {
|
||||
let tags = aData.tags.split(", ");
|
||||
if (tags.length)
|
||||
PlacesUtils.tagging.tagURI(NetUtil.newURI(aData.uri), tags);
|
||||
}
|
||||
break;
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE:
|
||||
id = PlacesUtils.bookmarks.insertBookmark(
|
||||
aContainer, NetUtil.newURI(aData.uri), aIndex, aData.title);
|
||||
if (aData.keyword)
|
||||
PlacesUtils.bookmarks.setKeywordForBookmark(id, aData.keyword);
|
||||
if (aData.tags) {
|
||||
let tags = aData.tags.split(", ");
|
||||
if (tags.length)
|
||||
PlacesUtils.tagging.tagURI(NetUtil.newURI(aData.uri), tags);
|
||||
}
|
||||
if (aData.charset) {
|
||||
PlacesUtils.annotations.setPageAnnotation(
|
||||
NetUtil.newURI(aData.uri), PlacesUtils.CHARSET_ANNO, aData.charset,
|
||||
0, Ci.nsIAnnotationService.EXPIRE_NEVER);
|
||||
}
|
||||
if (aData.uri.substr(0, 6) == "place:")
|
||||
searchIds.push(id);
|
||||
if (aData.icon) {
|
||||
try {
|
||||
// Create a fake faviconURI to use (FIXME: bug 523932)
|
||||
let faviconURI = NetUtil.newURI("fake-favicon-uri:" + aData.uri);
|
||||
PlacesUtils.favicons.replaceFaviconDataFromDataURL(
|
||||
faviconURI, aData.icon, 0);
|
||||
PlacesUtils.favicons.setAndFetchFaviconForPage(
|
||||
NetUtil.newURI(aData.uri), faviconURI, false,
|
||||
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
|
||||
} catch (ex) {
|
||||
Components.utils.reportError("Failed to import favicon data:" + ex);
|
||||
}
|
||||
if (aData.charset) {
|
||||
yield PlacesUtils.setCharsetForURI(
|
||||
NetUtil.newURI(aData.uri), aData.charset);
|
||||
}
|
||||
if (aData.iconUri) {
|
||||
try {
|
||||
PlacesUtils.favicons.setAndFetchFaviconForPage(
|
||||
NetUtil.newURI(aData.uri), NetUtil.newURI(aData.iconUri), false,
|
||||
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
|
||||
} catch (ex) {
|
||||
Components.utils.reportError("Failed to import favicon URI:" + ex);
|
||||
}
|
||||
if (aData.uri.substr(0, 6) == "place:")
|
||||
searchIds.push(id);
|
||||
if (aData.icon) {
|
||||
try {
|
||||
// Create a fake faviconURI to use (FIXME: bug 523932)
|
||||
let faviconURI = NetUtil.newURI("fake-favicon-uri:" + aData.uri);
|
||||
PlacesUtils.favicons.replaceFaviconDataFromDataURL(
|
||||
faviconURI, aData.icon, 0);
|
||||
PlacesUtils.favicons.setAndFetchFaviconForPage(
|
||||
NetUtil.newURI(aData.uri), faviconURI, false,
|
||||
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
|
||||
} catch (ex) {
|
||||
Components.utils.reportError("Failed to import favicon data:" + ex);
|
||||
}
|
||||
}
|
||||
if (aData.iconUri) {
|
||||
try {
|
||||
PlacesUtils.favicons.setAndFetchFaviconForPage(
|
||||
NetUtil.newURI(aData.uri), NetUtil.newURI(aData.iconUri), false,
|
||||
PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
|
||||
} catch (ex) {
|
||||
Components.utils.reportError("Failed to import favicon URI:" + ex);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE_SEPARATOR:
|
||||
id = PlacesUtils.bookmarks.insertSeparator(aContainer, aIndex);
|
||||
break;
|
||||
default:
|
||||
// Unknown node type
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PlacesUtils.TYPE_X_MOZ_PLACE_SEPARATOR:
|
||||
id = PlacesUtils.bookmarks.insertSeparator(aContainer, aIndex);
|
||||
break;
|
||||
default:
|
||||
// Unknown node type
|
||||
}
|
||||
|
||||
// Set generic properties, valid for all nodes
|
||||
if (id != -1 && aContainer != PlacesUtils.tagsFolderId &&
|
||||
aGrandParentId != PlacesUtils.tagsFolderId) {
|
||||
if (aData.dateAdded)
|
||||
PlacesUtils.bookmarks.setItemDateAdded(id, aData.dateAdded);
|
||||
if (aData.lastModified)
|
||||
PlacesUtils.bookmarks.setItemLastModified(id, aData.lastModified);
|
||||
if (aData.annos && aData.annos.length)
|
||||
PlacesUtils.setAnnotationsForItem(id, aData.annos);
|
||||
}
|
||||
// Set generic properties, valid for all nodes
|
||||
if (id != -1 && aContainer != PlacesUtils.tagsFolderId &&
|
||||
aGrandParentId != PlacesUtils.tagsFolderId) {
|
||||
if (aData.dateAdded)
|
||||
PlacesUtils.bookmarks.setItemDateAdded(id, aData.dateAdded);
|
||||
if (aData.lastModified)
|
||||
PlacesUtils.bookmarks.setItemLastModified(id, aData.lastModified);
|
||||
if (aData.annos && aData.annos.length)
|
||||
PlacesUtils.setAnnotationsForItem(id, aData.annos);
|
||||
}
|
||||
|
||||
throw new Task.Result([folderIdMap, searchIds]);
|
||||
}.bind(this));
|
||||
return [folderIdMap, searchIds];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user