valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip counters output when number of unread articles at backend equals frontend

This commit is contained in:
Andrew Dolgov 2006-02-12 09:04:27 +01:00
parent 1011b66a02
commit 78ea1de08c
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backend.php
View File

@ -130,13 +130,20 @@
/* FIXME this needs reworking */ /* FIXME this needs reworking */
function getGlobalCounters($link) { function getGlobalUnread($link) {
$result = db_query($link, "SELECT count(id) as c_id FROM ttrss_entries,ttrss_user_entries $result = db_query($link, "SELECT count(id) as c_id FROM ttrss_entries,ttrss_user_entries
WHERE unread = true AND WHERE unread = true AND
ttrss_user_entries.ref_id = ttrss_entries.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND
owner_uid = " . $_SESSION["uid"]); owner_uid = " . $_SESSION["uid"]);
$c_id = db_fetch_result($result, 0, "c_id"); $c_id = db_fetch_result($result, 0, "c_id");
print "<counter type=\"global\" id='global-unread' counter='$c_id'/>"; return $c_id;
}
function getGlobalCounters($link, $global_unread = -1) {
if ($global_unread == -1) {
$global_unread = getGlobalUnread($link);
}
print "<counter type=\"global\" id='global-unread' counter='$global_unread'/>";
} }
function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) { function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
@ -735,18 +742,26 @@
update_all_feeds($link, $subop == "forceUpdateAllFeeds"); update_all_feeds($link, $subop == "forceUpdateAllFeeds");
} }
$omode = $_GET["omode"]; $global_unread_caller = sprintf("%d", $_GET["uctr"]);
$global_unread = getGlobalUnread($link);
if (!$omode) $omode = "tfl";
print "<rpc-reply>"; print "<rpc-reply>";
if (strchr($omode, "l")) getLabelCounters($link);
if (strchr($omode, "f")) getFeedCounters($link); if ($global_unread_caller != $global_unread) {
if (strchr($omode, "t")) getTagCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) { $omode = $_GET["omode"];
getCategoryCounters($link);
if (!$omode) $omode = "tfl";
if (strchr($omode, "l")) getLabelCounters($link);
if (strchr($omode, "f")) getFeedCounters($link);
if (strchr($omode, "t")) getTagCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
getGlobalCounters($link, $global_unread);
} }
getGlobalCounters($link);
print "</rpc-reply>"; print "</rpc-reply>";
} }

3
config.php-dist
View File

@ -97,5 +97,8 @@
define('DISABLE_SESSIONS', false); define('DISABLE_SESSIONS', false);
// Never enable this option (kludge for daemon using tt-rss code) // Never enable this option (kludge for daemon using tt-rss code)
define('DAEMON_SLEEP_INTERVAL', 120);
// Interval between update daemon update runs
// vim:ft=php // vim:ft=php
?> ?>

1
tt-rss.js
View File

@ -191,6 +191,7 @@ function scheduleFeedUpdate(force) {
} }
query_str = query_str + "&omode=" + omode; query_str = query_str + "&omode=" + omode;
query_str = query_str + "&uctr=" + global_unread;
if (xmlhttp_ready(xmlhttp)) { if (xmlhttp_ready(xmlhttp)) {
xmlhttp.open("GET", query_str, true); xmlhttp.open("GET", query_str, true);

9
update_daemon.php
View File

@ -5,7 +5,6 @@
declare(ticks = 1); declare(ticks = 1);
define('SLEEP_INTERVAL', 60); // seconds between update runs
define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon'); define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon');
define('DISABLE_SESSIONS', true); define('DISABLE_SESSIONS', true);
@ -82,8 +81,8 @@
print "Feed: " . $line["feed_url"] . ": "; print "Feed: " . $line["feed_url"] . ": ";
printf("(%d ? %d) ", time() - strtotime($line["last_updated"]), printf("(%d/%d, %d) ", time() - strtotime($line["last_updated"]),
$upd_intl*60); $upd_intl*60, $owner_uid);
if (!$line["last_updated"] || if (!$line["last_updated"] ||
time() - strtotime($line["last_updated"]) > ($upd_intl * 60)) { time() - strtotime($line["last_updated"]) > ($upd_intl * 60)) {
@ -95,9 +94,9 @@
} }
} }
print "Sleeping for " . SLEEP_INTERVAL . " seconds...\n"; print "Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...\n";
sleep(SLEEP_INTERVAL); sleep(DAEMON_SLEEP_INTERVAL);
} }
db_close($link); db_close($link);