mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 16:25:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stream instead of memory copy of SimplePie entries (#2972)

Browse Source 
* Stream instead of memory copy of SimplePie entries

https://github.com/FreshRSS/FreshRSS/issues/2952

* Undo lines delete

* Typo

* Remove unaccessible code

https://github.com/FreshRSS/FreshRSS/pull/2972/files#r425624163

* Back-compatibility for Feed->entries

https://github.com/FreshRSS/FreshRSS/pull/2972/files#r425631913
This commit is contained in:
Alexandre Alapetite
2020-05-17 00:04:51 +02:00
committed by GitHub
parent 525e1ca0b0
commit 83b5944dcb
4 changed files with 66 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Controllers/feedController.php
View File

@@ -320,10 +320,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
try {
if ($simplePiePush) {
$feed->loadEntries($simplePiePush); //Used by PubSubHubbub
$simplePie = $simplePiePush; //Used by WebSub
} else {
$feed->load(false, $isNewFeed);
$simplePie = $feed->load(false, $isNewFeed);
}
$newGuids = $simplePie == null ? [] : $feed->loadGuids($simplePie);
$entries = $simplePie == null ? [] : $feed->loadEntries($simplePie);
} catch (FreshRSS_Feed_Exception $e) {
Minz_Log::warning($e->getMessage());
$feedDAO->updateLastUpdate($feed->id(), true);
@@ -333,21 +335,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$needFeedCacheRefresh = false;
$entries = $feed->entries();
$nbEntries = count($entries);
if ($nbEntries > 0) {
$newGuids = array();
foreach ($entries as $entry) {
$newGuids[] = safe_ascii($entry->guid());
}
if (count($newGuids) > 0) {
// For this feed, check existing GUIDs already in database.
$existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids);
$newGuids = array();
$oldGuids = array();
// Add entries in database if possible.
for ($i = 0; $i < $nbEntries; $i++) {
$entry = $entries[$i];
foreach ($entries as $entry) {
if (isset($newGuids[$entry->guid()])) {
continue; //Skip subsequent articles with same GUID
}
@@ -406,8 +401,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$entryDAO->addEntry($entry->toArray());
$nb_new_articles++;
}
unset($entry);
unset($entries[$i]);
}
$entryDAO->updateLastSeen($feed->id(), $oldGuids, $mtime);
}