From d785ddde2a00a9eadd38c45c528f2d2f6d1c356a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 25 Jun 2022 11:15:51 +0200 Subject: New option to automatically mark as read gone articles (#4426) * New option to automatically mark as read gone articles Option to automatically and immediately mark as read entries / articles that are no longer provided in their upstream RSS / ATOM / XPath feed * Reduce SQL queries Optimisation: Perform cache update only once --- app/Models/FeedDAO.php | 52 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 21 deletions(-) (limited to 'app/Models/FeedDAO.php') diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 86ba70d5c..ec507b324 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -447,7 +447,8 @@ SQL; } /** - * @return int|false + * Remember to call updateCachedValues() after calling this function + * @return int|false number of lines affected or false in case of error */ public function keepMaxUnread(int $id, int $n) { //Double SELECT for MySQL workaround ERROR 1093 (HY000) @@ -461,32 +462,41 @@ WHERE id_feed=:id_feed1 AND is_read=0 AND id <= (SELECT e3.id FROM ( OFFSET :limit) e3) SQL; - $stm = $this->pdo->prepare($sql); - $stm->bindParam(':id_feed1', $id, PDO::PARAM_INT); - $stm->bindParam(':id_feed2', $id, PDO::PARAM_INT); - $stm->bindParam(':limit', $n, PDO::PARAM_INT); - - if (!$stm || !$stm->execute()) { + if (($stm = $this->pdo->prepare($sql)) && + $stm->bindParam(':id_feed1', $id, PDO::PARAM_INT) && + $stm->bindParam(':id_feed2', $id, PDO::PARAM_INT) && + $stm->bindParam(':limit', $n, PDO::PARAM_INT) && + $stm->execute()) { + return $stm->rowCount(); + } else { $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); Minz_Log::error('SQL error keepMaxUnread: ' . json_encode($info)); return false; } - $affected = $stm->rowCount(); + } - if ($affected > 0) { - $sql = 'UPDATE `_feed` ' - . 'SET `cache_nbUnreads`=`cache_nbUnreads`-' . $affected - . ' WHERE id=:id'; - $stm = $this->pdo->prepare($sql); - $stm->bindParam(':id', $id, PDO::PARAM_INT); - if (!($stm && $stm->execute())) { - $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); - Minz_Log::error('SQL error keepMaxUnread cache: ' . json_encode($info)); - return false; - } - } + /** + * Remember to call updateCachedValues() after calling this function + * @return int|false number of lines affected or false in case of error + */ + public function markAsReadUponGone(int $id) { + //Double SELECT for MySQL workaround ERROR 1093 (HY000) + $sql = <<<'SQL' +UPDATE `_entry` SET is_read=1 +WHERE id_feed=:id_feed1 AND is_read=0 AND `lastSeen` < (SELECT e3.maxlastseen FROM ( + SELECT MAX(e2.`lastSeen`) AS maxlastseen FROM `_entry` e2 WHERE e2.id_feed = :id_feed2) e3) +SQL; - return $affected; + if (($stm = $this->pdo->prepare($sql)) && + $stm->bindParam(':id_feed1', $id, PDO::PARAM_INT) && + $stm->bindParam(':id_feed2', $id, PDO::PARAM_INT) && + $stm->execute()) { + return $stm->rowCount(); + } else { + $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); + Minz_Log::error('SQL error markAsReadUponGone: ' . json_encode($info)); + return false; + } } /** -- cgit v1.2.3