mirror of
https://github.com/openvk/openvk
synced 2025-03-04 00:29:57 +03:00
chore(install): Fix formatting
ой
This commit is contained in:
parent
22bae8a2e1
commit
0b010d8c56
4 changed files with 157 additions and 113 deletions
|
@ -24,8 +24,9 @@ class FetchToncoinTransactions extends Command
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$ctx = DatabaseConnection::i()->getContext();
|
$ctx = DatabaseConnection::i()->getContext();
|
||||||
if (in_array("cryptotransactions", $ctx->getStructure()->getTables()))
|
if (in_array("cryptotransactions", $ctx->getStructure()->getTables())) {
|
||||||
$this->transactions = $ctx->table("cryptotransactions");
|
$this->transactions = $ctx->table("cryptotransactions");
|
||||||
|
}
|
||||||
|
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,8 +21,9 @@ class RebuildImagesCommand extends Command
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$ctx = DatabaseConnection::i()->getContext();
|
$ctx = DatabaseConnection::i()->getContext();
|
||||||
if (in_array("photos", $ctx->getStructure()->getTables()))
|
if (in_array("photos", $ctx->getStructure()->getTables())) {
|
||||||
$this->images = $ctx->table("photos");
|
$this->images = $ctx->table("photos");
|
||||||
|
}
|
||||||
|
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,8 @@ use Symfony\Component\Console\Input\InputOption;
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
|
||||||
class UpgradeCommand extends Command {
|
class UpgradeCommand extends Command
|
||||||
|
{
|
||||||
protected static $defaultName = "upgrade";
|
protected static $defaultName = "upgrade";
|
||||||
|
|
||||||
private Connection $db;
|
private Connection $db;
|
||||||
|
@ -27,7 +28,7 @@ class UpgradeCommand extends Command {
|
||||||
"CHANDLERACLRELATIONS",
|
"CHANDLERACLRELATIONS",
|
||||||
"CHANDLERGROUPS",
|
"CHANDLERGROUPS",
|
||||||
"CHANDLERTOKENS",
|
"CHANDLERTOKENS",
|
||||||
"CHANDLERUSERS"
|
"CHANDLERUSERS",
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
|
@ -42,14 +43,31 @@ class UpgradeCommand extends Command {
|
||||||
{
|
{
|
||||||
$this->setDescription("Upgrade OpenVK installation")
|
$this->setDescription("Upgrade OpenVK installation")
|
||||||
->setHelp("This command upgrades database schema after OpenVK was updated")
|
->setHelp("This command upgrades database schema after OpenVK was updated")
|
||||||
->addOption("quick", "Q", InputOption::VALUE_NEGATABLE,
|
->addOption(
|
||||||
"Don't display warning before migrating database", false)
|
"quick",
|
||||||
->addOption("repair", "R", InputOption::VALUE_NEGATABLE,
|
"Q",
|
||||||
"Attempt to repair database schema if tables are missing", false)
|
InputOption::VALUE_NEGATABLE,
|
||||||
->addOption("oneshot", "O", InputOption::VALUE_NONE,
|
"Don't display warning before migrating database",
|
||||||
"Only execute one operation")
|
false
|
||||||
->addArgument("chandler", InputArgument::OPTIONAL,
|
)
|
||||||
"Location of Chandler installation");
|
->addOption(
|
||||||
|
"repair",
|
||||||
|
"R",
|
||||||
|
InputOption::VALUE_NEGATABLE,
|
||||||
|
"Attempt to repair database schema if tables are missing",
|
||||||
|
false
|
||||||
|
)
|
||||||
|
->addOption(
|
||||||
|
"oneshot",
|
||||||
|
"O",
|
||||||
|
InputOption::VALUE_NONE,
|
||||||
|
"Only execute one operation"
|
||||||
|
)
|
||||||
|
->addArgument(
|
||||||
|
"chandler",
|
||||||
|
InputArgument::OPTIONAL,
|
||||||
|
"Location of Chandler installation"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function checkDatabaseReadiness(bool &$chandlerOk, bool &$ovkOk, bool &$eventOk, bool &$migrationsOk): void
|
protected function checkDatabaseReadiness(bool &$chandlerOk, bool &$ovkOk, bool &$eventOk, bool &$migrationsOk): void
|
||||||
|
@ -58,12 +76,13 @@ class UpgradeCommand extends Command {
|
||||||
$tables = array_map(fn($x) => strtoupper($x->offsetGet(0)), $tables);
|
$tables = array_map(fn($x) => strtoupper($x->offsetGet(0)), $tables);
|
||||||
|
|
||||||
$missingTables = array_diff($this->chandlerTables, $tables);
|
$missingTables = array_diff($this->chandlerTables, $tables);
|
||||||
if (sizeof($missingTables) == 0)
|
if (sizeof($missingTables) == 0) {
|
||||||
$chandlerOk = true;
|
$chandlerOk = true;
|
||||||
else if (sizeof($missingTables) == sizeof($this->chandlerTables))
|
} elseif (sizeof($missingTables) == sizeof($this->chandlerTables)) {
|
||||||
$chandlerOk = null;
|
$chandlerOk = null;
|
||||||
else
|
} else {
|
||||||
$chandlerOk = false;
|
$chandlerOk = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (is_null($this->eventDb)) {
|
if (is_null($this->eventDb)) {
|
||||||
$eventOk = false;
|
$eventOk = false;
|
||||||
|
@ -77,31 +96,39 @@ class UpgradeCommand extends Command {
|
||||||
$migrationsOk = in_array("OVK_UPGRADE_HISTORY", $tables);
|
$migrationsOk = in_array("OVK_UPGRADE_HISTORY", $tables);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function executeSqlScript(int $errCode, string $script, SymfonyStyle $io, bool $transaction = false,
|
protected function executeSqlScript(
|
||||||
bool $eventDb = false): int
|
int $errCode,
|
||||||
{
|
string $script,
|
||||||
|
SymfonyStyle $io,
|
||||||
|
bool $transaction = false,
|
||||||
|
bool $eventDb = false
|
||||||
|
): int {
|
||||||
$pdo = ($eventDb ? $this->eventDb : $this->db)->getPdo();
|
$pdo = ($eventDb ? $this->eventDb : $this->db)->getPdo();
|
||||||
|
|
||||||
$res = false;
|
$res = false;
|
||||||
try {
|
try {
|
||||||
if ($transaction)
|
if ($transaction) {
|
||||||
$res = $pdo->beginTransaction();
|
$res = $pdo->beginTransaction();
|
||||||
|
}
|
||||||
|
|
||||||
$res = $pdo->exec($script);
|
$res = $pdo->exec($script);
|
||||||
|
|
||||||
if ($transaction)
|
if ($transaction) {
|
||||||
$res = $pdo->commit();
|
$res = $pdo->commit();
|
||||||
} catch (\PDOException $e) {}
|
}
|
||||||
|
} catch (\PDOException $e) {
|
||||||
|
}
|
||||||
|
|
||||||
if ($res === false)
|
if ($res === false) {
|
||||||
goto error;
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
$io->getErrorStyle()->error([
|
$io->getErrorStyle()->error([
|
||||||
"Failed to execute SQL statement:",
|
"Failed to execute SQL statement:",
|
||||||
implode("\t", $pdo->errorInfo())
|
implode("\t", $pdo->errorInfo()),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return $errCode;
|
return $errCode;
|
||||||
|
@ -111,8 +138,9 @@ class UpgradeCommand extends Command {
|
||||||
{
|
{
|
||||||
$tbl = $eventDb ? "ovk_events_upgrade_history" : "ovk_upgrade_history";
|
$tbl = $eventDb ? "ovk_events_upgrade_history" : "ovk_upgrade_history";
|
||||||
$record = $this->db->query("SELECT level FROM $tbl ORDER BY level DESC LIMIT 1");
|
$record = $this->db->query("SELECT level FROM $tbl ORDER BY level DESC LIMIT 1");
|
||||||
if (!$record->getRowCount())
|
if (!$record->getRowCount()) {
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return $record->fetchField() + 1;
|
return $record->fetchField() + 1;
|
||||||
}
|
}
|
||||||
|
@ -123,8 +151,9 @@ class UpgradeCommand extends Command {
|
||||||
$root = dirname(__DIR__ . "/../install/init-static-db.sql");
|
$root = dirname(__DIR__ . "/../install/init-static-db.sql");
|
||||||
$dir = $eventDb ? "sqls/eventdb" : "sqls";
|
$dir = $eventDb ? "sqls/eventdb" : "sqls";
|
||||||
|
|
||||||
foreach (glob("$root/$dir/*.sql") as $file)
|
foreach (glob("$root/$dir/*.sql") as $file) {
|
||||||
$files[(int) basename($file)] = basename($file);
|
$files[(int) basename($file)] = basename($file);
|
||||||
|
}
|
||||||
|
|
||||||
ksort($files);
|
ksort($files);
|
||||||
|
|
||||||
|
@ -138,8 +167,9 @@ class UpgradeCommand extends Command {
|
||||||
|
|
||||||
if (!file_exists($chandlerConfigLocation)) {
|
if (!file_exists($chandlerConfigLocation)) {
|
||||||
$err = ["Could not find chandler location. Perhaps your config is too unique?"];
|
$err = ["Could not find chandler location. Perhaps your config is too unique?"];
|
||||||
if (!$input->getOption("chandler"))
|
if (!$input->getOption("chandler")) {
|
||||||
$err[] = "Specify absolute path to your chandler installation using the --chandler option.";
|
$err[] = "Specify absolute path to your chandler installation using the --chandler option.";
|
||||||
|
}
|
||||||
|
|
||||||
$io->getErrorStyle()->error($err);
|
$io->getErrorStyle()->error($err);
|
||||||
|
|
||||||
|
@ -150,8 +180,9 @@ class UpgradeCommand extends Command {
|
||||||
$bar = new ProgressBar($io, sizeof($this->chandlerTables));
|
$bar = new ProgressBar($io, sizeof($this->chandlerTables));
|
||||||
$io->writeln("Dropping chandler tables...");
|
$io->writeln("Dropping chandler tables...");
|
||||||
|
|
||||||
foreach ($bar->iterate($this->chandlerTables) as $table)
|
foreach ($bar->iterate($this->chandlerTables) as $table) {
|
||||||
$this->db->query("DROP TABLE IF EXISTS $table;");
|
$this->db->query("DROP TABLE IF EXISTS $table;");
|
||||||
|
}
|
||||||
|
|
||||||
$io->newLine();
|
$io->newLine();
|
||||||
}
|
}
|
||||||
|
@ -187,11 +218,15 @@ class UpgradeCommand extends Command {
|
||||||
$dir = $eventDb ? "sqls/eventdb" : "sqls";
|
$dir = $eventDb ? "sqls/eventdb" : "sqls";
|
||||||
$tbl = $eventDb ? "ovk_events_upgrade_history" : "ovk_upgrade_history";
|
$tbl = $eventDb ? "ovk_events_upgrade_history" : "ovk_upgrade_history";
|
||||||
$nextLevel = $this->getNextLevel($eventDb);
|
$nextLevel = $this->getNextLevel($eventDb);
|
||||||
$migrations = array_filter($this->getMigrationFiles($eventDb), fn ($id) => $id >= $nextLevel,
|
$migrations = array_filter(
|
||||||
ARRAY_FILTER_USE_KEY);
|
$this->getMigrationFiles($eventDb),
|
||||||
|
fn($id) => $id >= $nextLevel,
|
||||||
|
ARRAY_FILTER_USE_KEY
|
||||||
|
);
|
||||||
|
|
||||||
if (!sizeof($migrations))
|
if (!sizeof($migrations)) {
|
||||||
return 24;
|
return 24;
|
||||||
|
}
|
||||||
|
|
||||||
$uname = addslashes(`whoami`);
|
$uname = addslashes(`whoami`);
|
||||||
$bar = new ProgressBar($io, sizeof($migrations));
|
$bar = new ProgressBar($io, sizeof($migrations));
|
||||||
|
@ -209,9 +244,10 @@ class UpgradeCommand extends Command {
|
||||||
$t = time();
|
$t = time();
|
||||||
$this->db->query("INSERT INTO $tbl VALUES ($num, $t, \"$uname\");");
|
$this->db->query("INSERT INTO $tbl VALUES ($num, $t, \"$uname\");");
|
||||||
|
|
||||||
if ($oneshot)
|
if ($oneshot) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$io->newLine();
|
$io->newLine();
|
||||||
|
|
||||||
|
@ -255,46 +291,51 @@ class UpgradeCommand extends Command {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($res > 0)
|
if ($res > 0) {
|
||||||
return $res;
|
return $res;
|
||||||
else if ($res == 0 && $oneShotMode)
|
} elseif ($res == 0 && $oneShotMode) {
|
||||||
return 5;
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
if (!$ovkOk) {
|
if (!$ovkOk) {
|
||||||
$io->writeln("Initializing OpenVK schema...");
|
$io->writeln("Initializing OpenVK schema...");
|
||||||
$res = $this->initSchema($io);
|
$res = $this->initSchema($io);
|
||||||
if ($res > 0)
|
if ($res > 0) {
|
||||||
return $res;
|
return $res;
|
||||||
else if ($oneShotMode)
|
} elseif ($oneShotMode) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!$migrationsOk) {
|
if (!$migrationsOk) {
|
||||||
$io->writeln("Initializing upgrade log...");
|
$io->writeln("Initializing upgrade log...");
|
||||||
$res = $this->initUpgradeLog($io);
|
$res = $this->initUpgradeLog($io);
|
||||||
if ($res > 0)
|
if ($res > 0) {
|
||||||
return $res;
|
return $res;
|
||||||
else if ($oneShotMode)
|
} elseif ($oneShotMode) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ($eventOk !== false) {
|
if ($eventOk !== false) {
|
||||||
if ($eventOk === null) {
|
if ($eventOk === null) {
|
||||||
$io->writeln("Initializing event database...");
|
$io->writeln("Initializing event database...");
|
||||||
$res = $this->initEventSchema($io);
|
$res = $this->initEventSchema($io);
|
||||||
if ($res > 0)
|
if ($res > 0) {
|
||||||
return $res;
|
return $res;
|
||||||
else if ($oneShotMode)
|
} elseif ($oneShotMode) {
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$io->writeln("Upgrading event database...");
|
$io->writeln("Upgrading event database...");
|
||||||
$res = $this->runMigrations($io, true, $oneShotMode);
|
$res = $this->runMigrations($io, true, $oneShotMode);
|
||||||
if ($res == 24)
|
if ($res == 24) {
|
||||||
$output->writeln("Event database already up to date.");
|
$output->writeln("Event database already up to date.");
|
||||||
else if ($res > 0)
|
} elseif ($res > 0) {
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$io->writeln("Upgrading database...");
|
$io->writeln("Upgrading database...");
|
||||||
$res = $this->runMigrations($io, false, $oneShotMode);
|
$res = $this->runMigrations($io, false, $oneShotMode);
|
||||||
|
|
|
@ -443,8 +443,9 @@ function downloadable_name(string $text): string
|
||||||
}
|
}
|
||||||
|
|
||||||
return (function () {
|
return (function () {
|
||||||
if (php_sapi_name() != "cli")
|
if (php_sapi_name() != "cli") {
|
||||||
_ovk_check_environment();
|
_ovk_check_environment();
|
||||||
|
}
|
||||||
|
|
||||||
require __DIR__ . "/vendor/autoload.php";
|
require __DIR__ . "/vendor/autoload.php";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue