mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the OutputInterface for output and return error codes.

This commit is contained in:
ringmaster 2013-10-28 16:50:28 -04:00
parent a24cbb50af
commit d1c5e5d777
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/command/upgrade.php
View File

@ -16,6 +16,12 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
class Upgrade extends Command { class Upgrade extends Command {
const ERROR_SUCCESS = 0;
const ERROR_NOT_INSTALLED = 1;
const ERROR_MAINTENANCE_MODE = 2;
const ERROR_UP_TO_DATE = 3;
protected function configure() { protected function configure() {
$this $this
->setName('upgrade') ->setName('upgrade')
@ -32,50 +38,53 @@ class Upgrade extends Command {
// Don't do anything if ownCloud has not been installed // Don't do anything if ownCloud has not been installed
if(!\OC_Config::getValue('installed', false)) { if(!\OC_Config::getValue('installed', false)) {
echo 'ownCloud has not yet been installed' . PHP_EOL; $output->write('ownCloud has not yet been installed', true);
exit(0); return self::ERROR_NOT_INSTALLED;
} }
if(\OC::checkUpgrade(false)) { if(\OC::checkUpgrade(false)) {
$updater = new Updater(); $updater = new Updater();
$updater->listen('\OC\Updater', 'maintenanceStart', function () { $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) {
echo 'Turned on maintenance mode' . PHP_EOL; $output->write('Turned on maintenance mode', true);
}); });
$updater->listen('\OC\Updater', 'maintenanceEnd', function () { $updater->listen('\OC\Updater', 'maintenanceEnd', function () use($output) {
echo 'Turned off maintenance mode' . PHP_EOL; $output->write('Turned off maintenance mode', true);
echo 'Update successful' . PHP_EOL; $output->write('Update successful', true);
}); });
$updater->listen('\OC\Updater', 'dbUpgrade', function () { $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
echo 'Updated database' . PHP_EOL; $output->write('Updated database', true);
}); });
$updater->listen('\OC\Updater', 'filecacheStart', function () { $updater->listen('\OC\Updater', 'filecacheStart', function () use($output) {
echo 'Updating filecache, this may take really long...' . PHP_EOL; $output->write('Updating filecache, this may take really long...', true);
}); });
$updater->listen('\OC\Updater', 'filecacheDone', function () { $updater->listen('\OC\Updater', 'filecacheDone', function () use($output) {
echo 'Updated filecache' . PHP_EOL; $output->write('Updated filecache', true);
}); });
$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) { $updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use($output) {
echo '... ' . $out . '% done ...' . PHP_EOL; $output->write('... ' . $out . '% done ...', true);
}); });
$updater->listen('\OC\Updater', 'failure', function ($message) { $updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
echo $message . PHP_EOL; $output->write($message, true);
\OC_Config::setValue('maintenance', false); \OC_Config::setValue('maintenance', false);
}); });
$updater->upgrade(); $updater->upgrade();
return self::ERROR_SUCCESS;
} else { } else {
if(\OC_Config::getValue('maintenance', false)) { if(\OC_Config::getValue('maintenance', false)) {
//Possible scenario: ownCloud core is updated but an app failed //Possible scenario: ownCloud core is updated but an app failed
echo 'ownCloud is in maintenance mode' . PHP_EOL; $output->write('ownCloud is in maintenance mode', true);
echo 'Maybe an upgrade is already in process. Please check the ' $output->write('Maybe an upgrade is already in process. Please check the '
. 'logfile (data/owncloud.log). If you want to re-run the ' . 'logfile (data/owncloud.log). If you want to re-run the '
. 'upgrade procedure, remove the "maintenance mode" from ' . 'upgrade procedure, remove the "maintenance mode" from '
. 'config.php and call this script again.' . 'config.php and call this script again.'
. PHP_EOL; , true);
return self::ERROR_MAINTENANCE_MODE;
} else { } else {
echo 'ownCloud is already latest version' . PHP_EOL; $output->write('ownCloud is already latest version', true);
return self::ERROR_UP_TO_DATE;
} }
} }
} }