mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-06 22:23:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reload full content when changed (#3506)

Browse Source 
* Reload full content when changed
If an article is changed, reload also its full content when applicable.

* Compute hash before getting full content

* Revert mix two PRs

* Update app/Controllers/feedController.php
This commit is contained in:
Alexandre Alapetite
2021-03-09 08:41:01 +01:00
committed by GitHub
parent 385e7f883a
commit ef4a826e34
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/feedController.php
View File

@@ -377,6 +377,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue;
}
// If the entry has changed, there is a good chance for the full content to have changed as well.
$entry->loadCompleteContent(true);
if (!$entryDAO->inTransaction()) {
$entryDAO->beginTransaction();
}

4
app/Models/Entry.php
View File

@@ -433,9 +433,9 @@ class FreshRSS_Entry extends Minz_Model {
$feed = $this->feed(true);
if ($feed != null && trim($feed->pathEntries()) != '') {
$entryDAO = FreshRSS_Factory::createEntryDao();
$entry = $entryDAO->searchByGuid($this->feedId, $this->guid);
$entry = $force ? null : $entryDAO->searchByGuid($this->feedId, $this->guid);
if ($entry && !$force) {
if ($entry) {
// l'article existe déjà en BDD, en se contente de recharger ce contenu
$this->content = $entry->content();
} else {

6
app/Models/Feed.php
View File

@@ -467,10 +467,8 @@ class FreshRSS_Feed extends Minz_Model {
);
$entry->_tags($tags);
$entry->_feed($this);
if ($this->pathEntries != '') {
// Optionally load full content for truncated feeds
$entry->loadCompleteContent();
}
$entry->hash(); //Must be computed before loading full content
$entry->loadCompleteContent(); // Optionally load full content for truncated feeds
yield $entry;
}