Merge pull request #25422 from owncloud/move-files_external-to-core

Move files external to core
owncloud · Nov 21, 2016 · 8c8fe55 · 8c8fe55
2 parents 9412235 + e33028c
commit 8c8fe55
Show file tree

Hide file tree

Showing 112 changed files with 2,329 additions and 2,234 deletions.
diff --git a/apps/encryption/lib/Migration.php b/apps/encryption/lib/Migration.php
@@ -320,7 +320,7 @@ private function renameFileKeys($user, $path, $trash = false) {
 	 * @return array
 	 */
 	protected function getSystemMountPoints() {
-		return \OC_Mount_Config::getSystemMountPoints();
+		return \OC\Files\External\LegacyUtil::getSystemMountPoints();
 	}
 
 	/**

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
@@ -46,5 +46,3 @@
 	"name" => $l->t('External storage')
 ]);
 
-$mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
-\OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
diff --git a/apps/files_external/appinfo/database.xml b/apps/files_external/appinfo/database.xml
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
@@ -13,7 +13,7 @@
 		<admin>admin-external-storage</admin>
 	</documentation>
 	<rememberlogin>false</rememberlogin>
-	<version>0.6.0</version>
+	<version>0.7.0</version>
 	<types>
 		<filesystem/>
 	</types>

diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
@@ -30,9 +30,9 @@
 use \OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
 use \OCP\IContainer;
-use \OCA\Files_External\Service\BackendService;
-use \OCA\Files_External\Lib\Config\IBackendProvider;
-use \OCA\Files_External\Lib\Config\IAuthMechanismProvider;
+use \OCP\Files\External\IStoragesBackendService;
+use \OCP\Files\External\Config\IBackendProvider;
+use \OCP\Files\External\Config\IAuthMechanismProvider;
 
 /**
  * @package OCA\Files_External\AppInfo
@@ -47,28 +47,28 @@ public function __construct(array $urlParams = []) {
 		$container->registerService('OCP\Files\Config\IUserMountCache', function (IAppContainer $c) {
 			return $c->getServer()->query('UserMountCache');
 		});
+		$container->registerService('OCP\Files\External\IStoragesBackendService', function (IAppContainer $c) {
+			return $c->getServer()->query('StoragesBackendService');
+		});
+		$container->registerService('OCP\Files\External\Service\IGlobalStoragesService', function (IAppContainer $c) {
+			return $c->getServer()->query('OCP\Files\External\Service\IGlobalStoragesService');
+		});
+		$container->registerService('OCP\Files\External\Service\IUserGlobalStoragesService', function (IAppContainer $c) {
+			return $c->getServer()->query('OCP\Files\External\Service\IUserGlobalStoragesService');
+		});
+		$container->registerService('OCP\Files\External\Service\IUserStoragesService', function (IAppContainer $c) {
+			return $c->getServer()->query('OCP\Files\External\Service\IUserStoragesService');
+		});
 
-		$backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
+		$backendService = $container->getServer()->query('StoragesBackendService');
 		$backendService->registerBackendProvider($this);
 		$backendService->registerAuthMechanismProvider($this);
-
-		// force-load auth mechanisms since some will register hooks
-		// TODO: obsolete these and use the TokenProvider to get the user's password from the session
-		$this->getAuthMechanisms();
-
-		// app developers: do NOT depend on this! it will disappear with oC 9.0!
-		\OC::$server->getEventDispatcher()->dispatch(
-			'OCA\\Files_External::loadAdditionalBackends'
-		);
 	}
 
 	/**
 	 * Register settings templates
 	 */
 	public function registerSettings() {
-		$container = $this->getContainer();
-		$backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
-
 		\OCP\App::registerAdmin('files_external', 'settings');
 		\OCP\App::registerPersonal('files_external', 'personal');
 	}
@@ -103,16 +103,6 @@ public function getAuthMechanisms() {
 		$container = $this->getContainer();
 
 		return [
-			// AuthMechanism::SCHEME_NULL mechanism
-			$container->query('OCA\Files_External\Lib\Auth\NullMechanism'),
-
-			// AuthMechanism::SCHEME_BUILTIN mechanism
-			$container->query('OCA\Files_External\Lib\Auth\Builtin'),
-
-			// AuthMechanism::SCHEME_PASSWORD mechanisms
-			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
-			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
-
 			// AuthMechanism::SCHEME_OAUTH1 mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
 

diff --git a/apps/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php
@@ -23,9 +23,9 @@
 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 OCP\Files\External\IStorageConfig;
+use OCP\Files\External\NotFoundException;
+use OCP\Files\External\Service\IGlobalStoragesService;
 use OCP\IGroupManager;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputArgument;
@@ -35,7 +35,7 @@
 
 class Applicable extends Base {
 	/**
-	 * @var GlobalStoragesService
+	 * @var IGlobalStoragesService
 	 */
 	protected $globalService;
 
@@ -50,7 +50,7 @@ class Applicable extends Base {
 	private $groupManager;
 
 	function __construct(
-		GlobalStoragesService $globalService,
+		IGlobalStoragesService $globalService,
 		IUserManager $userManager,
 		IGroupManager $groupManager
 	) {
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			return 404;
 		}
 
-		if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
+		if ($mount->getType() === IStorageConfig::MOUNT_TYPE_PERSONAl) {
 			$output->writeln('<error>Can\'t change applicables on personal mounts</error>');
 			return 1;
 		}

diff --git a/apps/files_external/lib/Command/Backends.php b/apps/files_external/lib/Command/Backends.php
@@ -22,10 +22,10 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_External\Lib\Auth\AuthMechanism;
-use OCA\Files_External\Lib\Backend\Backend;
-use OCA\Files_External\Lib\DefinitionParameter;
-use OCA\Files_External\Service\BackendService;
+use OCP\Files\External\Auth\AuthMechanism;
+use OCP\Files\External\Backend\Backend;
+use OCP\Files\External\DefinitionParameter;
+use OCP\Files\External\IStoragesBackendService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableHelper;
@@ -37,10 +37,10 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Backends extends Base {
-	/** @var BackendService */
+	/** @var IStoragesBackendService */
 	private $backendService;
 
-	function __construct(BackendService $backendService
+	function __construct(IStoragesBackendService $backendService
 	) {
 		parent::__construct();