public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 14:05:56 +00:00
Code Issues Releases Wiki Activity

handle counters using JSON instead of XML

Browse Source
This commit is contained in:
Andrew Dolgov
2010-11-04 22:38:03 +03:00
parent 5191a7ce03
commit 6a7817c1ad
4 changed files with 138 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
backend.php
View File

@@ -258,9 +258,9 @@
// if (get_pref($link, "SYNC_COUNTERS") || ($mode == "prefetch" && $csync)) { // if (get_pref($link, "SYNC_COUNTERS") || ($mode == "prefetch" && $csync)) {
if (time() - $_SESSION["view:counters_stamp"] > 5 && $mode == "prefetch") { if (time() - $_SESSION["view:counters_stamp"] > 5 && $mode == "prefetch") {
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $omode); print json_encode(getAllCounters($link, $omode));
print "</counters>"; print "]]></counters>";
$_SESSION["view:counters_stamp"] = time(); $_SESSION["view:counters_stamp"] = time();
} }
@@ -389,20 +389,12 @@
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info); if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info);
// if (get_pref($link, "SYNC_COUNTERS") ||
// time() - $_SESSION["get_all_counters_stamp"] > $viewfeed_ctr_interval) {
// print "<counters>";
// getAllCounters($link, $omode, $feed);
// print "</counters>";
// }
if (get_pref($link, 'COMBINED_DISPLAY_MODE') || $subop || if (get_pref($link, 'COMBINED_DISPLAY_MODE') || $subop ||
time() - $_SESSION["viewfeed:counters_stamp"] > 5) { time() - $_SESSION["viewfeed:counters_stamp"] > 5) {
if (!$offset) { if (!$offset) {
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $omode, $feed); print json_encode(getAllCounters($link, $omode, $feed));
print "</counters>"; print "]]></counters>";
$_SESSION["viewfeed:counters_stamp"] = time(); $_SESSION["viewfeed:counters_stamp"] = time();
} }
} }

20
functions.js
View File

@@ -383,18 +383,18 @@ function parse_counters(reply, scheduled_call) {
var feeds_found = 0; var feeds_found = 0;
var elems = reply.getElementsByTagName("counter"); var elems = JSON.parse(reply.firstChild.nodeValue);
for (var l = 0; l < elems.length; l++) { for (var l = 0; l < elems.length; l++) {
var id = elems[l].getAttribute("id"); var id = elems[l].id
var t = elems[l].getAttribute("type"); var is_cat = elems[l].cat;
var ctr = elems[l].getAttribute("counter"); var ctr = parseInt(elems[l].counter)
var error = elems[l].getAttribute("error"); var error = elems[l].error;
var has_img = elems[l].getAttribute("hi"); var has_img = elems[l].has_img;
var updated = elems[l].getAttribute("updated"); var updated = elems[l].updated;
var title = elems[l].getAttribute("title"); var title = elems[l].title;
var xmsg = elems[l].getAttribute("xmsg"); var xmsg = elems[l].xmsg;
if (id == "global-unread") { if (id == "global-unread") {
@@ -412,7 +412,7 @@ function parse_counters(reply, scheduled_call) {
continue; continue;
} }
if (t == "category") { if (is_cat) {
var catctr = $("FCATCTR-" + id); var catctr = $("FCATCTR-" + id);
if (catctr) { if (catctr) {
catctr.innerHTML = "(" + ctr + ")"; catctr.innerHTML = "(" + ctr + ")";

157
functions.php
View File

@@ -2454,30 +2454,32 @@
function getAllCounters($link, $omode = "flc", $active_feed = false) { function getAllCounters($link, $omode = "flc", $active_feed = false) {
if (!$omode) $omode = "flc"; if (!$omode) $omode = "flc";
getGlobalCounters($link);
getVirtCounters($link);
if (strchr($omode, "l")) getLabelCounters($link); $data = getGlobalCounters($link);
if (strchr($omode, "f")) getFeedCounters($link, $active_feed);
if (strchr($omode, "t")) getTagCounters($link); $data = array_merge($data, getVirtCounters($link));
if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
if (strchr($omode, "c")) { if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link); $data = array_merge($data, getCategoryCounters($link));
} }
} }
return $data;
} }
function getCategoryCounters($link) { function getCategoryCounters($link) {
# two special categories are -1 and -2 (all virtuals; all labels) $ret_arr = array();
/* $ctr = getCategoryUnread($link, -1); /* Labels category */
print "<counter type=\"category\" id=\"-1\" counter=\"$ctr\"/>"; */ $cv = array("id" => -2, "cat" => true,
"counter" => getCategoryUnread($link, -2));
$ctr = getCategoryUnread($link, -2); array_push($ret_arr, $cv);
print "<counter type=\"category\" id=\"-2\" counter=\"$ctr\"/>";
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
@@ -2489,15 +2491,20 @@
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
$line["cat_id"] = (int) $line["cat_id"]; $line["cat_id"] = (int) $line["cat_id"];
print "<counter type=\"category\" id=\"".$line["cat_id"]."\" counter=\"". $cv = array("id" => $line["cat_id"], "cat" => true,
$line["unread"]."\"/>"; "counter" => $line["unread"]);
array_push($ret_arr, $cv);
} }
/* Special case: NULL category doesn't actually exist in the DB */ /* Special case: NULL category doesn't actually exist in the DB */
print "<counter type=\"category\" id=\"0\" counter=\"". $cv = array("id" => 0, "cat" => true,
ccache_find($link, 0, $_SESSION["uid"], true)."\"/>"; "counter" => ccache_find($link, 0, $_SESSION["uid"], true));
array_push($ret_arr, $cv);
return $ret_arr;
} }
function getCategoryUnread($link, $cat, $owner_uid = false) { function getCategoryUnread($link, $cat, $owner_uid = false) {
@@ -2730,20 +2737,28 @@
} }
function getGlobalCounters($link, $global_unread = -1) { function getGlobalCounters($link, $global_unread = -1) {
$ret_arr = array();
if ($global_unread == -1) { if ($global_unread == -1) {
$global_unread = getGlobalUnread($link); $global_unread = getGlobalUnread($link);
} }
print "<counter type=\"global\" id='global-unread'
counter='$global_unread'/>"; $cv = array("id" => "global-unread",
"counter" => $global_unread);
array_push($ret_arr, $cv);
$result = db_query($link, "SELECT COUNT(id) AS fn FROM $result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$subscribed_feeds = db_fetch_result($result, 0, "fn"); $subscribed_feeds = db_fetch_result($result, 0, "fn");
print "<counter type=\"global\" id='subscribed-feeds' $cv = array("id" => "subscribed-feeds",
counter='$subscribed_feeds'/>"; "counter" => $subscribed_feeds);
array_push($ret_arr, $cv);
return $ret_arr;
} }
function getSubscribedFeeds($link) { function getSubscribedFeeds($link) {
@@ -2754,6 +2769,8 @@
} }
function getTagCounters($link) { function getTagCounters($link) {
$ret_arr = array();
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
@@ -2773,37 +2790,41 @@
foreach (array_keys($tags) as $tag) { foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag]; $unread = $tags[$tag];
$tag = htmlspecialchars($tag); $tag = htmlspecialchars($tag);
print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
} $cv = array("id" => $tag,
"tag" => true,
"counter" => $unread);
array_push($ret_arr, $cv);
}
return $ret_arr;
} }
function getVirtCounters($link, $ret_mode = false) { function getVirtCounters($link) {
$ret_arr = array(); $ret_arr = array();
for ($i = 0; $i >= -4; $i--) { for ($i = 0; $i >= -4; $i--) {
$count = getFeedUnread($link, $i); $count = getFeedUnread($link, $i);
if (!$ret_mode) {
if (get_pref($link, 'EXTENDED_FEEDLIST')) {
$xmsg_part = "xmsg=\"(" . getFeedArticles($link, $i) . " total)\"";
} else {
$xmsg_part = "";
}
print "<counter type=\"label\" id=\"$i\" counter=\"$count\" $xmsg_part/>"; $cv = array("id" => $i,
} else { "counter" => $count,
$ret_arr[$i]["counter"] = $count; "description" => getFeedTitle($link, $i));
$ret_arr[$i]["description"] = getFeedTitle($link, $i);
} if (get_pref($link, 'EXTENDED_FEEDLIST'))
$cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
array_push($ret_arr, $cv);
} }
return $ret_arr; return $ret_arr;
} }
function getLabelCounters($link, $ret_mode = false) { function getLabelCounters($link) {
$ret_arr = array();
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
@@ -2818,21 +2839,15 @@
$label_name = $line["caption"]; $label_name = $line["caption"];
$count = getFeedUnread($link, $id); $count = getFeedUnread($link, $id);
if (!$ret_mode) {
if (get_pref($link, 'EXTENDED_FEEDLIST')) { $cv = array("id" => $id,
$xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\""; "counter" => $count,
} else { "description" => $label_name);
$xmsg_part = "";
}
print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>"; if (get_pref($link, 'EXTENDED_FEEDLIST'))
$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
} else { array_push($ret_arr, $cv);
$ret_arr[$id]["counter"] = $count;
$ret_arr[$id]["description"] = $label_name;
}
} }
return $ret_arr; return $ret_arr;
@@ -2840,6 +2855,8 @@
function getFeedCounters($link, $active_feed = false) { function getFeedCounters($link, $active_feed = false) {
$ret_arr = array();
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
$query = "SELECT ttrss_feeds.id, $query = "SELECT ttrss_feeds.id,
@@ -2868,8 +2885,6 @@
$last_updated = date($short_date, strtotime($line["last_updated"])); $last_updated = date($short_date, strtotime($line["last_updated"]));
} }
$last_updated = htmlspecialchars($last_updated);
$has_img = feed_has_icon($id); $has_img = feed_has_icon($id);
$tmp_result = db_query($link, $tmp_result = db_query($link,
@@ -2878,38 +2893,28 @@
$count += db_fetch_result($tmp_result, 0, "unread"); $count += db_fetch_result($tmp_result, 0, "unread");
if ($last_error) { $cv = array("id" => $id,
$error_part = "error=\"$last_error\""; "last_updated" => $last_updated,
} else { "counter" => $count,
$error_part = ""; "has_img" => (int) $has_img);
}
if ($has_img) { if ($last_error)
$has_img_part = "hi=\"$has_img\""; $cv["error"] = $last_error;
} else {
$has_img_part = "";
}
if ($active_feed && $id == $active_feed) { if (get_pref($link, 'EXTENDED_FEEDLIST'))
$has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\""; $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
} else {
$has_title_part = "";
}
if (get_pref($link, 'EXTENDED_FEEDLIST')) { if ($active_feed && $id == $active_feed)
$xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\""; $cv["title"] = $line["title"];
}
array_push($ret_arr, $cv);
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
} }
return $ret_arr;
} }
function get_script_dt_add() { function get_script_dt_add() {
/* if (strpos(VERSION, ".99") === false) {
return VERSION;
} else {
return time();
} */
return time(); return time();
} }

121
modules/backend-rpc.php
View File

@@ -156,12 +156,11 @@
if ($subop == "getAllCounters") { if ($subop == "getAllCounters") {
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
$omode = $_REQUEST["omode"]; print json_encode(getAllCounters($link, $_REQUEST['omode']));
getAllCounters($link, $omode); print "]]></counters>";
print "</counters>";
print_runtime_info($link); print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
@@ -183,14 +182,9 @@
$result = db_query($link, "UPDATE ttrss_user_entries SET marked = $mark $result = db_query($link, "UPDATE ttrss_user_entries SET marked = $mark
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
print "<rpc-reply><counters>"; print "<rpc-reply><counters><![CDATA[";
getGlobalCounters($link); print json_encode(getAllCounters($link));
getVirtCounters($link); print "]]></counters></rpc-reply>";
getLabelCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
print "</counters></rpc-reply>";
return; return;
} }
@@ -201,13 +195,9 @@
$result = db_query($link, "DELETE FROM ttrss_user_entries $result = db_query($link, "DELETE FROM ttrss_user_entries
WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
print "<rpc-reply><counters>"; print "<rpc-reply><counters><![CDATA[";
getGlobalCounters($link); print json_encode(getAllCounters($link));
getVirtCounters($link); print "]]></counters></rpc-reply>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
print "</counters></rpc-reply>";
return; return;
} }
@@ -219,13 +209,9 @@
SET feed_id = orig_feed_id, orig_feed_id = NULL SET feed_id = orig_feed_id, orig_feed_id = NULL
WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
print "<rpc-reply><counters>"; print "<rpc-reply><counters><![CDATA[";
getGlobalCounters($link); print json_encode(getAllCounters($link));
getVirtCounters($link); print "]]></counters></rpc-reply>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
print "</counters></rpc-reply>";
return; return;
} }
@@ -237,13 +223,9 @@
archive_article($link, $id, $_SESSION["uid"]); archive_article($link, $id, $_SESSION["uid"]);
} }
print "<rpc-reply><counters>"; print "<rpc-reply><counters><![CDATA[";
getGlobalCounters($link); print json_encode(getAllCounters($link));
getVirtCounters($link); print "]]></counters></rpc-reply>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
print "</counters></rpc-reply>";
return; return;
} }
@@ -274,14 +256,9 @@
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
getGlobalCounters($link); print json_encode(getAllCounters($link));
getVirtCounters($link); print "]]></counters>";
getLabelCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
print "</counters>";
if ($note != 'undefined') { if ($note != 'undefined') {
$note_size = strlen($note); $note_size = strlen($note);
@@ -301,9 +278,9 @@
update_rss_feed($link, $feed_id); update_rss_feed($link, $feed_id);
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
getFeedCounter($link, $feed_id); print json_encode(getFeedCounters($link, $feed_id));
print "</counters>"; print "]]></counters>";
print "</rpc-reply>"; print "</rpc-reply>";
return; return;
@@ -316,31 +293,14 @@
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
if ($global_unread_caller != $global_unread) { if ($global_unread_caller != $global_unread) {
$omode = $_REQUEST["omode"];
$omode = $_REQUEST["omode"]; print json_encode(getAllCounters($link, $omode));
if (!$omode) $omode = "tflc";
getVirtCounters($link);
if (strchr($omode, "l")) getLabelCounters($link);
if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
}
if (strchr($omode, "f")) getFeedCounters($link);
if (strchr($omode, "t")) getTagCounters($link);
getGlobalCounters($link, $global_unread);
} }
print "</counters>"; print "]]></counters>";
print_runtime_info($link); print_runtime_info($link);
@@ -358,9 +318,10 @@
catchupArticlesById($link, $ids, $cmode); catchupArticlesById($link, $ids, $cmode);
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $_REQUEST["omode"]); print json_encode(getAllCounters($link, $_REQUEST['omode']));
print "</counters>"; print "]]></counters>";
print_runtime_info($link); print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
@@ -375,9 +336,9 @@
markArticlesById($link, $ids, $cmode); markArticlesById($link, $ids, $cmode);
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $_REQUEST["omode"]); print json_encode(getAllCounters($link, $_REQUEST['omode']));
print "</counters>"; print "]]></counters>";
print_runtime_info($link); print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
@@ -392,9 +353,9 @@
publishArticlesById($link, $ids, $cmode); publishArticlesById($link, $ids, $cmode);
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $_REQUEST["omode"]); print json_encode(getAllCounters($link, $_REQUEST['omode']));
print "</counters>"; print "]]></counters>";
print_runtime_info($link); print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
@@ -649,9 +610,9 @@
print "</info-for-headlines>"; print "</info-for-headlines>";
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $omode); print json_encode(getAllCounters($link, $_REQUEST['omode']));
print "</counters>"; print "]]></counters>";
print "</rpc-reply>"; print "</rpc-reply>";
return; return;
@@ -686,9 +647,9 @@
print "</info-for-headlines>"; print "</info-for-headlines>";
print "<counters>"; print "<counters><![CDATA[";
getAllCounters($link, $omode); print json_encode(getAllCounters($link, $_REQUEST['omode']));
print "</counters>"; print "]]></counters>";
print "</rpc-reply>"; print "</rpc-reply>";
return; return;