valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

purge feeds after updating

This commit is contained in:
Andrew Dolgov 2009-01-20 13:35:59 +01:00
parent d7135e2a81
commit 3907ef7111
7 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.php-dist
View File

@ -201,6 +201,11 @@
// Displays an URL for users to provide feedback or comments regarding
// this instance of tt-rss. Can lead to a forum, contact email, etc.
define('FORCE_ARTICLE_PURGE', 0);
// When this option is not 0, users ability to control feed purging
// intervals is disabled and all articles (which are not starred)
// older than this amount of days are purged.
define('CONFIG_VERSION', 18);
// Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file).

16
functions.php
View File

@ -147,8 +147,13 @@
if (!$owner_uid) return;
$purge_unread = get_pref($link, "PURGE_UNREAD_ARTICLES",
$owner_uid, false);
if (FORCE_ARTICLE_PURGE == 0) {
$purge_unread = get_pref($link, "PURGE_UNREAD_ARTICLES",
$owner_uid, false);
} else {
$purge_unread = true;
$purge_interval = FORCE_ARTICLE_PURGE;
}
if (!$purge_unread) $query_limit = " unread = false AND ";
@ -252,7 +257,7 @@
// print "Feed $feed_id: purge interval = $purge_interval\n";
}
if ($purge_interval > 0) {
if ($purge_interval > 0 || FORCE_ARTICLE_PURGE) {
purge_feed($link, $feed_id, $purge_interval, $do_output);
}
}
@ -1423,9 +1428,12 @@
_debug("update_rss_feed: updating counters cache...");
}
ccache_update($link, $feed, $owner_uid);
// disabled, purge_feed() does that...
//ccache_update($link, $feed, $owner_uid);
}
purge_feed($link, $feed, 0, true);
db_query($link, "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");

27
modules/pref-feeds.php
View File

@ -276,15 +276,19 @@
print_select_hash("update_method", $update_method, $update_methods);
}
/* Purge intl */
if (FORCE_ARTICLE_PURGE == 0) {
print "<br/>";
/* Purge intl */
$purge_interval = db_fetch_result($result, 0, "purge_interval");
print "<br/>";
print __('Article purging:') . " ";
$purge_interval = db_fetch_result($result, 0, "purge_interval");
print_select_hash("purge_interval", $purge_interval, $purge_intervals);
print __('Article purging:') . " ";
print_select_hash("purge_interval", $purge_interval, $purge_intervals);
}
print "</div>";
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
@ -469,14 +473,17 @@
/* Purge intl */
print "<br/>";
if (FORCE_ARTICLE_PURGE != 0) {
print __('Article purging:') . " ";
print "<br/>";
print_select_hash("purge_interval", $purge_interval, $purge_intervals,
"disabled");
print __('Article purging:') . " ";
batch_edit_cbox("purge_interval");
print_select_hash("purge_interval", $purge_interval, $purge_intervals,
"disabled");
batch_edit_cbox("purge_interval");
}
print "</div>";
print "<div class=\"dlgSec\">".__("Authentication")."</div>";

5
modules/pref-prefs.php
View File

@ -15,6 +15,11 @@
$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS");
if (FORCE_ARTICLE_PURGE != 0) {
array_push($prefs_blacklist, "PURGE_OLD_DAYS");
array_push($prefs_blacklist, "PURGE_UNREAD_ARTICLES");
}
if ($subop == "change-password") {
$old_pw = $_POST["OLD_PASSWORD"];

4
update_daemon2.php
View File

@ -164,8 +164,8 @@
// FIXME : $last_purge is of no use in a multiprocess update.
// FIXME : We ALWAYS purge old posts.
_debug("Purging old posts (random 30 feeds)...");
global_purge_old_posts($link, true, 30);
//_debug("Purging old posts (random 30 feeds)...");
//global_purge_old_posts($link, true, 30);
// Call to the feed batch update function
// or regenerate feedbrowser cache

4
update_daemon_loop.php
View File

@ -63,11 +63,11 @@
die;
}
if (time() - $last_purge > PURGE_INTERVAL) {
/* if (time() - $last_purge > PURGE_INTERVAL) {
_debug("Purging old posts (random 30 feeds)...");
global_purge_old_posts($link, true, 30);
$last_purge = time();
}
} */
// Call to the feed batch update function
// or regenerate feedbrowser cache

2
update_feeds.php
View File

@ -39,7 +39,7 @@
init_connection($link);
// Purge all posts (random 30 feeds)
global_purge_old_posts($link, true, 30);
//global_purge_old_posts($link, true, 30);
// Update all feeds needing a update.
update_daemon_common($link);