Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

occ app update command #11053

Merged
merged 2 commits into from Nov 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
125 changes: 125 additions & 0 deletions core/Command/App/Update.php
@@ -0,0 +1,125 @@
<?php
/**
* @copyright Copyright (c) 2018, michag86 (michag86@arcor.de)
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OC\Core\Command\App;

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;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

class Update extends Command {

/** @var IAppManager */
protected $manager;
/** @var Installer */
private $installer;
/** @var ILogger */
private $logger;

/**
* @param IAppManager $manager
* @param 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() {
$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();
nickvergessen marked this conversation as resolved.
Show resolved Hide resolved
} else {
$output->writeln("<error>Please specify an app to update or \"--all\" to update all updatable apps\"</error>");
michag86 marked this conversation as resolved.
Show resolved Hide resolved
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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to log also the exception here. Let me do that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it make sense to also use Throwables here, as Christoph suggested for app:remove here: #11627 (comment)?

$this->logger->logException($e, ['message' => 'Failure during update of app "' . $appId . '"','app' => 'app:update']);
$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;
}
}

1 change: 1 addition & 0 deletions core/register_command.php
Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_classmap.php
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_static.php
Expand Up @@ -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',
Expand Down