X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=521b956ad33b7d60311928690ff0da1716864042;hb=a47e631c1ba3e76a98cd7a3da7244c4e85a7ab51;hp=51930beab03c50efefdbb359362c1f7d0d0290ce;hpb=6aff7845751e1671f436da6686209b414fdcfcc4;p=tt-rss.git
diff --git a/update.php b/update.php
index 51930bea..521b956a 100755
--- a/update.php
+++ b/update.php
@@ -1,178 +1,201 @@
#!/usr/bin/env php
get_commands() as $command => $data) {
+ array_push($longopts, $command . $data["suffix"]);
+ }
+
+ $options = getopt("", $longopts);
+
+ if (!is_array($options)) {
+ die("error: getopt() failed. ".
+ "Most probably you are using PHP CGI to run this script ".
+ "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+ "additional information.\n");
+ }
+
+ if (count($options) == 0 && !defined('STDIN')) {
?>
- Database Updater
+ Tiny Tiny RSS data update script.
-
+
-
-
+
+
-
+
get_commands() as $command => $data) {
+ $args = $data['arghelp'];
+ printf(" --%-19s - %s\n", "$command $args", $data["description"]);
+ }
+
return;
}
- define('QUIET', in_array("-quiet", $op));
+ if (!isset($options['daemon'])) {
+ require_once "errorhandler.php";
+ }
+
+ if (!isset($options['update-schema'])) {
+ $schema_version = get_schema_version();
- if (!in_array("-daemon", $op)) {
+ if ($schema_version != SCHEMA_VERSION) {
+ die("Schema version is wrong, please upgrade the database.\n");
+ }
+ }
+
+ define('QUIET', isset($options['quiet']));
+
+ 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"];
+ }
+
+ if (isset($options["pidlock"])) {
+ $my_pid = $options["pidlock"];
+ $lock_filename = "update_daemon-$my_pid.lock";
+
+ }
+
+ _debug("Lock: $lock_filename");
+
$lock_handle = make_lockfile($lock_filename);
$must_exit = false;
+ if (isset($options["task"]) && isset($options["pidlock"])) {
+ $waits = $options["task"] * 5;
+ _debug("Waiting before update ($waits)");
+ sleep($waits);
+ }
+
// Try to lock a file in order to avoid concurrent update.
if (!$lock_handle) {
die("error: Can't create lockfile ($lock_filename). ".
"Maybe another update process is already running.\n");
}
- // Create a database connection.
- $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
- init_connection($link);
-
- if (in_array("-feeds", $op)) {
- // Update all feeds needing a update.
- update_daemon_common($link);
+ if (isset($options["force-update"])) {
+ _debug("marking all feeds as needing update...");
- // Update feedbrowser
- $count = update_feedbrowser_cache($link);
- _debug("Feedbrowser updated, $count feeds processed.");
-
- // Purge orphans and cleanup tags
- purge_orphans($link, true);
+ db_query( "UPDATE ttrss_feeds SET last_update_started = '1970-01-01',
+ last_updated = '1970-01-01'");
+ }
- $rc = cleanup_tags($link, 14, 50000);
- _debug("Cleaned $rc cached tags.");
+ if (isset($options["feeds"])) {
+ update_daemon_common();
+ housekeeping_common(true);
- get_linked_feeds($link);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
- if (in_array("-feedbrowser", $op)) {
- $count = update_feedbrowser_cache($link);
+ if (isset($options["feedbrowser"])) {
+ $count = update_feedbrowser_cache();
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" : "";
+ $log = isset($options['log']) ? '--log '.$options['log'] : '';
+
+ passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log");
_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
- // or regenerate feedbrowser cache
-
- if (rand(0,100) > 30) {
- update_daemon_common($link);
- } else {
- $count = update_feedbrowser_cache($link);
- _debug("Feedbrowser updated, $count feeds processed.");
-
- purge_orphans($link, true);
+ update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- $rc = cleanup_tags($link, 14, 50000);
-
- _debug("Cleaned $rc cached tags.");
-
- get_linked_feeds($link);
- }
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ housekeeping_common(true);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
- if (in_array("-cleanup-tags", $op)) {
- $rc = cleanup_tags($link, 14, 50000);
+ if (isset($options["cleanup-tags"])) {
+ $rc = cleanup_tags( 14, 50000);
_debug("$rc tags deleted.\n");
}
- if (in_array("-get-feeds", $op)) {
- get_linked_feeds($link);
- }
-
- 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.");
@@ -182,12 +205,12 @@
_debug("clearing existing indexes...");
if (DB_TYPE == "pgsql") {
- $result = db_query($link, "SELECT relname FROM
+ $result = db_query( "SELECT relname FROM
pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
AND relname NOT LIKE '%_pkey'
AND relkind = 'i'");
} else {
- $result = db_query($link, "SELECT index_name,table_name FROM
+ $result = db_query( "SELECT index_name,table_name FROM
information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
}
@@ -200,7 +223,7 @@
$line['table_name']." DROP INDEX ".$line['index_name'];
_debug($statement);
}
- db_query($link, $statement, false);
+ db_query( $statement, false);
}
_debug("reading indexes from schema for: " . DB_TYPE);
@@ -217,7 +240,7 @@
$statement = "CREATE INDEX $index ON $table";
_debug($statement);
- db_query($link, $statement);
+ db_query( $statement);
}
}
fclose($fp);
@@ -227,18 +250,7 @@
_debug("all done.");
}
- if (in_array("-update-self", $op)) {
- _debug("Warning: self-updating is experimental. Use at your own risk.");
- _debug("Please backup your tt-rss directory before continuing. Your database will not be modified.");
- _debug("Type 'yes' to continue.");
-
- if (read_stdin() != 'yes')
- exit;
-
- update_self($link, in_array("-force", $op));
- }
-
- 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.");
@@ -247,51 +259,101 @@
_debug("converting filters...");
- db_query($link, "DELETE FROM ttrss_filters2");
+ db_query( "DELETE FROM ttrss_filters2");
- $result = db_query($link, "SELECT * FROM ttrss_filters ORDER BY id");
+ $result = db_query( "SELECT * FROM ttrss_filters ORDER BY id");
while ($line = db_fetch_assoc($result)) {
$owner_uid = $line["owner_uid"];
- $filter = array();
+ // date filters are removed
+ if ($line["filter_type"] != 5) {
+ $filter = array();
- if (sql_bool_to_bool($line["cat_filter"])) {
- $feed_id = "CAT:" . (int)$line["cat_id"];
- } else {
- $feed_id = (int)$line["feed_id"];
+ if (sql_bool_to_bool($line["cat_filter"])) {
+ $feed_id = "CAT:" . (int)$line["cat_id"];
+ } else {
+ $feed_id = (int)$line["feed_id"];
+ }
+
+ $filter["enabled"] = $line["enabled"] ? "on" : "off";
+ $filter["rule"] = array(
+ json_encode(array(
+ "reg_exp" => $line["reg_exp"],
+ "feed_id" => $feed_id,
+ "filter_type" => $line["filter_type"])));
+
+ $filter["action"] = array(
+ json_encode(array(
+ "action_id" => $line["action_id"],
+ "action_param_label" => $line["action_param"],
+ "action_param" => $line["action_param"])));
+
+ // Oh god it's full of hacks
+
+ $_REQUEST = $filter;
+ $_SESSION["uid"] = $owner_uid;
+
+ $filters = new Pref_Filters($_REQUEST);
+ $filters->add();
}
+ }
+
+ }
+
+ if (isset($options["update-schema"])) {
+ _debug("checking for updates (" . DB_TYPE . ")...");
+
+ $updater = new DbUpdater(Db::get(), 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.");
- $filter["enabled"] = $line["enabled"] ? "on" : "off";
- $filter["rule"] = array(
- json_encode(array(
- "reg_exp" => $line["reg_exp"],
- "feed_id" => $feed_id,
- "filter_type" => $line["filter_type"])));
+ if (read_stdin() != 'yes')
+ exit;
- $filter["action"] = array(
- json_encode(array(
- "action_id" => $line["action_id"],
- "action_param_label" => $line["action_param"],
- "action_param" => $line["action_param"])));
+ for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+ _debug("performing update up to version $i...");
- // Oh god it's full of hacks
+ $result = $updater->performUpdateTo($i);
- $_REQUEST = $filter;
- $_SESSION["uid"] = $owner_uid;
+ _debug($result ? "OK!" : "FAILED!");
- $filters = new Pref_Filters($link, $_REQUEST);
- $filters->add();
+ if (!$result) return;
+
+ }
+ } else {
+ _debug("update not required.");
}
}
- db_close($link);
+ if (isset($options["list-plugins"])) {
+ $tmppluginhost = new PluginHost();
+ $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";
- if ($lock_handle != false) {
- fclose($lock_handle);
}
+ PluginHost::getInstance()->run_commands($options);
+
if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
unlink(LOCK_DIRECTORY . "/$lock_filename");
?>
