open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move console command registration to info.xml for encryption as well as files_external

Browse Source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/1711/head
Thomas Müller 9 years ago committed by Roeland Jago Douma
parent c2be9cb605
commit 8628d57b2c
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
5 changed files with 25 additions and 107 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/encryption/appinfo/info.xml
  2. 38
      apps/encryption/appinfo/register_command.php
  3. 17
      apps/encryption/lib/Command/MigrateKeys.php
  4. 13
      apps/files_external/appinfo/info.xml
  5. 60
      apps/files_external/appinfo/register_command.php

4
apps/encryption/appinfo/info.xml
Unescape View File

@ -30,4 +30,8 @@
<settings>
<admin>OCA\Encryption\Settings\Admin</admin>
</settings>
<commands>
<command>OCA\Encryption\Command\EnableMasterKey</command>
<command>OCA\Encryption\Command\MigrateKeys</command>
</commands>
</info>

38
apps/encryption/appinfo/register_command.php
Unescape View File

@ -1,38 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Björn Schießle <bjoern@schiessle.org>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* 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, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
use OCA\Encryption\Command\MigrateKeys;
use Symfony\Component\Console\Helper\QuestionHelper;
$userManager = OC::$server->getUserManager();
$view = new \OC\Files\View();
$config = \OC::$server->getConfig();
$l = \OC::$server->getL10N('encryption');
$userSession = \OC::$server->getUserSession();
$connection = \OC::$server->getDatabaseConnection();
$logger = \OC::$server->getLogger();
$questionHelper = new QuestionHelper();
$crypt = new \OCA\Encryption\Crypto\Crypt($logger, $userSession, $config, $l);
$util = new \OCA\Encryption\Util($view, $crypt, $logger, $userSession, $config, $userManager);
$application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger));
$application->add(new \OCA\Encryption\Command\EnableMasterKey($util, $config, $questionHelper));

17
apps/encryption/lib/Command/MigrateKeys.php
Unescape View File

@ -22,13 +22,13 @@
namespace OCA\Encryption\Command;
use OC\DB\Connection;
use OC\Files\View;
use OC\User\Manager;
use OCA\Encryption\Migration;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IUserBackend;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
@ -36,12 +36,11 @@ use Symfony\Component\Console\Output\OutputInterface;
class MigrateKeys extends Command {
/** @var \OC\User\Manager */
/** @var IUserManager */
private $userManager;
/** @var View */
private $view;
/** @var \OC\DB\Connection */
/** @var IDBConnection */
private $connection;
/** @var IConfig */
private $config;
@ -49,15 +48,15 @@ class MigrateKeys extends Command {
private $logger;
/**
* @param Manager $userManager
* @param IUserManager $userManager
* @param View $view
* @param Connection $connection
* @param IDBConnection $connection
* @param IConfig $config
* @param ILogger $logger
*/
public function __construct(Manager $userManager,
public function __construct(IUserManager $userManager,
View $view,
Connection $connection,
IDBConnection $connection,
IConfig $config,
ILogger $logger) {

13
apps/files_external/appinfo/info.xml vendored
Unescape View File

@ -29,4 +29,17 @@
<admin>OCA\Files_External\Settings\Admin</admin>
<admin-section>OCA\Files_External\Settings\Section</admin-section>
</settings>
<commands>
<command>OCA\Files_External\Command\ListCommand</command>
<command>OCA\Files_External\Command\Config</command>
<command>OCA\Files_External\Command\Option</command>
<command>OCA\Files_External\Command\Applicable</command>
<command>OCA\Files_External\Command\Import</command>
<command>OCA\Files_External\Command\Export</command>
<command>OCA\Files_External\Command\Delete</command>
<command>OCA\Files_External\Command\Create</command>
<command>OCA\Files_External\Command\Backends</command>
<command>OCA\Files_External\Command\Verify</command>
</commands>
</info>

60
apps/files_external/appinfo/register_command.php vendored
Unescape View File

@ -1,60 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* 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, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
use OCA\Files_External\Command\ListCommand;
use OCA\Files_External\Command\Config;
use OCA\Files_External\Command\Option;
use OCA\Files_External\Command\Applicable;
use OCA\Files_External\Command\Import;
use OCA\Files_External\Command\Export;
use OCA\Files_External\Command\Delete;
use OCA\Files_External\Command\Create;
use OCA\Files_External\Command\Backends;
use OCA\Files_External\Command\Verify;
use OCA\Files_External\Command\Notify;
$userManager = OC::$server->getUserManager();
$userSession = OC::$server->getUserSession();
$groupManager = OC::$server->getGroupManager();
$app = \OC_Mount_Config::$app;
$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService');
$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService');
$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService');
$backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService');
$connection = $app->getContainer()->getServer()->getDatabaseConnection();
/** @var Symfony\Component\Console\Application $application */
$application->add(new ListCommand($globalStorageService, $userStorageService, $userSession, $userManager));
$application->add(new Config($globalStorageService));
$application->add(new Option($globalStorageService));
$application->add(new Applicable($globalStorageService, $userManager, $groupManager));
$application->add(new Import($globalStorageService, $userStorageService, $userSession, $userManager, $importLegacyStorageService, $backendService));
$application->add(new Export($globalStorageService, $userStorageService, $userSession, $userManager));
$application->add(new Delete($globalStorageService, $userStorageService, $userSession, $userManager));
$application->add(new Create($globalStorageService, $userStorageService, $userManager, $userSession, $backendService));
$application->add(new Backends($backendService));
$application->add(new Verify($globalStorageService));
$application->add(new Notify($globalStorageService, $connection));
Write Preview
Loading…
Cancel
Save