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

Permet de configurer plus finement le nombre d’articles minimum à conserver par flux

Browse Source
This commit is contained in:
Alexandre Alapetite
2013-12-24 01:21:11 +01:00
parent ffbe676d7d
commit 87bfa195a6
10 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controllers/feedController.php
View File

@@ -102,14 +102,11 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feedDAO->beginTransaction ();
// on ajoute les articles en masse sans vérification
foreach ($entries as $entry) {
if ($entry->date (true) >= $date_min ||
$feed->keepHistory ()) {
$values = $entry->toArray ();
$values['id_feed'] = $feed->id ();
$values['id'] = min(time(), $entry->date (true)) . uSecString();
$values['is_read'] = $is_read;
$entryDAO->addEntry ($values);
}
$values = $entry->toArray ();
$values['id_feed'] = $feed->id ();
$values['id'] = min(time(), $entry->date (true)) . uSecString();
$values['is_read'] = $is_read;
$entryDAO->addEntry ($values);
}
$feedDAO->updateLastUpdate ($feed->id ());
$feedDAO->commit ();
@@ -217,8 +214,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feedDAO->beginTransaction ();
foreach ($entries as $entry) {
if ((!isset ($existingGuids[$entry->guid ()])) &&
($entry->date (true) >= $date_min ||
$feed->keepHistory ())) {
($entry->date (true) >= $date_min)) {
$values = $entry->toArray ();
//Use declared date at first import, otherwise use discovery date
$values['id'] = empty($existingGuids) ? min(time(), $entry->date (true)) . uSecString() : uTimeString();
@@ -227,8 +223,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
}
if ((!$feed->keepHistory()) && (rand(0, 30) === 1)) {
$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, count($entries) + 10);
if (($feed->keepHistory() >= 0) && (rand(0, 30) === 1)) {
$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feed->keepHistory(), count($entries) + 10));
if ($nb > 0) {
Minz_Log::record ($nb . ' old entries cleaned in feed ' . $feed->id (), Minz_Log::DEBUG);
}