update cache when viewing unread articles

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index 492f1f0927459559b6b5f0c126eb8a4f42d695e1..4f40f8fb3757bf3281dfa2ee4a8ff4fb303739c9 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -91,9 +91,11 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                        var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
                        var headlines_count_obj = transport.responseXML.getElementsByTagName("headlines-count")[0];
                        var headlines_unread_obj = transport.responseXML.getElementsByTagName("headlines-unread")[0];
+                       var disable_cache_obj = transport.responseXML.getElementsByTagName("disable-cache")[0];
 
                        var headlines_count = headlines_count_obj.getAttribute("value");
                        var headlines_unread = headlines_unread_obj.getAttribute("value");
+                       var disable_cache = disable_cache_obj.getAttribute("value") != "0";
 
                        if (headlines_count == 0) _infscroll_disable = 1;
        
@@ -105,8 +107,20 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                                if (headlines) {
                                        f.innerHTML = headlines.firstChild.nodeValue;
 
-                                       cache_inject("F:" + active_feed_id,
-                                               headlines.firstChild.nodeValue, headlines_unread);
+                                       var cache_prefix = "";
+
+                                       if (is_cat) {
+                                               cache_prefix = "C:";
+                                       } else {
+                                               cache_prefix = "F:";
+                                       }
+
+                                       cache_invalidate(cache_prefix + active_feed_id);
+
+                                       if (!disable_cache) {
+                                               cache_inject(cache_prefix + active_feed_id,
+                                                       headlines.firstChild.nodeValue, headlines_unread);
+                                       }
 
                                } else {
                                        debug("headlines_callback: returned no data");
@@ -233,15 +247,38 @@ function showArticleInHeadlines(id) {
                var article_is_unread = crow.className.match("Unread");
                        
                crow.className = crow.className.replace("Unread", "");
-               
+
+               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
+               markHeadline(id);
+       
                var upd_img_pic = document.getElementById("FUPDPIC-" + id);
-               
-               if (upd_img_pic) {
+
+               var cache_prefix = "";
+                               
+               if (activeFeedIsCat()) {
+                       cache_prefix = "C:";
+               } else {
+                       cache_prefix = "F:";
+               }
+       
+               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
                        upd_img_pic.src = "images/blank_icon.gif";
+
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId()));
+
+               } else if (article_is_unread) {
+
+                       cache_invalidate(cache_prefix + getActiveFeedId());
+
+                       cache_inject(cache_prefix + getActiveFeedId(),
+                               document.getElementById("headlines-frame").innerHTML,
+                               get_feed_unread(getActiveFeedId())-1);
+
                }
-               
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-               markHeadline(id);
 
        } catch (e) {
                exception_error("showArticleInHeadlines", e);
@@ -1196,7 +1233,7 @@ function cdmWatchdog() {
 
 
 function cache_inject(id, article, param) {
-       if (!cache_check(id, param)) {
+       if (!cache_check_param(id, param)) {
                debug("cache_article: miss: " + id + " [p=" + param + "]");
 
                var cache_obj = new Array();
@@ -1221,10 +1258,10 @@ function cache_find(id) {
        return false;
 }
 
-function cache_get_param(id) {
+function cache_find_param(id, param) {
        for (var i = 0; i < article_cache.length; i++) {
-               if (article_cache[i]["id"] == id) {
-                       return article_cache[i]["param"];
+               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                       return article_cache[i]["data"];
                }
        }
        return false;
@@ -1241,6 +1278,10 @@ function cache_check(id) {
 
 function cache_check_param(id, param) {
        for (var i = 0; i < article_cache.length; i++) {
+
+//             debug("cache_check_param " + article_cache[i]["id"] + ":" + 
+//                     article_cache[i]["param"] + " vs " + id + ":" + param);
+
                if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
                        return true;
                }