From 020a9add07ea549c8408d4364e01492e5c138830 Mon Sep 17 00:00:00 2001 From: Michael Gerber Date: Tue, 4 Sep 2018 22:26:15 +0200 Subject: [PATCH 1/2] Add occ app:update command Signed-off-by: Morris Jobke --- core/Command/App/Update.php | 119 ++++++++++++++++++++ core/register_command.php | 1 + lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + 4 files changed, 122 insertions(+) create mode 100644 core/Command/App/Update.php diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php new file mode 100644 index 0000000000000..89180a98a0f2c --- /dev/null +++ b/core/Command/App/Update.php @@ -0,0 +1,119 @@ +. + * + */ + +namespace OC\Core\Command\App; + +use OCP\App\IAppManager; +use OC\Installer; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class Update extends Command { + + /** @var IAppManager */ + protected $manager; + /** @var Installer */ + private $installer; + /** + * @param IAppManager $manager + * @param Installer $installer + */ + public function __construct(IAppManager $manager, Installer $installer) { + parent::__construct(); + $this->manager = $manager; + $this->installer = $installer; + } + + protected function configure() { + $this + ->setName('app:update') + ->setDescription('update an app or all apps') + ->addArgument( + 'app-id', + InputArgument::OPTIONAL, + 'update the specified app' + ) + ->addOption( + 'all', + null, + InputOption::VALUE_NONE, + 'update all updatable apps' + ) + ->addOption( + 'showonly', + null, + InputOption::VALUE_NONE, + 'show update(s) without updating' + ) + + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) { + $singleAppId = $input->getArgument('app-id'); + + if ($singleAppId) { + $apps = array($singleAppId); + try { + $this->manager->getAppPath($singleAppId); + } catch (\OCP\App\AppPathNotFoundException $e) { + $output->writeln($singleAppId . ' not installed'); + return 1; + } + + } else if ($input->getOption('all') || $input->getOption('showonly')) { + $apps = \OC_App::getAllApps(); + } else { + $output->writeln("Please specify an app to update or \"--all\" to update all updatable apps\""); + return 1; + } + + $return = 0; + foreach ($apps as $appId) { + $newVersion = $this->installer->isUpdateAvailable($appId); + if ($newVersion) { + $output->writeln($appId . ' new version available: ' . $newVersion); + + if (!$input->getOption('showonly')) { + try { + $result = $this->installer->updateAppstoreApp($appId); + } catch(\Exception $e) { + $output->writeln('Error: ' . $e->getMessage()); + $return = 1; + } + + if ($result === false) { + $output->writeln($appId . ' couldn\'t be updated'); + $return = 1; + } else if($result === true) { + $output->writeln($appId . ' updated'); + } + } + } + } + + return $return; + } +} + diff --git a/core/register_command.php b/core/register_command.php index 9c3591c8afed4..fb029f1be4a11 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -66,6 +66,7 @@ $application->add(new OC\Core\Command\App\GetPath()); $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager())); $application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->getLogger())); + $application->add(\OC::$server->query(\OC\Core\Command\App\Update::class)); $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class)); $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class)); diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 8c6dc5024870d..b80dd94edc9cf 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -558,6 +558,7 @@ 'OC\\Core\\Command\\App\\Install' => $baseDir . '/core/Command/App/Install.php', 'OC\\Core\\Command\\App\\ListApps' => $baseDir . '/core/Command/App/ListApps.php', 'OC\\Core\\Command\\App\\Remove' => $baseDir . '/core/Command/App/Remove.php', + 'OC\\Core\\Command\\App\\Update' => $baseDir . '/core/Command/App/Update.php', 'OC\\Core\\Command\\Background\\Ajax' => $baseDir . '/core/Command/Background/Ajax.php', 'OC\\Core\\Command\\Background\\Base' => $baseDir . '/core/Command/Background/Base.php', 'OC\\Core\\Command\\Background\\Cron' => $baseDir . '/core/Command/Background/Cron.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 2a46e99e02057..b71b49a646b26 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -588,6 +588,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Command\\App\\Install' => __DIR__ . '/../../..' . '/core/Command/App/Install.php', 'OC\\Core\\Command\\App\\ListApps' => __DIR__ . '/../../..' . '/core/Command/App/ListApps.php', 'OC\\Core\\Command\\App\\Remove' => __DIR__ . '/../../..' . '/core/Command/App/Remove.php', + 'OC\\Core\\Command\\App\\Update' => __DIR__ . '/../../..' . '/core/Command/App/Update.php', 'OC\\Core\\Command\\Background\\Ajax' => __DIR__ . '/../../..' . '/core/Command/Background/Ajax.php', 'OC\\Core\\Command\\Background\\Base' => __DIR__ . '/../../..' . '/core/Command/Background/Base.php', 'OC\\Core\\Command\\Background\\Cron' => __DIR__ . '/../../..' . '/core/Command/Background/Cron.php', From 290ede1292a7d995a526ed0d510df67c2751097d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 1 Nov 2018 17:07:55 +0100 Subject: [PATCH 2/2] Log exception in case an app update fails Signed-off-by: Morris Jobke --- core/Command/App/Update.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php index 89180a98a0f2c..c571a9a162414 100644 --- a/core/Command/App/Update.php +++ b/core/Command/App/Update.php @@ -23,6 +23,7 @@ use OCP\App\IAppManager; use OC\Installer; +use OCP\ILogger; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; @@ -35,14 +36,18 @@ class Update extends Command { protected $manager; /** @var Installer */ private $installer; + /** @var ILogger */ + private $logger; + /** * @param IAppManager $manager * @param Installer $installer */ - public function __construct(IAppManager $manager, Installer $installer) { + public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) { parent::__construct(); $this->manager = $manager; $this->installer = $installer; + $this->logger = $logger; } protected function configure() { @@ -99,6 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { try { $result = $this->installer->updateAppstoreApp($appId); } catch(\Exception $e) { + $this->logger->logException($e, ['message' => 'Failure during update of app "' . $appId . '"','app' => 'app:update']); $output->writeln('Error: ' . $e->getMessage()); $return = 1; }