Cleanup filesystem setup code

apps/files/ajax/scan.php

@@ -20,7 +20,7 @@
 
 foreach ($users as $user) {
 	$eventSource->send('user', $user);
-	$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection());
+	$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getUserFolder($user));
 	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file'));
 	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
 	if ($force) {

apps/files/command/scan.php

@@ -46,7 +46,7 @@ protected function configure() {
 	}
 
 	protected function scanFiles($user, OutputInterface $output) {
-		$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection());
+		$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getUserFolder($user));
 		$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
 			$output->writeln("Scanning <info>$path</info>");
 		});

apps/files/tests/ajax_rename.php

@@ -48,7 +48,7 @@ protected function setUp() {
 		\OC_User::createUser(self::$user, 'password');
 		\OC_User::setUserId(self::$user);
 
-		\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
+		\OC_Util::setupFS(self::$user);
 
 		$l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
 		$l10nMock->expects($this->any())

apps/files_encryption/hooks/hooks.php

@@ -37,6 +37,8 @@ class Hooks {
 	// file for which we want to delete the keys after the delete operation was successful
 	private static $umountedFiles = array();
 
+	private static $proxyStatus;
+
 	/**
 	 * Startup encryption backend upon user login
 	 * @note This method should never be called for users using client side encryption
@@ -233,7 +235,7 @@ public static function setPassphrase($params) {
 					$newUserPassword = $params['password'];
 
 					// make sure that the users home is mounted
-					\OC\Files\Filesystem::initMountPoints($user);
+					\OC::$server->setupFilesystem($user);
 
 					$keypair = Crypt::createKeypair();
 
@@ -704,4 +706,15 @@ public static function postUmount($params) {
 		}
 	}
 
+	/**
+	 * disable encryption while copying the skeleton
+	 */
+	public static function preCopySkeleton(){
+		self::$proxyStatus = \OC_FileProxy::$enabled;
+		self::$proxyStatus = false;
+	}
+
+	public static function postCopySkeleton() {
+		\OC_FileProxy::$enabled = self::$proxyStatus;
+	}
 }

apps/files_encryption/lib/helper.php

@@ -71,6 +71,10 @@ public static function registerFilesystemHooks() {
 		\OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Encryption\Hooks', 'postUmount');
 		\OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Encryption\Hooks', 'preUmount');
 		\OCP\Util::connectHook('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', 'OCA\Encryption\Hooks', 'postPasswordReset');
+
+		$factory = \OC::$server->getFilesystemFactory();
+		$factory->listen('\OC\Files','preCopySkeleton', array('OCA\Encryption\Hooks', 'preCopySkeleton'));
+		$factory->listen('\OC\Files', 'postCopySkeleton', array('OCA\Encryption\Hooks', 'postCopySkeleton'));
 	}
 
 	/**

apps/files_encryption/lib/util.php

@@ -81,7 +81,7 @@ public function __construct($view, $userId, $client = false) {
 		$this->privateKeyPath =
 				$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
 		// make sure that the owners home is mounted
-		\OC\Files\Filesystem::initMountPoints($userId);
+		\OC::$server->setupFilesystem($userId);
 
 		if (\OCA\Encryption\Helper::isPublicAccess()) {
 			$this->keyId = $this->publicShareKeyId;
@@ -1215,7 +1215,7 @@ public function getUidAndFilename($path) {
 			}
 
 			// NOTE: Bah, this dependency should be elsewhere
-			\OC\Files\Filesystem::initMountPoints($fileOwnerUid);
+			\OC::$server->setupFilesystem($fileOwnerUid);
 
 			// If the file owner is the currently logged in user
 			if ($fileOwnerUid === $this->userId) {

apps/files_sharing/ajax/publicpreview.php

@@ -41,7 +41,6 @@
 
 OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
 \OC_Util::setupFS($userId);
-\OC\Files\Filesystem::initMountPoints($userId);
 $view = new \OC\Files\View('/' . $userId . '/files');
 
 $pathId = $linkedItem['file_source'];

apps/files_sharing/lib/cache.php

@@ -53,7 +53,7 @@ private function getSourceCache($target) {
 		}
 		$source = \OC_Share_Backend_File::getSource($target, $this->storage->getMountPoint(), $this->storage->getItemType());
 		if (isset($source['path']) && isset($source['fileOwner'])) {
-			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
+			\OC::$server->setupFilesystem($source['fileOwner']);
 			$mounts = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
 			if (is_array($mounts) and !empty($mounts)) {
 				$fullPath = $mounts[0]->getMountPoint() . $source['path'];

apps/files_sharing/lib/helper.php

@@ -141,7 +141,7 @@ public static function authenticate($linkItem, $password = null) {
 	public static function getSharesFromItem($target) {
 		$result = array();
 		$owner = \OC\Files\Filesystem::getOwner($target);
-		\OC\Files\Filesystem::initMountPoints($owner);
+		\OC::$server->setupFilesystem($owner);
 		$info = \OC\Files\Filesystem::getFileInfo($target);
 		$ownerView = new \OC\Files\View('/'.$owner.'/files');
 		if ( $owner != \OCP\User::getUser() ) {
@@ -179,7 +179,7 @@ public static function getSharesFromItem($target) {
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
-		\OC\Files\Filesystem::initMountPoints($uid);
+		\OC::$server->setupFilesystem($uid);
 		if ( $uid != \OCP\User::getUser() ) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
 			$ownerView = new \OC\Files\View('/'.$uid.'/files');

apps/files_sharing/lib/share/file.php

@@ -74,7 +74,7 @@ public function generateTarget($filePath, $shareWith, $exclude = null) {
 			return $target;
 		}
 
-		\OC\Files\Filesystem::initMountPoints($shareWith);
+		\OC::$server->setupFilesystem($shareWith);
 		$view = new \OC\Files\View('/' . $shareWith . '/files');
 
 		if (!$view->is_dir($shareFolder)) {

apps/files_sharing/lib/sharedstorage.php

@@ -86,7 +86,7 @@ public function getSourcePath($target) {
 		$source = $this->getFile($target);
 		if ($source) {
 			if (!isset($source['fullPath'])) {
-				\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
+				\OC::$server->setupFilesystem($source['fileOwner']);
 				$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
 				if (is_array($mount) && !empty($mount)) {
 					$this->files[$target]['fullPath'] = $mount[key($mount)]->getMountPoint() . $source['path'];

apps/files_sharing/lib/updater.php

@@ -35,7 +35,7 @@ static private function correctUsersFolder($user, $path) {
 		// $path points to the mount point which is a virtual folder, so we start with
 		// the parent
 		$path = '/files' . dirname($path);
-		\OC\Files\Filesystem::initMountPoints($user);
+		\OC::$server->setupFilesystem($user);
 		$view = new \OC\Files\View('/' . $user);
 		if ($view->file_exists($path)) {
 			while ($path !== dirname($path)) {

apps/files_trashbin/lib/trashbin.php

@@ -32,7 +32,7 @@ class Trashbin {
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
-		\OC\Files\Filesystem::initMountPoints($uid);
+		\OC::$server->setupFilesystem($uid);
 		if ($uid != \OCP\User::getUser()) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
 			$ownerView = new \OC\Files\View('/' . $uid . '/files');

apps/files_versions/lib/versions.php

@@ -43,7 +43,7 @@ class Storage {
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
-		\OC\Files\Filesystem::initMountPoints($uid);
+		\OC::$server->setupFilesystem($uid);
 		if ( $uid != \OCP\User::getUser() ) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
 			$ownerView = new \OC\Files\View('/'.$uid.'/files');

lib/private/cache/file.php

@@ -21,7 +21,7 @@ protected function getStorage() {
 			return $this->storage;
 		}
 		if(\OC_User::isLoggedIn()) {
-			\OC\Files\Filesystem::initMountPoints(\OC_User::getUser());
+			\OC::$server->setupFilesystem(\OC_User::getUser());
 			$this->storage = new \OC\Files\View('/' . \OC_User::getUser() . '/cache');
 			return $this->storage;
 		}else{