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

Inject AppManager and Installer, check for shipped app prior removing 

Signed-off-by: Patrik Kernstock <info@pkern.at>
This commit is contained in:
Patrik Kernstock 2018-10-05 19:51:50 +02:00
parent f8771d3d81
commit f27ce6b5a0
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/Command/App/Remove.php
View File

@ -23,6 +23,7 @@
namespace OC\Core\Command\App;
use OC\Installer;
use OCP\App\IAppManager;
use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
use Symfony\Component\Console\Command\Command;
@ -33,6 +34,21 @@ use Symfony\Component\Console\Output\OutputInterface;
class Remove extends Command implements CompletionAwareInterface {
/** @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:remove')
@ -53,16 +69,24 @@ class Remove extends Command implements CompletionAwareInterface {
protected function execute(InputInterface $input, OutputInterface $output) {
$appId = $input->getArgument('app-id');
// Check if the app is installed
if (!\OC_App::getAppPath($appId)) {
$output->writeln($appId . ' is not installed');
return 1;
}
// Removing shipped apps is not possible, therefore we pre-check that
// before trying to remove it
if ($this->manager->isShipped($appId)) {
$output->writeln($appId . ' could not be removed as it is a shipped app');
return 1;
}
// If we want to keep the data of the app, we simply don't disable it here.
// App uninstall tasks are being executed when disabled. More info: PR #11627.
if (!$input->getOption('keep-data')) {
try {
/** @var IAppManager $appManager*/
$appManager = \OC::$server->getAppManager();
$appManager->disableApp($appId);
$this->manager->disableApp($appId);
$output->writeln($appId . ' disabled');
} catch(\Exception $e) {
$output->writeln('Error: ' . $e->getMessage());
@ -70,10 +94,9 @@ class Remove extends Command implements CompletionAwareInterface {
}
}
// Let's try to remove the app...
try {
/** @var Installer $installer */
$installer = \OC::$server->query(Installer::class);
$result = $installer->removeApp($appId);
$result = $this->installer->removeApp($appId);
} catch(\Exception $e) {
$output->writeln('Error: ' . $e->getMessage());
return 1;

2
core/register_command.php
View File

@ -65,7 +65,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\App\Install());
$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());
$application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class)));
$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));