X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=1c43cdb94c2233be9aaf3c426e117590498b33bf;hb=857efe49e653787f5408fc014ae71efec68494d5;hp=f1396f6e654cbf7c7704074794beaf65ba4678d1;hpb=41b82aa4b98bc0e2004e7d28c2f5933fbe3ad7a3;p=tt-rss.git diff --git a/update.php b/update.php index f1396f6e..1c43cdb9 100755 --- a/update.php +++ b/update.php @@ -9,10 +9,11 @@ require_once "functions.php"; require_once "rssfuncs.php"; - require_once "sanity_check.php"; require_once "config.php"; + require_once "sanity_check.php"; require_once "db.php"; require_once "db-prefs.php"; + require_once "errorhandler.php"; if (!defined('PHP_EXECUTABLE')) define('PHP_EXECUTABLE', '/usr/bin/php'); @@ -22,10 +23,28 @@ init_connection($link); + $longopts = array("feeds", + "feedbrowser", + "daemon", + "daemon-loop", + "task:", + "cleanup-tags", + "quiet", + "log:", + "indexes", + "update-schema", + "convert-filters", + "force-update", + "list-plugins", + "help"); + + foreach ($pluginhost->get_commands() as $command => $data) { + array_push($longopts, $command . $data["suffix"]); + } - $op = $argv; + $options = getopt("", $longopts); - if (count($argv) == 0 && !defined('STDIN')) { + if (count($options) == 0 && !defined('STDIN')) { ?> Tiny Tiny RSS data update script. @@ -34,7 +53,7 @@ - +

@@ -44,36 +63,58 @@ exit; } - if (count($argv) == 1 || in_array("-help", $op) ) { + if (count($options) == 0 || isset($options["help"]) ) { print "Tiny Tiny RSS data update script.\n\n"; print "Options:\n"; - print " -feeds - update feeds\n"; - print " -feedbrowser - update feedbrowser\n"; - print " -daemon - start single-process update daemon\n"; - print " -cleanup-tags - perform tags table maintenance\n"; - print " -import USER FILE - import articles from XML\n"; - print " -quiet - don't show messages\n"; - print " -indexes - recreate missing schema indexes\n"; - print " -convert-filters - convert type1 filters to type2\n"; - print " -force-update - force update of all feeds\n"; - print " -help - show this help\n"; + print " --feeds - update feeds\n"; + print " --feedbrowser - update feedbrowser\n"; + print " --daemon - start single-process update daemon\n"; + print " --task N - create lockfile using this task id\n"; + print " --cleanup-tags - perform tags table maintenance\n"; + print " --quiet - don't output messages to stdout\n"; + print " --log FILE - log messages to FILE\n"; + print " --indexes - recreate missing schema indexes\n"; + print " --update-schema - update database schema\n"; + print " --convert-filters - convert type1 filters to type2\n"; + print " --force-update - force update of all feeds\n"; + print " --list-plugins - list all available plugins\n"; + print " --help - show this help\n"; print "Plugin options:\n"; foreach ($pluginhost->get_commands() as $command => $data) { - printf(" %-19s - %s\n", "$command", $data["description"]); + $args = $data['arghelp']; + printf(" --%-19s - %s\n", "$command $args", $data["description"]); } return; } - define('QUIET', in_array("-quiet", $op)); + if (!isset($options['update-schema'])) { + $schema_version = get_schema_version($link); + + if ($schema_version != SCHEMA_VERSION) { + die("Schema version is wrong, please upgrade the database.\n"); + } + } + + define('QUIET', isset($options['quiet'])); - if (!in_array("-daemon", $op)) { + if (isset($options["log"])) { + _debug("Logging to " . $options["log"]); + define('LOGFILE', $options["log"]); + } + + if (!isset($options["daemon"])) { $lock_filename = "update.lock"; } else { $lock_filename = "update_daemon.lock"; } + if (isset($options["task"])) { + _debug("Using task id " . $options["task"]); + $lock_filename = $lock_filename . "-task_" . $options["task"]; + } + $lock_handle = make_lockfile($lock_filename); $must_exit = false; @@ -83,7 +124,14 @@ "Maybe another update process is already running.\n"); } - if (in_array("-feeds", $op)) { + if (isset($options["force-update"])) { + _debug("marking all feeds as needing update..."); + + db_query($link, "UPDATE ttrss_feeds SET last_update_started = '1970-01-01', + last_updated = '1970-01-01'"); + } + + if (isset($options["feeds"])) { // Update all feeds needing a update. update_daemon_common($link); @@ -101,23 +149,24 @@ $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op); } - if (in_array("-feedbrowser", $op)) { + if (isset($options["feedbrowser"])) { $count = update_feedbrowser_cache($link); print "Finished, $count feeds processed.\n"; } - if (in_array("-daemon", $op)) { - $op = array_diff($op, array("-daemon")); + if (isset($options["daemon"])) { while (true) { - passthru(PHP_EXECUTABLE . " " . implode(' ', $op) . " -daemon-loop"); + $quiet = (isset($options["quiet"])) ? "--quiet" : ""; + + passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet"); _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds..."); sleep(DAEMON_SLEEP_INTERVAL); } } - if (in_array("-daemon-loop", $op)) { + if (isset($options["daemon-loop"])) { if (!make_stampfile('update_daemon.stamp')) { - die("error: unable to create stampfile\n"); + _debug("warning: unable to create stampfile\n"); } // Call to the feed batch update function @@ -141,41 +190,12 @@ } - if (in_array("-cleanup-tags", $op)) { + if (isset($options["cleanup-tags"])) { $rc = cleanup_tags($link, 14, 50000); _debug("$rc tags deleted.\n"); } - if (in_array("-import",$op)) { - $username = $argv[count($argv) - 2]; - $filename = $argv[count($argv) - 1]; - - if (!$username) { - print "error: please specify username.\n"; - return; - } - - if (!is_file($filename)) { - print "error: input filename ($filename) doesn't exist.\n"; - return; - } - - _debug("importing $filename for user $username...\n"); - - $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$username'"); - - if (db_num_rows($result) == 0) { - print "error: could not find user $username.\n"; - return; - } - - $owner_uid = db_fetch_result($result, 0, "id"); - - perform_data_import($link, $filename, $owner_uid); - - } - - if (in_array("-indexes", $op)) { + if (isset($options["indexes"])) { _debug("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!"); _debug("Type 'yes' to continue."); @@ -230,7 +250,7 @@ _debug("all done."); } - if (in_array("-convert-filters", $op)) { + if (isset($options["convert-filters"])) { _debug("WARNING: this will remove all existing type2 filters."); _debug("Type 'yes' to continue."); @@ -281,14 +301,58 @@ } - if (in_array("-force-update", $op)) { - _debug("marking all feeds as needing update..."); + if (isset($options["update-schema"])) { + _debug("checking for updates (" . DB_TYPE . ")..."); + + $updater = new DbUpdater($link, DB_TYPE, SCHEMA_VERSION); + + if ($updater->isUpdateRequired()) { + _debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION); + _debug("WARNING: please backup your database before continuing."); + _debug("Type 'yes' to continue."); + + if (read_stdin() != 'yes') + exit; + + for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) { + _debug("performing update up to version $i..."); + + $result = $updater->performUpdateTo($i); + + _debug($result ? "OK!" : "FAILED!"); + + if (!$result) return; + + } + } else { + _debug("update not required."); + } + + } + + if (isset($options["list-plugins"])) { + $tmppluginhost = new PluginHost($link); + $tmppluginhost->load_all($tmppluginhost::KIND_ALL); + $enabled = array_map("trim", explode(",", PLUGINS)); + + echo "List of all available plugins:\n"; + + foreach ($tmppluginhost->get_plugins() as $name => $plugin) { + $about = $plugin->about(); + + $status = $about[3] ? "system" : "user"; + + if (in_array($name, $enabled)) $name .= "*"; + + printf("%-50s %-10s v%.2f (by %s)\n%s\n\n", + $name, $status, $about[0], $about[2], $about[1]); + } + + echo "Plugins marked by * are currently enabled for all users.\n"; - db_query($link, "UPDATE ttrss_feeds SET last_update_started = '1970-01-01', - last_updated = '1970-01-01'"); } - $pluginhost->run_commands($op); + $pluginhost->run_commands($options); db_close($link);