X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fmodules%2Fbookmarkcache.jsm;fp=common%2Fmodules%2Fbookmarkcache.jsm;h=55328a1fe3aa8dfe4c8db978fd437aac7bfcad08;hb=9044153cb63835e39b9de8ec4ade237c03e3888a;hp=e85a7c6c978b4c415bd847f788eaf6365692b37f;hpb=70740024f9c028c1fd63e1a1850ab062ff956054;p=dactyl.git

diff --git a/common/modules/bookmarkcache.jsm b/common/modules/bookmarkcache.jsm
index e85a7c6..55328a1 100644
--- a/common/modules/bookmarkcache.jsm
+++ b/common/modules/bookmarkcache.jsm
@@ -2,14 +2,25 @@
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
-"use strict";
+/* use strict */
 
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("bookmarkcache", {
     exports: ["Bookmark", "BookmarkCache", "Keyword", "bookmarkcache"],
-    require: ["services", "storage", "util"]
+    require: ["services", "util"]
 }, this);
 
+this.lazyRequire("storage", ["storage"]);
+
+function newURI(url, charset, base) {
+    try {
+        return services.io.newURI(url, charset, base);
+    }
+    catch (e) {
+        throw Error(e);
+    }
+}
+
 var Bookmark = Struct("url", "title", "icon", "post", "keyword", "tags", "charset", "id");
 var Keyword = Struct("keyword", "title", "icon", "url");
 Bookmark.defaultValue("icon", function () BookmarkCache.getFavicon(this.url));
@@ -19,7 +30,13 @@ update(Bookmark.prototype, {
         ["tags",    this.tags.join(", "), "Tag"]
     ].filter(function (item) item[1]),
 
-    get uri() util.newURI(this.url),
+    get uri() newURI(this.url),
+    set uri(uri) {
+        let tags = this.tags;
+        this.tags = null;
+        services.bookmarks.changeBookmarkURI(this.id, uri);
+        this.tags = tags;
+    },
 
     encodeURIComponent: function _encodeURIComponent(str) {
         if (!this.charset || this.charset === "UTF-8")
@@ -28,15 +45,9 @@ update(Bookmark.prototype, {
         return escape(conv.ConvertFromUnicode(str) + conv.Finish());
     }
 })
+Bookmark.prototype.members.uri = Bookmark.prototype.members.url;
 Bookmark.setter = function (key, func) this.prototype.__defineSetter__(key, func);
-Bookmark.setter("url", function (val) {
-    if (isString(val))
-        val = util.newURI(val);
-    let tags = this.tags;
-    this.tags = null;
-    services.bookmarks.changeBookmarkURI(this.id, val);
-    this.tags = tags;
-});
+Bookmark.setter("url", function (val) { this.uri = isString(val) ? newURI(val) : val; });
 Bookmark.setter("title", function (val) { services.bookmarks.setItemTitle(this.id, val); });
 Bookmark.setter("post", function (val) { bookmarkcache.annotate(this.id, bookmarkcache.POST, val); });
 Bookmark.setter("charset", function (val) { bookmarkcache.annotate(this.id, bookmarkcache.CHARSET, val); });
@@ -63,9 +74,9 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
 
     __iterator__: function () (val for ([, val] in Iterator(bookmarkcache.bookmarks))),
 
-    get bookmarks() Class.replaceProperty(this, "bookmarks", this.load()),
+    bookmarks: Class.Memoize(function () this.load()),
 
-    keywords: Class.memoize(function () array.toObject([[b.keyword, b] for (b in this) if (b.keyword)])),
+    keywords: Class.Memoize(function () array.toObject([[b.keyword, b] for (b in this) if (b.keyword)])),
 
     rootFolders: ["toolbarFolder", "bookmarksMenuFolder", "unfiledBookmarksFolder"]
         .map(function (s) services.bookmarks[s]),
@@ -79,9 +90,13 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
     _loadBookmark: function loadBookmark(node) {
         if (node.uri == null) // How does this happen?
             return false;
-        let uri = util.newURI(node.uri);
+
+        let uri = newURI(node.uri);
         let keyword = services.bookmarks.getKeywordForBookmark(node.itemId);
-        let tags = services.tagging.getTagsForURI(uri, {}) || [];
+
+        let tags = tags in node ? (node.tags ? node.tags.split(/, /g) : [])
+                                : services.tagging.getTagsForURI(uri, {}) || [];
+
         let post = BookmarkCache.getAnnotation(node.itemId, this.POST);
         let charset = BookmarkCache.getAnnotation(node.itemId, this.CHARSET);
         return Bookmark(node.uri, node.title, node.icon && node.icon.spec, post, keyword, tags, charset, node.itemId);
@@ -96,7 +111,7 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
     },
 
     get: function (url) {
-        let ids = services.bookmarks.getBookmarkIdsForURI(util.newURI(url), {});
+        let ids = services.bookmarks.getBookmarkIdsForURI(newURI(url), {});
         for (let id in values(ids))
             if (id in this.bookmarks)
                 return this.bookmarks[id];
@@ -129,7 +144,7 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
      */
     isBookmarked: function isBookmarked(uri) {
         if (isString(uri))
-            uri = util.newURI(uri);
+            uri = newURI(uri);
 
         try {
             return services.bookmarks
@@ -154,27 +169,23 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
     load: function load() {
         let bookmarks = {};
 
-        let folders = this.rootFolders.slice();
         let query = services.history.getNewQuery();
         let options = services.history.getNewQueryOptions();
-        while (folders.length > 0) {
-            query.setFolders(folders, 1);
-            folders.shift();
-            let result = services.history.executeQuery(query, options);
-            let folder = result.root;
-            folder.containerOpen = true;
+        options.queryType = options.QUERY_TYPE_BOOKMARKS;
+        options.excludeItemIfParentHasAnnotation = "livemark/feedURI";
 
+        let { root } = services.history.executeQuery(query, options);
+        root.containerOpen = true;
+        try {
             // iterate over the immediate children of this folder
-            for (let i = 0; i < folder.childCount; i++) {
-                let node = folder.getChild(i);
-                if (node.type == node.RESULT_TYPE_FOLDER)   // folder
-                    folders.push(node.itemId);
-                else if (node.type == node.RESULT_TYPE_URI) // bookmark
+            for (let i = 0; i < root.childCount; i++) {
+                let node = root.getChild(i);
+                if (node.type == node.RESULT_TYPE_URI) // bookmark
                     bookmarks[node.itemId] = this._loadBookmark(node);
             }
-
-            // close a container after using it!
-            folder.containerOpen = false;
+        }
+        finally {
+            root.containerOpen = false;
         }
 
         return bookmarks;
@@ -218,12 +229,15 @@ var BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver), {
         }
     }
 }, {
+    DEFAULT_FAVICON: "chrome://mozapps/skin/places/defaultFavicon.png",
+
     getAnnotation: function getAnnotation(item, anno)
         services.annotation.itemHasAnnotation(item, anno) ?
         services.annotation.getItemAnnotation(item, anno) : null,
+
     getFavicon: function getFavicon(uri) {
         try {
-            return services.favicon.getFaviconImageForPage(util.newURI(uri)).spec;
+            return services.favicon.getFaviconImageForPage(newURI(uri)).spec;
         }
         catch (e) {
             return "";