Browse Source

move counter cache to a separate class
fix references to get_article_tags

Andrew Dolgov 3 years ago
parent
commit
2ed0d6c433

+ 1 - 1
classes/api.php

@@ -297,7 +297,7 @@ class API extends Handler {
 					WHERE ref_id IN ($article_ids)");
 
 				while ($line = $this->dbh->fetch_assoc($result)) {
-					ccache_update($line["feed_id"], $_SESSION["uid"]);
+					CCache::update($line["feed_id"], $_SESSION["uid"]);
 				}
 			}
 

+ 3 - 3
classes/article.php

@@ -81,7 +81,7 @@ class Article extends Handler_Protected {
 		}
 
 		$feed_id = $this->getArticleFeed($id);
-		ccache_update($feed_id, $_SESSION["uid"]);
+		CCache::update($feed_id, $_SESSION["uid"]);
 	}
 
 	static function create_published_article($title, $url, $content, $labels_str,
@@ -544,7 +544,7 @@ class Article extends Handler_Protected {
 				SET unread = false,last_read = NOW()
 				WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
-			ccache_update($feed_id, $owner_uid);
+			CCache::update($feed_id, $owner_uid);
 		}
 
 		$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
@@ -909,7 +909,7 @@ class Article extends Handler_Protected {
 			WHERE ($ids_qpart) AND owner_uid = $owner_uid");
 
 		while ($line = db_fetch_assoc($result)) {
-			ccache_update($line["feed_id"], $owner_uid);
+			CCache::update($line["feed_id"], $owner_uid);
 		}
 	}
 

+ 19 - 16
include/ccache.php → classes/ccache.php

@@ -1,11 +1,12 @@
 <?php
+class CCache {
 	/* function ccache_zero($feed_id, $owner_uid) {
 		db_query("UPDATE ttrss_counters_cache SET
 			value = 0, updated = NOW() WHERE
 			feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
 	} */
 
-	function ccache_zero_all($owner_uid) {
+	static function zero_all($owner_uid) {
 		db_query("UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = '$owner_uid'");
 
@@ -13,7 +14,7 @@
 			value = 0 WHERE owner_uid = '$owner_uid'");
 	}
 
-	function ccache_remove($feed_id, $owner_uid, $is_cat = false) {
+	static function remove($feed_id, $owner_uid, $is_cat = false) {
 
 		if (!$is_cat) {
 			$table = "ttrss_counters_cache";
@@ -26,7 +27,7 @@
 
 	}
 
-	function ccache_update_all($owner_uid) {
+	static function update_all($owner_uid) {
 
 		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
 
@@ -34,27 +35,27 @@
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				ccache_update($line["feed_id"], $owner_uid, true);
+				CCache::update($line["feed_id"], $owner_uid, true);
 			}
 
 			/* We have to manually include category 0 */
 
-			ccache_update(0, $owner_uid, true);
+			CCache::update(0, $owner_uid, true);
 
 		} else {
 			$result = db_query("SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = '$owner_uid'");
 
 			while ($line = db_fetch_assoc($result)) {
-				print ccache_update($line["feed_id"], $owner_uid);
+				print CCache::update($line["feed_id"], $owner_uid);
 
 			}
 
 		}
 	}
 
-	function ccache_find($feed_id, $owner_uid, $is_cat = false,
-		$no_update = false) {
+	static function find($feed_id, $owner_uid, $is_cat = false,
+						 $no_update = false) {
 
 		if (!is_numeric($feed_id)) return;
 
@@ -85,14 +86,14 @@
 			if ($no_update) {
 				return -1;
 			} else {
-				return ccache_update($feed_id, $owner_uid, $is_cat);
+				return CCache::update($feed_id, $owner_uid, $is_cat);
 			}
 		}
 
 	}
 
-	function ccache_update($feed_id, $owner_uid, $is_cat = false,
-		$update_pcat = true, $pcat_fast = false) {
+	static function update($feed_id, $owner_uid, $is_cat = false,
+						   $update_pcat = true, $pcat_fast = false) {
 
 		if (!is_numeric($feed_id)) return;
 
@@ -102,13 +103,13 @@
 			$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
 		} */
 
-		$prev_unread = ccache_find($feed_id, $owner_uid, $is_cat, true);
+		$prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
 
 		/* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
 		if ($feed_id < 0) {
-			ccache_update_all($owner_uid);
+			CCache::update_all($owner_uid);
 			return;
 		}
 
@@ -132,7 +133,7 @@
 						WHERE owner_uid = '$owner_uid' AND $cat_qpart");
 
 				while ($line = db_fetch_assoc($result)) {
-					ccache_update($line["id"], $owner_uid, false, false);
+					CCache::update($line["id"], $owner_uid, false, false);
 				}
 			}
 
@@ -180,12 +181,12 @@
 
 					$cat_id = (int) db_fetch_result($result, 0, "cat_id");
 
-					ccache_update($cat_id, $owner_uid, true, true, true);
+					CCache::update($cat_id, $owner_uid, true, true, true);
 
 				}
 			}
 		} else if ($feed_id < 0) {
-			ccache_update_all($owner_uid);
+			CCache::update_all($owner_uid);
 		}
 
 		return $unread;
@@ -223,3 +224,5 @@
 		}
 	} */
 
+
+}

+ 3 - 3
classes/feeds.php

@@ -836,7 +836,7 @@ class Feeds extends Handler_Protected {
 	function catchupAll() {
 		$this->dbh->query("UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
-		ccache_zero_all($_SESSION["uid"]);
+		CCache::zero_all($_SESSION["uid"]);
 	}
 
 	function view() {
@@ -890,7 +890,7 @@ class Feeds extends Handler_Protected {
 		 * so for performance reasons we don't do that here */
 
 		if ($feed >= 0) {
-			ccache_update($feed, $_SESSION["uid"], $cat_view);
+			CCache::update($feed, $_SESSION["uid"], $cat_view);
 		}
 
 		set_pref("_DEFAULT_VIEW_MODE", $view_mode);
@@ -1365,7 +1365,7 @@ class Feeds extends Handler_Protected {
 
 			}
 
-			ccache_update($feed, $owner_uid, $cat_view);
+			CCache::update($feed, $owner_uid, $cat_view);
 
 		} else { // tag
 			db_query("UPDATE ttrss_user_entries

+ 1 - 1
classes/handler/public.php

@@ -227,7 +227,7 @@ class Handler_Public extends Handler {
 				if ($line['note']) $article['note'] = $line['note'];
 				if ($article['author']) $article['author'] = $line['author'];
 
-				$tags = get_article_tags($line["id"], $owner_uid);
+				$tags = Article::get_article_tags($line["id"], $owner_uid);
 
 				if (count($tags) > 0) {
 					$article['tags'] = array();

+ 7 - 7
classes/pref/feeds.php

@@ -1168,7 +1168,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
-				$tags = get_article_tags($line["ref_id"]);
+				$tags = Article::get_article_tags($line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1225,7 +1225,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = $this->dbh->fetch_assoc($tmp_result)) {
 
-				$tags = get_article_tags($line["ref_id"]);
+				$tags = Article::get_article_tags($line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1535,7 +1535,7 @@ class Pref_Feeds extends Handler_Protected {
 		$cat_id = (int) $cat_id;
 
 		if ($cat_id > 0) {
-			$cat_unread = ccache_find($cat_id, $_SESSION["uid"], true);
+			$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
 		} else if ($cat_id == 0 || $cat_id == -2) {
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
@@ -1740,7 +1740,7 @@ class Pref_Feeds extends Handler_Protected {
 		$result = $this->dbh->query("DELETE FROM ttrss_entries WHERE
 			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
 
-		ccache_update($id, $_SESSION['uid']);
+		CCache::update($id, $_SESSION['uid']);
 	} // function clear_feed_articles
 
 	private function remove_feed_category($id, $owner_uid) {
@@ -1748,7 +1748,7 @@ class Pref_Feeds extends Handler_Protected {
 		$this->dbh->query("DELETE FROM ttrss_feed_categories
 			WHERE id = '$id' AND owner_uid = $owner_uid");
 
-		ccache_remove($id, $owner_uid, true);
+		CCache::remove($id, $owner_uid, true);
 	}
 
 	static function remove_feed($id, $owner_uid) {
@@ -1803,11 +1803,11 @@ class Pref_Feeds extends Handler_Protected {
 				unlink(ICONS_DIR . "/$id.ico");
 			}
 
-			ccache_remove($id, $owner_uid);
+			CCache::remove($id, $owner_uid);
 
 		} else {
 			label_remove(feed_to_label_id($id), $owner_uid);
-			//ccache_remove($id, $owner_uid); don't think labels are cached
+			//CCache::remove($id, $owner_uid); don't think labels are cached
 		}
 	}
 

+ 3 - 4
include/functions.php

@@ -134,7 +134,6 @@
 
 	require_once 'db-prefs.php';
 	require_once 'version.php';
-	require_once 'ccache.php';
 	require_once 'labels.php';
 	require_once 'controls.php';
 
@@ -233,7 +232,7 @@
 
 		if ($purge_interval == -1 || !$purge_interval) {
 			if ($owner_uid) {
-				ccache_update($feed_id, $owner_uid);
+				CCache::update($feed_id, $owner_uid);
 			}
 			return;
 		}
@@ -277,7 +276,7 @@
 
 		$rows = db_affected_rows($result);
 
-		ccache_update($feed_id, $owner_uid);
+		CCache::update($feed_id, $owner_uid);
 
 		if ($debug) {
 			_debug("Purged feed $feed_id ($purge_interval): deleted $rows articles");
@@ -1078,7 +1077,7 @@
 		/* Special case: NULL category doesn't actually exist in the DB */
 
 		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) ccache_find(0, $_SESSION["uid"], true));
+			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
 		array_push($ret_arr, $cv);
 

+ 1 - 1
include/rssfuncs.php

@@ -686,7 +686,7 @@
 					$article_labels = get_article_labels($base_entry_id, $owner_uid);
 					$entry_language = db_fetch_result($result, 0, "lang");
 
-					$existing_tags = get_article_tags($base_entry_id, $owner_uid);
+					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
 					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
 
 				} else {