From d2a5790053524437b907f616a7dea4016d79ac70 Mon Sep 17 00:00:00 2001 From: Tobia De Koninck Date: Fri, 24 Aug 2018 16:25:48 +0200 Subject: [PATCH 1/3] Add an occ command to report updates Signed-off-by: Tobia De Koninck --- apps/updatenotification/appinfo/info.xml | 4 ++ .../composer/composer/autoload_classmap.php | 1 + .../composer/composer/autoload_static.php | 1 + apps/updatenotification/lib/Command/Check.php | 62 +++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 apps/updatenotification/lib/Command/Check.php diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml index a227ccd655..4436e820b5 100644 --- a/apps/updatenotification/appinfo/info.xml +++ b/apps/updatenotification/appinfo/info.xml @@ -23,4 +23,8 @@ OCA\UpdateNotification\Settings\Admin + + + OCA\UpdateNotification\Command\Check + diff --git a/apps/updatenotification/composer/composer/autoload_classmap.php b/apps/updatenotification/composer/composer/autoload_classmap.php index bc9474d545..c6243dd76b 100644 --- a/apps/updatenotification/composer/composer/autoload_classmap.php +++ b/apps/updatenotification/composer/composer/autoload_classmap.php @@ -7,6 +7,7 @@ $baseDir = $vendorDir; return array( 'OCA\\UpdateNotification\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\UpdateNotification\\Command\\Check' => $baseDir . '/../lib/Command/Check.php', 'OCA\\UpdateNotification\\Controller\\APIController' => $baseDir . '/../lib/Controller/APIController.php', 'OCA\\UpdateNotification\\Controller\\AdminController' => $baseDir . '/../lib/Controller/AdminController.php', 'OCA\\UpdateNotification\\Notification\\BackgroundJob' => $baseDir . '/../lib/Notification/BackgroundJob.php', diff --git a/apps/updatenotification/composer/composer/autoload_static.php b/apps/updatenotification/composer/composer/autoload_static.php index 1908e43394..b3f900c3f9 100644 --- a/apps/updatenotification/composer/composer/autoload_static.php +++ b/apps/updatenotification/composer/composer/autoload_static.php @@ -22,6 +22,7 @@ class ComposerStaticInitUpdateNotification public static $classMap = array ( 'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\UpdateNotification\\Command\\Check' => __DIR__ . '/..' . '/../lib/Command/Check.php', 'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__ . '/..' . '/../lib/Controller/APIController.php', 'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__ . '/..' . '/../lib/Controller/AdminController.php', 'OCA\\UpdateNotification\\Notification\\BackgroundJob' => __DIR__ . '/..' . '/../lib/Notification/BackgroundJob.php', diff --git a/apps/updatenotification/lib/Command/Check.php b/apps/updatenotification/lib/Command/Check.php new file mode 100644 index 0000000000..bca89adaa5 --- /dev/null +++ b/apps/updatenotification/lib/Command/Check.php @@ -0,0 +1,62 @@ +installer = $installer; + $this->appManager = $appManager; + $this->updateChecker = $updateChecker; + } + + protected function configure() { + $this + ->setName('update:check') + ->setDescription('Check for server and app updates') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) { + // Server + $r = $this->updateChecker->getUpdateState(); + if ($r['updateAvailable']) { + $output->writeln($r['updateVersion'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.'); + } + + + // Apps + $apps = $this->appManager->getInstalledApps(); + foreach ($apps as $app) { + $update = $this->installer->isUpdateAvailable($app); + if ($update !== false) { + $output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.'); + } + } + + return 0; + } +} From e87caedf7e0c650fa94726ec80059cfab89251d3 Mon Sep 17 00:00:00 2001 From: Tobia De Koninck Date: Sun, 26 Aug 2018 12:17:31 +0200 Subject: [PATCH 2/3] Add license header and fix undefined index error Signed-off-by: Tobia De Koninck --- apps/updatenotification/lib/Command/Check.php | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/apps/updatenotification/lib/Command/Check.php b/apps/updatenotification/lib/Command/Check.php index bca89adaa5..c6109e44e6 100644 --- a/apps/updatenotification/lib/Command/Check.php +++ b/apps/updatenotification/lib/Command/Check.php @@ -1,5 +1,26 @@ . + * + */ + namespace OCA\UpdateNotification\Command; use OC\App\AppManager; @@ -43,7 +64,7 @@ class Check extends Command { protected function execute(InputInterface $input, OutputInterface $output) { // Server $r = $this->updateChecker->getUpdateState(); - if ($r['updateAvailable']) { + if (isset($r['updateAvailable']) && $r['updateAvailable']) { $output->writeln($r['updateVersion'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.'); } From d492b2c3998ddf0395acaac2572097447eb01586 Mon Sep 17 00:00:00 2001 From: Tobia De Koninck Date: Mon, 27 Aug 2018 12:17:22 +0200 Subject: [PATCH 3/3] Add summary with amount of updates Signed-off-by: Tobia De Koninck --- apps/updatenotification/lib/Command/Check.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/updatenotification/lib/Command/Check.php b/apps/updatenotification/lib/Command/Check.php index c6109e44e6..f363832873 100644 --- a/apps/updatenotification/lib/Command/Check.php +++ b/apps/updatenotification/lib/Command/Check.php @@ -62,10 +62,13 @@ class Check extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { + $updatesAvailableCount = 0; + // Server $r = $this->updateChecker->getUpdateState(); if (isset($r['updateAvailable']) && $r['updateAvailable']) { $output->writeln($r['updateVersion'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.'); + $updatesAvailableCount += 1; } @@ -75,9 +78,19 @@ class Check extends Command { $update = $this->installer->isUpdateAvailable($app); if ($update !== false) { $output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.'); + $updatesAvailableCount += 1; } } + // Report summary + if ($updatesAvailableCount === 0) { + $output->writeln('Everything up to date'); + } else if ($updatesAvailableCount === 1) { + $output->writeln('1 update available'); + } else { + $output->writeln('' . $updatesAvailableCount . ' updates available'); + } + return 0; } }