Skip to content
Snippets Groups Projects
Commit 2dd0066b authored by Robin Appelman's avatar Robin Appelman
Browse files

Add command to set mount options for external storages

parent d5ffbc94
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,7 @@
use OCA\Files_External\Command\ListCommand;
use OCA\Files_External\Command\Config;
use OCA\Files_External\Command\Option;
$userManager = OC::$server->getUserManager();
$userSession = OC::$server->getUserSession();
......@@ -33,4 +34,5 @@ $userStorageService = $app->getContainer()->query('\OCA\Files_external\Service\U
/** @var Symfony\Component\Console\Application $application */
$application->add(new ListCommand($globalStorageService, $userStorageService, $userSession, $userManager));
$application->add(new Config($globalStorageService, $userStorageService, $userSession, $userManager));
$application->add(new Config($globalStorageService));
$application->add(new Option($globalStorageService));
......@@ -23,10 +23,8 @@ namespace OCA\Files_External\Command;
use OC\Core\Command\Base;
use OCA\Files_external\Lib\StorageConfig;
use OCA\Files_external\NotFoundException;
use OCA\Files_external\Service\GlobalStoragesService;
use OCA\Files_external\Service\UserStoragesService;
use OCP\IUserManager;
use OCP\IUserSession;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Helper\TableHelper;
......@@ -39,7 +37,7 @@ class Config extends Base {
/**
* @var GlobalStoragesService
*/
private $globalService;
protected $globalService;
function __construct(GlobalStoragesService $globalService) {
parent::__construct();
......@@ -69,9 +67,9 @@ class Config extends Base {
protected function execute(InputInterface $input, OutputInterface $output) {
$mountId = $input->getArgument('mount_id');
$key = $input->getArgument('key');
$mount = $this->globalService->getStorage($mountId);
if (!$mount instanceof StorageConfig) {
try {
$mount = $this->globalService->getStorage($mountId);
} catch (NotFoundException $e) {
$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
return;
}
......@@ -89,7 +87,7 @@ class Config extends Base {
* @param string $key
* @param OutputInterface $output
*/
private function getOption(StorageConfig $mount, $key, OutputInterface $output) {
protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
$value = $mount->getBackendOption($key);
if (!is_string($value)) { // show bools and objects correctly
$value = json_encode($value);
......@@ -103,7 +101,7 @@ class Config extends Base {
* @param string $value
* @param OutputInterface $output
*/
private function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
$decoded = json_decode($value, true);
if (!is_null($decoded)) {
$value = $decoded;
......
<?php
/**
* @author Robin Appelman <icewind@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @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/>
*
*/
namespace OCA\Files_External\Command;
use OC\Core\Command\Base;
use OCA\Files_external\Lib\StorageConfig;
use OCA\Files_external\Service\GlobalStoragesService;
use OCA\Files_external\Service\UserStoragesService;
use OCP\IUserManager;
use OCP\IUserSession;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Helper\TableHelper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Option extends Config {
protected function configure() {
$this
->setName('files_external:option')
->setDescription('Manage mount options for a mount')
->addArgument(
'mount_id',
InputArgument::REQUIRED,
'The id of the mount to edit'
)->addArgument(
'key',
InputArgument::REQUIRED,
'key of the mount option to set/get'
)->addArgument(
'value',
InputArgument::OPTIONAL,
'value to set the mount option to, when no value is provided the existing value will be printed'
);
}
/**
* @param StorageConfig $mount
* @param string $key
* @param OutputInterface $output
*/
protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
$value = $mount->getMountOption($key);
if (!is_string($value)) { // show bools and objects correctly
$value = json_encode($value);
}
$output->writeln($value);
}
/**
* @param StorageConfig $mount
* @param string $key
* @param string $value
* @param OutputInterface $output
*/
protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
$decoded = json_decode($value, true);
if (!is_null($decoded)) {
$value = $decoded;
}
$mount->setMountOption($key, $value);
$this->globalService->updateStorage($mount);
}
}
......@@ -301,6 +301,25 @@ class StorageConfig implements \JsonSerializable {
$this->mountOptions = $mountOptions;
}
/**
* @param string $key
* @return mixed
*/
public function getMountOption($key) {
if (isset($this->mountOptions[$key])) {
return $this->mountOptions[$key];
}
return null;
}
/**
* @param string $key
* @param mixed $value
*/
public function setMountOption($key, $value) {
$this->mountOptions[$key] = $value;
}
/**
* Gets the storage status, whether the config worked last time
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment