re-factoring, added limit on story cache size.

git-svn-id: file:///tmp/snv/trunk@23 12951d8a-c33d-4b7c-b961-822215c816e1
master
Abhinav Sarkar 2009-09-20 06:07:10 +00:00
parent 8aff3915e8
commit 2fccc97094
2 changed files with 56 additions and 42 deletions

View File

@ -5,3 +5,8 @@ caching, notifier-observer -- done
new UI, icons -- done new UI, icons -- done
toolbar button -- done toolbar button -- done
put license --done put license --done
modify background colors to indicate new and read stories
implement search
new interface to navigate containers, topics and categories
make configuration screen

View File

@ -22,24 +22,26 @@
var DiggSidebar = { var DiggSidebar = {
homepageURL: "http://code.google.com/p/digg-sidebar/", homepageURL: "http://code.google.com/p/digg-sidebar/",
prefs: Application.extensions.get("diggsidebar@abhinavsarkar.net").prefs, prefs: Application.extensions.get("diggsidebar@abhinavsarkar.net").prefs,
observerService: Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService),
storyListRefreshEventTopic: "extension-diggsidebar-abhinavsarkar-net-storylist-refresh", storyListRefreshEventTopic: "extension-diggsidebar-abhinavsarkar-net-storylist-refresh",
updateInterval: 1000,
updateIntervalDecay: 0,
shownStoriesCount: 30,//make configurable
cachedStoriesCount: 1000,//make configurable
categories: ["All", "Popular", "Upcoming", "Hot", "Top"],
endpoint: { endpoint: {
container: null, container: null,
topic: null, topic: null,
category: "all" category: "all"
}, },
updateInterval: 1000,
updateIntervalDecay: 0,
lastUpdateAt: new Date().getTime(), lastUpdateAt: new Date().getTime(),
shownStoriesCount: 30,
categories: ["All", "Popular", "Upcoming", "Hot", "Top"],
timerId: null, timerId: null,
storyIds: [], storyIds: [],
refreshing: false, refreshing: false,
stories: [], stories: [],
expandedStory: null, expandedStory: null,
observerService: Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService),
$ce: function (tagName) { $ce: function (tagName) {
return document.createElement(tagName); return document.createElement(tagName);
@ -84,21 +86,19 @@ var DiggSidebar = {
var cmenupopup = DiggSidebar.$ce("menupopup"); var cmenupopup = DiggSidebar.$ce("menupopup");
cmenupopup.setAttribute("id", container.short_name + "Popup"); cmenupopup.setAttribute("id", container.short_name + "Popup");
DiggSidebar.categories.forEach( DiggSidebar.categories.forEach(function (category) {
function (category) { var cmenuitem = DiggSidebar.$ce("menuitem");
var cmenuitem = DiggSidebar.$ce("menuitem"); with (cmenuitem) {
with (cmenuitem) { setAttribute("label", category);
setAttribute("label", category); setAttribute("value",
setAttribute("value", "/container/" + container.short_name +
"/container/" + container.short_name + "/" + category.toLowerCase());
"/" + category.toLowerCase()); setAttribute("accesskey", category.charAt(0));
setAttribute("accesskey", category.charAt(0)); setAttribute("oncommand",
setAttribute("oncommand", "DiggSidebar.setEndPoint(this.value)");
"DiggSidebar.setEndPoint(this.value)");
}
cmenupopup.appendChild(cmenuitem);
} }
); cmenupopup.appendChild(cmenuitem);
});
cmenupopup.appendChild(DiggSidebar.$ce("menuseparator")); cmenupopup.appendChild(DiggSidebar.$ce("menuseparator"));
var topics = container.topics; var topics = container.topics;
topics.forEach(function (topic) { topics.forEach(function (topic) {
@ -159,14 +159,14 @@ var DiggSidebar = {
DiggSidebar.Utils.removeAllChildren(DiggSidebar.UI.storyListBox); DiggSidebar.Utils.removeAllChildren(DiggSidebar.UI.storyListBox);
} }
var now = new Date();
filteredStories.forEach(function (story, index) { filteredStories.forEach(function (story, index) {
if (index < DiggSidebar.shownStoriesCount) { if (index < DiggSidebar.shownStoriesCount) {
var now = new Date(); var then = (story.promote_date != null) ?
if (story.promote_date != null) { new Date(story.promote_date * 1000) :
var then = new Date(story.promote_date * 1000); new Date(story.submit_date * 1000);
} else {
var then = new Date(story.submit_date * 1000);
}
var diff = Math.max(now - then, 0); var diff = Math.max(now - then, 0);
var hr = Math.floor(diff / (1000 * 3600)); var hr = Math.floor(diff / (1000 * 3600));
@ -209,7 +209,10 @@ var DiggSidebar = {
newStoryIds.push(story.id); newStoryIds.push(story.id);
} }
}); });
DiggSidebar.storyIds = DiggSidebar.storyIds.concat(newStoryIds); DiggSidebar.storyIds = newStoryIds.concat(DiggSidebar.storyIds);
if (DiggSidebar.storyIds.length > DiggSidebar.cachedStoriesCount) {
DiggSidebar.storyIds.length = DiggSidebar.cachedStoriesCount;
}
}, },
showDescription: function (storyId) { showDescription: function (storyId) {
@ -232,22 +235,30 @@ var DiggSidebar = {
var ep = DiggSidebar.prefs.get("endpoint").value || ""; var ep = DiggSidebar.prefs.get("endpoint").value || "";
DiggSidebar.indicateActivity(); DiggSidebar.indicateActivity();
DiggSidebar.fetchData("http://services.digg.com/stories" + DiggSidebar.fetchData(
ep.replace(/\/all/g, "") + "?count=30" + "&type=json" + "http://services.digg.com/stories" + ep.replace(/\/all/g, "") +
"?count=30" + "&type=json" +
"&appkey=" + encodeURIComponent(DiggSidebar.homepageURL), "&appkey=" + encodeURIComponent(DiggSidebar.homepageURL),
function (e) { function (e) {
var stories = DiggSidebar.Utils.decodeJson(e.target.responseText).stories; var stories = DiggSidebar.Utils.decodeJson(e.target.responseText).stories;
stories.forEach(function (story) { story.id = parseInt(story.id); }); stories.forEach(function (story) {
story.id = parseInt(story.id);
var newStories = stories.filter(function (story) {
return DiggSidebar.storyIds.indexOf(story.id) == -1;
}); });
var newStories = [
story for each (story in stories)
if (DiggSidebar.storyIds.indexOf(story.id) == -1)];
newStories.forEach(function (story) { newStories.forEach(function (story) {
story.category = DiggSidebar.endpoint.category; story.category = DiggSidebar.endpoint.category;
story.read = false; story.read = false;
}); });
DiggSidebar.stories = newStories.concat(DiggSidebar.stories); DiggSidebar.stories = newStories.concat(DiggSidebar.stories);
if (DiggSidebar.stories.length > DiggSidebar.cachedStoriesCount) {
DiggSidebar.stories.length = DiggSidebar.cachedStoriesCount;
}
DiggSidebar.observerService.notifyObservers( DiggSidebar.observerService.notifyObservers(
null, DiggSidebar.storyListRefreshEventTopic, null); null, DiggSidebar.storyListRefreshEventTopic, null);
@ -268,7 +279,8 @@ var DiggSidebar = {
createMenu: function () { createMenu: function () {
DiggSidebar.indicateActivity(); DiggSidebar.indicateActivity();
DiggSidebar.fetchData("http://services.digg.com/containers" + "?type=json" + DiggSidebar.fetchData(
"http://services.digg.com/containers" + "?type=json" +
"&appkey=" + encodeURIComponent(DiggSidebar.homepageURL), "&appkey=" + encodeURIComponent(DiggSidebar.homepageURL),
DiggSidebar.populateMenu, DiggSidebar.errorHandler); DiggSidebar.populateMenu, DiggSidebar.errorHandler);
}, },
@ -295,12 +307,9 @@ var DiggSidebar = {
sum += weights[i] * diff; sum += weights[i] * diff;
} }
var newUpdateInterval = Math.round( var newUpdateInterval = Math.round(
sum * 1000 / weights sum * 1000 /
.splice(0, Math.min(4, stories.length - 1)) weights.slice(0, Math.min(4, stories.length - 1))
.reduce(function (a, b) { .reduce(function (a, b) a + b));
return a + b;
})
);
if (newUpdateInterval > 0) { if (newUpdateInterval > 0) {
var previousUpdateInterval = DiggSidebar.updateInterval; var previousUpdateInterval = DiggSidebar.updateInterval;
@ -316,8 +325,8 @@ var DiggSidebar = {
}, },
calculateTimeout: function () { calculateTimeout: function () {
return Math.round( return Math.round(DiggSidebar.updateInterval *
DiggSidebar.updateInterval * (Math.pow(1.5, DiggSidebar.updateIntervalDecay))); Math.pow(1.5, DiggSidebar.updateIntervalDecay));
}, },
setEndPoint: function (ep) { setEndPoint: function (ep) {