зеркало из https://github.com/mozilla/gecko-dev.git
Bug 444849 - Removing a bookmark doesn't clean up tags, r=mak77
This commit is contained in:
Drew Willcoxon
Родитель
af5087052d
Коммит
40d0b1dffa
|
|
@ -21,6 +21,9 @@
|
|||
*
|
||||
* Contributor(s):
|
||||
* Asaf Romano <mano@mozilla.com> (Original Author)
|
||||
* Dietrich Ayala <dietrich@mozilla.com>
|
||||
* Marco Bonardo <mak77@bonardo.net>
|
||||
* Drew Willcoxon <adw@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
|
||||
|
|
@ -344,9 +347,39 @@ TaggingService.prototype = {
|
|||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* If the only bookmark items associated with aURI are contained in tag
|
||||
* folders, returns the IDs of those tag folders. This can be the case if
|
||||
* the URI was bookmarked and tagged at some point, but the bookmark was
|
||||
* removed, leaving only the bookmark items in tag folders. Returns null
|
||||
* if the URI is either properly bookmarked or not tagged.
|
||||
*
|
||||
* @param aURI
|
||||
* A URI (string) that may or may not be bookmarked
|
||||
* @returns null or an array of tag IDs
|
||||
*/
|
||||
_getTagsIfUnbookmarkedURI: function TS__getTagsIfUnbookmarkedURI(aURI) {
|
||||
var tagIds = [];
|
||||
var isBookmarked = false;
|
||||
var itemIds = this._bms.getBookmarkIdsForURI(aURI, {});
|
||||
|
||||
for (let i = 0; !isBookmarked && i < itemIds.length; i++) {
|
||||
var parentId = this._bms.getFolderIdForItem(itemIds[i]);
|
||||
if (this._tagFolders[parentId])
|
||||
tagIds.push(parentId);
|
||||
else
|
||||
isBookmarked = true;
|
||||
}
|
||||
|
||||
return !isBookmarked && tagIds.length > 0 ? tagIds : null;
|
||||
},
|
||||
|
||||
// boolean to indicate if we're in a batch
|
||||
_inBatch: false,
|
||||
|
||||
// maps the IDs of bookmarks in the process of being removed to their URIs
|
||||
_itemsInRemoval: {},
|
||||
|
||||
// nsINavBookmarkObserver
|
||||
onBeginUpdateBatch: function() {
|
||||
this._inBatch = true;
|
||||
|
|
@ -360,17 +393,39 @@ TaggingService.prototype = {
|
|||
this._tagFolders[aItemId] = this._bms.getItemTitle(aItemId);
|
||||
},
|
||||
onBeforeItemRemoved: function(aItemId) {
|
||||
// Remember the bookmark's URI, because it will be gone by the time
|
||||
// onItemRemoved() is called. getBookmarkURI() will throw if the item is
|
||||
// not a bookmark, which is fine.
|
||||
try {
|
||||
this._itemsInRemoval[aItemId] = this._bms.getBookmarkURI(aItemId);
|
||||
}
|
||||
catch (e) {}
|
||||
},
|
||||
onItemRemoved: function(aItemId, aFolderId, aIndex){
|
||||
onItemRemoved: function(aItemId, aFolderId, aIndex) {
|
||||
var itemURI = this._itemsInRemoval[aItemId];
|
||||
delete this._itemsInRemoval[aItemId];
|
||||
|
||||
// Item is a tag folder.
|
||||
if (aFolderId == this._bms.tagsFolder && this._tagFolders[aItemId])
|
||||
delete this._tagFolders[aItemId];
|
||||
|
||||
// Item is a bookmark that was removed from a non-tag folder.
|
||||
else if (itemURI && !this._tagFolders[aFolderId]) {
|
||||
|
||||
// If the only bookmark items now associated with the bookmark's URI are
|
||||
// contained in tag folders, the URI is no longer properly bookmarked, so
|
||||
// untag it.
|
||||
var tagIds = this._getTagsIfUnbookmarkedURI(itemURI);
|
||||
if (tagIds)
|
||||
this.untagURI(itemURI, tagIds);
|
||||
}
|
||||
},
|
||||
onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aValue){
|
||||
onItemChanged: function(aItemId, aProperty, aIsAnnotationProperty, aValue) {
|
||||
if (this._tagFolders[aItemId])
|
||||
this._tagFolders[aItemId] = this._bms.getItemTitle(aItemId);
|
||||
},
|
||||
onItemVisited: function(aItemId, aVisitID, time){},
|
||||
onItemMoved: function(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex){
|
||||
onItemVisited: function(aItemId, aVisitID, time) {},
|
||||
onItemMoved: function(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex) {
|
||||
if (this._tagFolders[aItemId] && this._bms.tagFolder == aOldParent &&
|
||||
this._bms.tagFolder != aNewParent)
|
||||
delete this._tagFolders[aItemId];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,150 @@
|
|||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:set ts=2 sw=2 sts=2 et: */
|
||||
/* ***** 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 Places unit test code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Drew Willcoxon <adw@mozilla.com> (Original Author)
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
/**
|
||||
* Ensures that removal of a bookmark untags the bookmark if it's no longer
|
||||
* contained in any regular, non-tag folders. See bug 444849.
|
||||
*/
|
||||
|
||||
// Add your tests here. Each is an object with a summary string |desc| and a
|
||||
// method run() that's called to run the test.
|
||||
var tests = [
|
||||
{
|
||||
desc: "Removing a tagged bookmark should cause the tag to be removed.",
|
||||
run: function () {
|
||||
print(" Make a bookmark.");
|
||||
var bmId = bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder,
|
||||
BOOKMARK_URI,
|
||||
bmsvc.DEFAULT_INDEX,
|
||||
"test bookmark");
|
||||
do_check_true(bmId > 0);
|
||||
|
||||
print(" Tag it up.");
|
||||
var tags = ["foo", "bar"];
|
||||
tagssvc.tagURI(BOOKMARK_URI, tags);
|
||||
ensureTagsExist(tags);
|
||||
|
||||
print(" Remove the bookmark. The tags should no longer exist.");
|
||||
bmsvc.removeItem(bmId);
|
||||
ensureTagsExist([]);
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
desc: "Removing a folder containing a tagged bookmark should cause the " +
|
||||
"tag to be removed.",
|
||||
run: function () {
|
||||
print(" Make a folder.");
|
||||
var folderId = bmsvc.createFolder(bmsvc.unfiledBookmarksFolder,
|
||||
"test folder",
|
||||
bmsvc.DEFAULT_INDEX);
|
||||
do_check_true(folderId > 0);
|
||||
|
||||
print(" Stick a bookmark in the folder.");
|
||||
var bmId = bmsvc.insertBookmark(folderId,
|
||||
BOOKMARK_URI,
|
||||
bmsvc.DEFAULT_INDEX,
|
||||
"test bookmark");
|
||||
do_check_true(bmId > 0);
|
||||
|
||||
print(" Tag the bookmark.");
|
||||
var tags = ["foo", "bar"];
|
||||
tagssvc.tagURI(BOOKMARK_URI, tags);
|
||||
ensureTagsExist(tags);
|
||||
|
||||
print(" Remove the folder. The tags should no longer exist.");
|
||||
bmsvc.removeItem(folderId);
|
||||
ensureTagsExist([]);
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
|
||||
getService(Ci.nsINavBookmarksService);
|
||||
|
||||
var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
|
||||
getService(Ci.nsINavHistoryService);
|
||||
|
||||
var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
|
||||
getService(Ci.nsITaggingService);
|
||||
|
||||
const BOOKMARK_URI = uri("http://example.com/");
|
||||
|
||||
/**
|
||||
* Runs a tag query and ensures that the tags returned are those and only those
|
||||
* in aTags. aTags may be empty, in which case this function ensures that no
|
||||
* tags exist.
|
||||
*
|
||||
* @param aTags
|
||||
* An array of tags (strings)
|
||||
*/
|
||||
function ensureTagsExist(aTags) {
|
||||
var query = histsvc.getNewQuery();
|
||||
var opts = histsvc.getNewQueryOptions();
|
||||
opts.resultType = opts.RESULTS_AS_TAG_QUERY;
|
||||
var resultRoot = histsvc.executeQuery(query, opts).root;
|
||||
|
||||
// Dupe aTags.
|
||||
var tags = aTags.slice(0);
|
||||
|
||||
resultRoot.containerOpen = true;
|
||||
|
||||
// Ensure that the number of tags returned from the query is the same as the
|
||||
// number in |tags|.
|
||||
do_check_eq(resultRoot.childCount, tags.length);
|
||||
|
||||
// For each tag result from the query, ensure that it's contained in |tags|.
|
||||
// Remove the tag from |tags| so that we ensure the sets are equal.
|
||||
for (let i = 0; i < resultRoot.childCount; i++) {
|
||||
var tag = resultRoot.getChild(i).title;
|
||||
var indexOfTag = tags.indexOf(tag);
|
||||
do_check_true(indexOfTag >= 0);
|
||||
tags.splice(indexOfTag, 1);
|
||||
}
|
||||
|
||||
resultRoot.containerOpen = false;
|
||||
}
|
||||
|
||||
function run_test()
|
||||
{
|
||||
tests.forEach(function (test) {
|
||||
print("Running test: " + test.desc);
|
||||
test.run();
|
||||
});
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче