Minors cleanup

This commit is contained in:
Frederic Guillot 2013-05-21 12:25:13 +02:00
parent 11e4703d20
commit d21b061b95
6 changed files with 36 additions and 28 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
update*
make-archive.sh
*.sqlite
*.db

View File

@ -69,26 +69,25 @@ FAQ
You just need to be inside the directory `miniflux` and run the script `cronjob.php`.
Prameters | Type | Value
-------------------|--------------------------------|-----------------------------
--limit | optional |time in minutes
--call-interval | optional, exclude by --limit, requires --update-interval |time in minutes < update inteval time
--update-interval | optional, exclude by --limit, requires --call-interval |time in minutes >= call interval time
Parameters | Type | Value
--------------------|--------------------------------|-----------------------------
--limit | optional | time in minutes
--call-interval | optional, excluded by --limit, require --update-interval | time in minutes < update interval time
--update-interval | optional, excluded by --limit, require --call-interval | time in minutes >= call interval time
Examples:
crontab -e
# Update all feeds
0 */4 * * * cd /path/to/miniflux && php cronjob.php >/dev/null 2>&1
# Updates the 10 oldest feeds each time
# Update the 10 oldest feeds each time
0 */4 * * * cd /path/to/miniflux && php cronjob.php --limit=10 >/dev/null 2>&1
# Updates all feeds in 60mn (updates the 8 oldest feeds each time with a total of 120 feeds).
0 */4 * * * cd /path/to/miniflux && php cronjob.php --call-interval=4 --update-interval=60 >/dev/null 2>&1
# Update all feeds in 60 minutes (updates the 8 oldest feeds each time with a total of 120 feeds).
* */4 * * * cd /path/to/miniflux && php cronjob.php --call-interval=4 --update-interval=60 >/dev/null 2>&1
### How Miniflux update my feeds from the user interface?

View File

@ -16,16 +16,19 @@ const APP_USERAGENT = 'Miniflux - http://miniflux.net';
const HTTP_TIMEOUT = 5;
const LIMIT_ALL = -1;
function get_db_filename()
{
return 'data/db.sqlite';
}
function is_console()
{
return php_sapi_name() === 'cli';
}
PicoTools\container('db', function() {
$db = new PicoDb\Database(array(

View File

@ -1,7 +1,9 @@
<?php
require 'common.php';
if(is_console()) {
if (is_console()) {
$options = getopt('', array(
'limit::',
'call-interval::',
@ -12,10 +14,10 @@ if(is_console()) {
$update_interval = empty($options['update-interval']) ? null : (int)$options['update-interval'];
$call_interval = empty($options['call-interval']) ? null : (int)$options['call-interval'];
if($update_interval !== null && $call_interval !== null && $limit === LIMIT_ALL && $update_interval >= $call_interval) {
if ($update_interval !== null && $call_interval !== null && $limit === LIMIT_ALL && $update_interval >= $call_interval) {
$feeds_count = \PicoTools\singleton('db')->table('feeds')->count();
$limit = ceil($feeds_count / ( $update_interval / $call_interval )) ; // compute new limit
$limit = ceil($feeds_count / ($update_interval / $call_interval)); // compute new limit
}
Model\update_feeds($limit);

View File

@ -107,6 +107,7 @@ function import_feed($url)
return false;
}
function update_feeds($limit = LIMIT_ALL)
{
$feeds_id = get_feeds_id($limit);
@ -135,6 +136,7 @@ function update_feed($feed_id)
APP_USERAGENT
);
// Update the `last_checked` column each time, HTTP cache or not
update_feed_last_checked($feed_id);
if (! $resource->isModified()) {
@ -166,13 +168,12 @@ function get_feeds_id($limit = LIMIT_ALL)
$table_feeds = \PicoTools\singleton('db')->table('feeds')
->asc('last_checked');
if($limit !== LIMIT_ALL) {
if ($limit !== LIMIT_ALL) {
$table_feeds->limit((int)$limit);
}
return $table_feeds->listing('id', 'id');
}
@ -193,15 +194,18 @@ function get_feed($feed_id)
->findOne();
}
function update_feed_last_checked($feed_id) {
function update_feed_last_checked($feed_id)
{
\PicoTools\singleton('db')
->table('feeds')
->eq('id', $feed_id)
->save(array(
'last_checked' => time(),
'last_checked' => time()
));
}
function update_feed_cache_infos($feed_id, $last_modified, $etag)
{
\PicoTools\singleton('db')
@ -209,8 +213,7 @@ function update_feed_cache_infos($feed_id, $last_modified, $etag)
->eq('id', $feed_id)
->save(array(
'last_modified' => $last_modified,
'etag' => $etag,
'last_checked' => time(),
'etag' => $etag
));
}

View File

@ -2,11 +2,13 @@
namespace Schema;
function version_5($pdo)
{
$pdo->exec('ALTER TABLE feeds ADD COLUMN last_checked INTEGER');
}
function version_4($pdo)
{
$pdo->exec("CREATE INDEX idx_status ON items(status)");