jan/miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor code refactoring

Browse Source
This commit is contained in:
Frederic Guillot 2013-05-22 13:13:56 +02:00
parent cb8e40f570
commit 30ea882cc7
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.php
View File

@ -23,12 +23,6 @@ function get_db_filename()
} }
function is_console()
{
return php_sapi_name() === 'cli';
}
PicoTools\container('db', function() { PicoTools\container('db', function() {
$db = new PicoDb\Database(array( $db = new PicoDb\Database(array(

21
cronjob.php
View File

@ -2,28 +2,27 @@
require 'common.php'; require 'common.php';
if (is_console()) { if (php_sapi_name() === 'cli') {
$options = getopt('', array( $options = getopt('', array(
'limit::', 'limit::',
'call-interval::', 'call-interval::',
'update-interval::' 'update-interval::'
)); ));
$limit = empty($options['limit']) ? LIMIT_ALL : (int)$options['limit'];
$update_interval = empty($options['update-interval']) ? null : (int)$options['update-interval'];
$call_interval = empty($options['call-interval']) ? null : (int)$options['call-interval'];
} else {
$limit = empty($_GET['limit']) ? LIMIT_ALL : (int)$_GET['limit'];
$update_interval = empty($_GET['update-interval']) ? null : (int)$_GET['update-interval'];
$call_interval = empty($_GET['call-interval']) ? null : (int)$_GET['call-interval'];
} }
else {
$options = $_GET;
}
$limit = ! empty($options['limit']) && ctype_digit($options['limit']) ? (int) $options['limit'] : LIMIT_ALL;
$update_interval = ! empty($options['update-interval']) && ctype_digit($options['update-interval']) ? (int) $options['update-interval'] : null;
$call_interval = ! empty($options['call-interval']) && ctype_digit($options['call-interval']) ? (int) $options['call-interval'] : null;
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(); $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));
} }
Model\update_feeds($limit); Model\update_feeds($limit);