From 020a9add07ea549c8408d4364e01492e5c138830 Mon Sep 17 00:00:00 2001
From: Michael Gerber <micha_g@arcor.de>
Date: Tue, 4 Sep 2018 22:26:15 +0200
Subject: Add occ app:update command

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 core/Command/App/Update.php | 119 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 core/Command/App/Update.php

(limited to 'core/Command/App/Update.php')

diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php
new file mode 100644
index 00000000000..89180a98a0f
--- /dev/null
+++ b/core/Command/App/Update.php
@@ -0,0 +1,119 @@
+<?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 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("<error>Please specify an app to update or \"--all\" to update all updatable apps\"</error>");
+			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;
+	}
+}
+
-- 
cgit v1.2.3


From 290ede1292a7d995a526ed0d510df67c2751097d Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 1 Nov 2018 17:07:55 +0100
Subject: Log exception in case an app update fails

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 core/Command/App/Update.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'core/Command/App/Update.php')

diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php
index 89180a98a0f..c571a9a1624 100644
--- a/core/Command/App/Update.php
+++ b/core/Command/App/Update.php
@@ -23,6 +23,7 @@ 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;
@@ -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 @@ class Update extends Command {
 					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;
 					}
-- 
cgit v1.2.3