gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 13:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Try to make bookmark loading a bit more predictable.

Browse Source
This commit is contained in:
Kris Maglione
2008-12-17 21:09:09 -05:00
parent 7733f45969
commit cf1b1ccf2d
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
vimperator/content/bookmarks.js
View File

@@ -56,13 +56,14 @@ function Bookmarks() //{{{
function Cache(name, store, serial) function Cache(name, store, serial)
{ {
const rootFolders = [bookmarksService.toolbarFolder, bookmarksService.bookmarksMenuFolder, bookmarksService.unfiledBookmarksFolder]; const rootFolders = [bookmarksService.toolbarFolder, bookmarksService.bookmarksMenuFolder, bookmarksService.unfiledBookmarksFolder];
const sleep = liberator.sleep;
var bookmarks = []; var bookmarks = [];
var self = this; var self = this;
this.__defineGetter__("name", function () name); this.__defineGetter__("name", function () name);
this.__defineGetter__("store", function () store); this.__defineGetter__("store", function () store);
this.__defineGetter__("bookmarks", function () { this.load(); return bookmarks; }); this.__defineGetter__("bookmarks", function () this.load());
this.__defineGetter__("keywords", this.__defineGetter__("keywords",
function () [new Keyword(k.keyword, k.title, k.icon, k.url) for each (k in self.bookmarks) if (k.keyword)]); function () [new Keyword(k.keyword, k.title, k.icon, k.url) for each (k in self.bookmarks) if (k.keyword)]);
@@ -104,31 +105,35 @@ function Bookmarks() //{{{
return root; return root;
} }
let loading = false;
this.load = function load() this.load = function load()
{ {
// liberator.dump("cache.load()\n"); if (loading)
{
while (loading)
sleep(10);
return bookmarks;
}
// update our bookmark cache // update our bookmark cache
bookmarks = []; bookmarks = [];
this.__defineGetter__("bookmarks", function () bookmarks); loading = true;
var folders = rootFolders.slice(); let folders = rootFolders.slice();
var query = historyService.getNewQuery(); let query = historyService.getNewQuery();
var options = historyService.getNewQueryOptions(); let options = historyService.getNewQueryOptions();
while (folders.length > 0) while (folders.length > 0)
{ {
//comment out the next line for now; the bug hasn't been fixed; final version should include the next line
//options.setGroupingMode(options.GROUP_BY_FOLDER);
query.setFolders(folders, 1); query.setFolders(folders, 1);
folders.shift(); folders.shift();
var result = historyService.executeQuery(query, options); let result = historyService.executeQuery(query, options);
result.sortingMode = options.SORT_BY_VISITCOUNT_DESCENDING; /* This is silly. Results are still sorted by folder first. --Kris */ let folder = result.root;
var rootNode = result.root; folder.containerOpen = true;
rootNode.containerOpen = true;
// iterate over the immediate children of this folder // iterate over the immediate children of this folder
for (let i = 0; i < rootNode.childCount; i++) for (let i = 0; i < folder.childCount; i++)
{ {
var node = rootNode.getChild(i); let node = folder.getChild(i);
if (node.type == node.RESULT_TYPE_FOLDER) // folder if (node.type == node.RESULT_TYPE_FOLDER) // folder
folders.push(node.itemId); folders.push(node.itemId);
else if (node.type == node.RESULT_TYPE_URI) // bookmark else if (node.type == node.RESULT_TYPE_URI) // bookmark
@@ -136,8 +141,11 @@ function Bookmarks() //{{{
} }
// close a container after using it! // close a container after using it!
rootNode.containerOpen = false; folder.containerOpen = false;
} }
this.__defineGetter__("bookmarks", function () bookmarks);
loading = false;
return bookmarks;
}; };
var observer = { var observer = {
@@ -219,7 +227,7 @@ function Bookmarks() //{{{
{ {
// Forces a load, if not already loaded but wait 10sec // Forces a load, if not already loaded but wait 10sec
// so most tabs should be restored and the CPU should be idle again usually // so most tabs should be restored and the CPU should be idle again usually
setTimeout(function () { liberator.callFunctionInThread(null, function () cache.load()); }, 10000); setTimeout(function () { liberator.callFunctionInThread(null, function () cache.bookmarks); }, 10000);
} }
}); });