X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=8f268cd35ac20cbebe0d9ed45980ce3f0670d630;hb=f8fc1ac54314dbd22c8673beb15d16780a0fc4c7;hp=f542a390bf833fbfcaed6f4d6a002acbb7ae44ba;hpb=82076ce53113be9cc053f8740356e7e1b81e5643;p=tt-rss.git
diff --git a/update.php b/update.php
index f542a390..8f268cd3 100755
--- a/update.php
+++ b/update.php
@@ -9,7 +9,6 @@
require_once "autoload.php";
require_once "functions.php";
- require_once "rssfuncs.php";
require_once "config.php";
require_once "sanity_check.php";
require_once "db.php";
@@ -18,6 +17,8 @@
if (!defined('PHP_EXECUTABLE'))
define('PHP_EXECUTABLE', '/usr/bin/php');
+ $pdo = Db::pdo();
+
init_plugins();
$longopts = array("feeds",
@@ -33,7 +34,11 @@
"update-schema",
"convert-filters",
"force-update",
+ "gen-search-idx",
"list-plugins",
+ "debug-feed:",
+ "force-refetch",
+ "force-rehash",
"help");
foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
@@ -42,19 +47,25 @@
$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')) {
?>
Tiny Tiny RSS data update script.
-
-
+
query( "UPDATE ttrss_feeds SET
+ last_update_started = '1970-01-01', last_updated = '1970-01-01'");
}
if (isset($options["feeds"])) {
- update_daemon_common();
- housekeeping_common(true);
+ RSSUtils::update_daemon_common();
+ RSSUtils::housekeeping_common(true);
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
if (isset($options["feedbrowser"])) {
- $count = update_feedbrowser_cache();
+ $count = RSSUtils::update_feedbrowser_cache();
print "Finished, $count feeds processed.\n";
}
if (isset($options["daemon"])) {
while (true) {
$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+ $log = isset($options['log']) ? '--log '.$options['log'] : '';
+
+ passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log");
- passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
- _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
- sleep(DAEMON_SLEEP_INTERVAL);
+ // let's enforce a minimum spawn interval as to not forkbomb the host
+ $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
+
+ _debug("Sleeping for $spawn_interval seconds...");
+ sleep($spawn_interval);
}
}
@@ -174,8 +194,10 @@
_debug("warning: unable to create stampfile\n");
}
- update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
- housekeeping_common(true);
+ RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+
+ if (!isset($options["pidlock"]) || $options["task"] == 0)
+ RSSUtils::housekeeping_common(true);
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
}
@@ -195,16 +217,16 @@
_debug("clearing existing indexes...");
if (DB_TYPE == "pgsql") {
- $result = db_query( "SELECT relname FROM
+ $sth = $pdo->query( "SELECT relname FROM
pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
AND relname NOT LIKE '%_pkey'
AND relkind = 'i'");
} else {
- $result = db_query( "SELECT index_name,table_name FROM
+ $sth = $pdo->query( "SELECT index_name,table_name FROM
information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
}
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $sth->fetch()) {
if (DB_TYPE == "pgsql") {
$statement = "DROP INDEX " . $line["relname"];
_debug($statement);
@@ -213,7 +235,7 @@
$line['table_name']." DROP INDEX ".$line['index_name'];
_debug($statement);
}
- db_query( $statement, false);
+ $pdo->query($statement);
}
_debug("reading indexes from schema for: " . DB_TYPE);
@@ -230,7 +252,7 @@
$statement = "CREATE INDEX $index ON $table";
_debug($statement);
- db_query( $statement);
+ $pdo->query($statement);
}
}
fclose($fp);
@@ -249,11 +271,11 @@
_debug("converting filters...");
- db_query( "DELETE FROM ttrss_filters2");
+ $pdo->query("DELETE FROM ttrss_filters2");
- $result = db_query( "SELECT * FROM ttrss_filters ORDER BY id");
+ $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $res->fetch()) {
$owner_uid = $line["owner_uid"];
// date filters are removed
@@ -294,7 +316,7 @@
if (isset($options["update-schema"])) {
_debug("checking for updates (" . DB_TYPE . ")...");
- $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
+ $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
if ($updater->isUpdateRequired()) {
_debug("schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
@@ -307,7 +329,7 @@
for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
_debug("performing update up to version $i...");
- $result = $updater->performUpdateTo($i);
+ $result = $updater->performUpdateTo($i, false);
_debug($result ? "OK!" : "FAILED!");
@@ -320,9 +342,47 @@
}
+ if (isset($options["gen-search-idx"])) {
+ echo "Generating search index (stemming set to English)...\n";
+
+ $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+ $row = $res->fetch();
+ $count = $row['count'];
+
+ print "Articles to process: $count.\n";
+
+ $limit = 500;
+ $processed = 0;
+
+ $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
+ tsvector_combined IS NULL ORDER BY id LIMIT ?");
+ $sth->execute([$limit]);
+
+ $usth = $pdo->prepare("UPDATE ttrss_entries
+ SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
+
+ while (true) {
+
+ while ($line = $sth->fetch()) {
+ $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+
+ $usth->execute([$tsvector_combined, $line['id']]);
+
+ $processed++;
+ }
+
+ print "Processed $processed articles...\n";
+
+ if ($processed < $limit) {
+ echo "All done.\n";
+ break;
+ }
+ }
+ }
+
if (isset($options["list-plugins"])) {
$tmppluginhost = new PluginHost();
- $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
+ $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
$enabled = array_map("trim", explode(",", PLUGINS));
echo "List of all available plugins:\n";
@@ -342,12 +402,23 @@
}
- PluginHost::getInstance()->run_commands($options);
+ if (isset($options["debug-feed"])) {
+ $feed = $options["debug-feed"];
+
+ if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
+ if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+
+ $_REQUEST['xdebug'] = 1;
- if ($lock_handle != false) {
- fclose($lock_handle);
+ $rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
+
+ exit($rc);
}
+ PluginHost::getInstance()->run_commands($options);
+
if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+ fclose($lock_handle);
unlink(LOCK_DIRECTORY . "/$lock_filename");
?>
