nextcloud / server

apps/files_external/lib/Lib/Storage/Swift.php

Indentation +604 added lines, -604 removed lines

@@ -48,609 +48,609 @@
 
 class Swift extends \OC\Files\Storage\Common {
 
-	/**
-	 * @var \OpenCloud\ObjectStore\Service
-	 */
-	private $connection;
-	/**
-	 * @var \OpenCloud\ObjectStore\Resource\Container
-	 */
-	private $container;
-	/**
-	 * @var \OpenCloud\OpenStack
-	 */
-	private $anchor;
-	/**
-	 * @var string
-	 */
-	private $bucket;
-	/**
-	 * Connection parameters
-	 *
-	 * @var array
-	 */
-	private $params;
-
-	/** @var string  */
-	private $id;
-
-	/**
-	 * @var array
-	 */
-	private static $tmpFiles = array();
-
-	/**
-	 * Key value cache mapping path to data object. Maps path to
-	 * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
-	 * paths and path to false for not existing paths.
-	 * @var \OCP\ICache
-	 */
-	private $objectCache;
-
-	/**
-	 * @param string $path
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		$path = str_replace('#', '%23', $path);
-
-		return $path;
-	}
-
-	const SUBCONTAINER_FILE = '.subcontainers';
-
-	/**
-	 * translate directory path to container name
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-
-	/**
-	 * Fetches an object from the API.
-	 * If the object is cached already or a
-	 * failed "doesn't exist" response was cached,
-	 * that one will be returned.
-	 *
-	 * @param string $path
-	 * @return \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject|bool object
-	 * or false if the object did not exist
-	 */
-	private function fetchObject($path) {
-		if ($this->objectCache->hasKey($path)) {
-			// might be "false" if object did not exist from last check
-			return $this->objectCache->get($path);
-		}
-		try {
-			$object = $this->getContainer()->getPartialObject($path);
-			$this->objectCache->set($path, $object);
-			return $object;
-		} catch (ClientErrorResponseException $e) {
-			// this exception happens when the object does not exist, which
-			// is expected in most cases
-			$this->objectCache->set($path, false);
-			return false;
-		} catch (ClientErrorResponseException $e) {
-			// Expected response is "404 Not Found", so only log if it isn't
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Returns whether the given path exists.
-	 *
-	 * @param string $path
-	 *
-	 * @return bool true if the object exist, false otherwise
-	 */
-	private function doesObjectExist($path) {
-		return $this->fetchObject($path) !== false;
-	}
-
-	public function __construct($params) {
-		if ((empty($params['key']) and empty($params['password']))
-			or empty($params['user']) or empty($params['bucket'])
-			or empty($params['region'])
-		) {
-			throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
-		}
-
-		$this->id = 'swift::' . $params['user'] . md5($params['bucket']);
-
-		$bucketUrl = Url::factory($params['bucket']);
-		if ($bucketUrl->isAbsolute()) {
-			$this->bucket = end(($bucketUrl->getPathSegments()));
-			$params['endpoint_url'] = $bucketUrl->addPath('..')->normalizePath();
-		} else {
-			$this->bucket = $params['bucket'];
-		}
-
-		if (empty($params['url'])) {
-			$params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
-		}
-
-		if (empty($params['service_name'])) {
-			$params['service_name'] = 'cloudFiles';
-		}
-
-		$this->params = $params;
-		// FIXME: private class...
-		$this->objectCache = new \OC\Cache\CappedMemoryCache();
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		try {
-			$customHeaders = array('content-type' => 'httpd/unix-directory');
-			$metadataHeaders = DataObject::stockHeaders(array());
-			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->getContainer()->uploadObject($path, '', $allHeaders);
-			// invalidate so that the next access gets the real object
-			// with all properties
-			$this->objectCache->remove($path);
-		} catch (Exceptions\CreateUpdateError $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		return $this->doesObjectExist($path);
-	}
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if (!$this->is_dir($path) || !$this->isDeletable($path)) {
-			return false;
-		}
-
-		$dh = $this->opendir($path);
-		while ($file = readdir($dh)) {
-			if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-				continue;
-			}
-
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
-			} else {
-				$this->unlink($path . '/' . $file);
-			}
-		}
-
-		try {
-			$this->getContainer()->dataObject()->setName($path . '/')->delete();
-			$this->objectCache->remove($path . '/');
-		} catch (Exceptions\DeleteError $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
-
-		$path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
-
-		try {
-			$files = array();
-			/** @var OpenCloud\Common\Collection $objects */
-			$objects = $this->getContainer()->objectList(array(
-				'prefix' => $path,
-				'delimiter' => '/'
-			));
-
-			/** @var OpenCloud\ObjectStore\Resource\DataObject $object */
-			foreach ($objects as $object) {
-				$file = basename($object->getName());
-				if ($file !== basename($path)) {
-					$files[] = $file;
-				}
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else if ($this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		try {
-			/** @var DataObject $object */
-			$object = $this->fetchObject($path);
-			if (!$object) {
-				return false;
-			}
-		} catch (ClientErrorResponseException $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		$dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->getLastModified());
-		if ($dateTime !== false) {
-			$mtime = $dateTime->getTimestamp();
-		} else {
-			$mtime = null;
-		}
-		$objectMetadata = $object->getMetadata();
-		$metaTimestamp = $objectMetadata->getProperty('timestamp');
-		if (isset($metaTimestamp)) {
-			$mtime = $metaTimestamp;
-		}
-
-		if (!empty($mtime)) {
-			$mtime = floor($mtime);
-		}
-
-		$stat = array();
-		$stat['size'] = (int)$object->getContentLength();
-		$stat['mtime'] = $mtime;
-		$stat['atime'] = time();
-		return $stat;
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->doesObjectExist($path)) {
-			return 'file';
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		if ($this->doesObjectExist($path)) {
-			return 'dir';
-		}
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->getContainer()->dataObject()->setName($path)->delete();
-			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
-		} catch (ClientErrorResponseException $e) {
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					$c = $this->getContainer();
-					$streamFactory = new \Guzzle\Stream\PhpStreamRequestFactory();
-					$streamInterface = $streamFactory->fromRequest(
-						$c->getClient()
-							->get($c->getUrl($path)));
-					$streamInterface->rewind();
-					$stream = $streamInterface->getStream();
-					stream_context_set_option($stream, 'swift','content', $streamInterface);
-					if(!strrpos($streamInterface
-						->getMetaData('wrapper_data')[0], '404 Not Found')) {
-						return $stream;
-					}
-					return false;
-				} catch (\Guzzle\Http\Exception\BadResponseException $e) {
-					\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				// Fetch existing file if required
-				if ($mode[0] !== 'w' && $this->file_exists($path)) {
-					if ($mode[0] === 'x') {
-						// File cannot already exist
-						return false;
-					}
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-					// Seek to end if required
-					if ($mode[0] === 'a') {
-						fseek($tmpFile, 0, SEEK_END);
-					}
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = array('timestamp' => $mtime);
-		if ($this->file_exists($path)) {
-			if ($this->is_dir($path) && $path != '.') {
-				$path .= '/';
-			}
-
-			$object = $this->fetchObject($path);
-			if ($object->saveMetadata($metadata)) {
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path);
-			}
-			return true;
-		} else {
-			$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-			$customHeaders = array('content-type' => $mimeType);
-			$metadataHeaders = DataObject::stockHeaders($metadata);
-			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->getContainer()->uploadObject($path, '', $allHeaders);
-			// invalidate target object to force repopulation on fetch
-			$this->objectCache->remove($path);
-			return true;
-		}
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-		if ($fileType === 'file') {
-
-			// make way
-			$this->unlink($path2);
-
-			try {
-				$source = $this->fetchObject($path1);
-				$source->copy($this->bucket . '/' . $path2);
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (ClientErrorResponseException $e) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-
-		} else if ($fileType === 'dir') {
-
-			// make way
-			$this->unlink($path2);
-
-			try {
-				$source = $this->fetchObject($path1 . '/');
-				$source->copy($this->bucket . '/' . $path2 . '/');
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (ClientErrorResponseException $e) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			while ($file = readdir($dh)) {
-				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-					continue;
-				}
-
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
-				$this->copy($source, $target);
-			}
-
-		} else {
-			//file does not exist
-			return false;
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-
-		if ($fileType === 'dir' || $fileType === 'file') {
-			// copy
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			// cleanup
-			if ($this->unlink($path1) === false) {
-				$this->unlink($path2);
-				return false;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns the connection
-	 *
-	 * @return OpenCloud\ObjectStore\Service connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	public function getConnection() {
-		if (!is_null($this->connection)) {
-			return $this->connection;
-		}
-
-		$settings = array(
-			'username' => $this->params['user'],
-		);
-
-		if (!empty($this->params['password'])) {
-			$settings['password'] = $this->params['password'];
-		} else if (!empty($this->params['key'])) {
-			$settings['apiKey'] = $this->params['key'];
-		}
-
-		if (!empty($this->params['tenant'])) {
-			$settings['tenantName'] = $this->params['tenant'];
-		}
-
-		if (!empty($this->params['timeout'])) {
-			$settings['timeout'] = $this->params['timeout'];
-		}
-
-		if (isset($settings['apiKey'])) {
-			$this->anchor = new Rackspace($this->params['url'], $settings);
-		} else {
-			$this->anchor = new OpenStack($this->params['url'], $settings);
-		}
-
-		$connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
-
-		if (!empty($this->params['endpoint_url'])) {
-			$endpoint = $connection->getEndpoint();
-			$endpoint->setPublicUrl($this->params['endpoint_url']);
-			$endpoint->setPrivateUrl($this->params['endpoint_url']);
-			$connection->setEndpoint($endpoint);
-		}
-
-		$this->connection = $connection;
-
-		return $this->connection;
-	}
-
-	/**
-	 * Returns the initialized object store container.
-	 *
-	 * @return OpenCloud\ObjectStore\Resource\Container
-	 */
-	public function getContainer() {
-		if (!is_null($this->container)) {
-			return $this->container;
-		}
-
-		try {
-			$this->container = $this->getConnection()->getContainer($this->bucket);
-		} catch (ClientErrorResponseException $e) {
-			$this->container = $this->getConnection()->createContainer($this->bucket);
-		}
-
-		if (!$this->file_exists('.')) {
-			$this->mkdir('.');
-		}
-
-		return $this->container;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		$fileData = fopen($tmpFile, 'r');
-		$this->getContainer()->uploadObject($path, $fileData);
-		// invalidate target object to force repopulation on fetch
-		$this->objectCache->remove(self::$tmpFiles[$tmpFile]);
-		unlink($tmpFile);
-	}
-
-	public function hasUpdated($path, $time) {
-		if ($this->is_file($path)) {
-			return parent::hasUpdated($path, $time);
-		}
-		$path = $this->normalizePath($path);
-		$dh = $this->opendir($path);
-		$content = array();
-		while (($file = readdir($dh)) !== false) {
-			$content[] = $file;
-		}
-		if ($path === '.') {
-			$path = '';
-		}
-		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
-			return $content['name'];
-		}, $cachedContent);
-		sort($cachedNames);
-		sort($content);
-		return $cachedNames != $content;
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * @var \OpenCloud\ObjectStore\Service
+     */
+    private $connection;
+    /**
+     * @var \OpenCloud\ObjectStore\Resource\Container
+     */
+    private $container;
+    /**
+     * @var \OpenCloud\OpenStack
+     */
+    private $anchor;
+    /**
+     * @var string
+     */
+    private $bucket;
+    /**
+     * Connection parameters
+     *
+     * @var array
+     */
+    private $params;
+
+    /** @var string  */
+    private $id;
+
+    /**
+     * @var array
+     */
+    private static $tmpFiles = array();
+
+    /**
+     * Key value cache mapping path to data object. Maps path to
+     * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
+     * paths and path to false for not existing paths.
+     * @var \OCP\ICache
+     */
+    private $objectCache;
+
+    /**
+     * @param string $path
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        $path = str_replace('#', '%23', $path);
+
+        return $path;
+    }
+
+    const SUBCONTAINER_FILE = '.subcontainers';
+
+    /**
+     * translate directory path to container name
+     *
+     * @param string $path
+     * @return string
+     */
+
+    /**
+     * Fetches an object from the API.
+     * If the object is cached already or a
+     * failed "doesn't exist" response was cached,
+     * that one will be returned.
+     *
+     * @param string $path
+     * @return \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject|bool object
+     * or false if the object did not exist
+     */
+    private function fetchObject($path) {
+        if ($this->objectCache->hasKey($path)) {
+            // might be "false" if object did not exist from last check
+            return $this->objectCache->get($path);
+        }
+        try {
+            $object = $this->getContainer()->getPartialObject($path);
+            $this->objectCache->set($path, $object);
+            return $object;
+        } catch (ClientErrorResponseException $e) {
+            // this exception happens when the object does not exist, which
+            // is expected in most cases
+            $this->objectCache->set($path, false);
+            return false;
+        } catch (ClientErrorResponseException $e) {
+            // Expected response is "404 Not Found", so only log if it isn't
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Returns whether the given path exists.
+     *
+     * @param string $path
+     *
+     * @return bool true if the object exist, false otherwise
+     */
+    private function doesObjectExist($path) {
+        return $this->fetchObject($path) !== false;
+    }
+
+    public function __construct($params) {
+        if ((empty($params['key']) and empty($params['password']))
+            or empty($params['user']) or empty($params['bucket'])
+            or empty($params['region'])
+        ) {
+            throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
+        }
+
+        $this->id = 'swift::' . $params['user'] . md5($params['bucket']);
+
+        $bucketUrl = Url::factory($params['bucket']);
+        if ($bucketUrl->isAbsolute()) {
+            $this->bucket = end(($bucketUrl->getPathSegments()));
+            $params['endpoint_url'] = $bucketUrl->addPath('..')->normalizePath();
+        } else {
+            $this->bucket = $params['bucket'];
+        }
+
+        if (empty($params['url'])) {
+            $params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
+        }
+
+        if (empty($params['service_name'])) {
+            $params['service_name'] = 'cloudFiles';
+        }
+
+        $this->params = $params;
+        // FIXME: private class...
+        $this->objectCache = new \OC\Cache\CappedMemoryCache();
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        try {
+            $customHeaders = array('content-type' => 'httpd/unix-directory');
+            $metadataHeaders = DataObject::stockHeaders(array());
+            $allHeaders = $customHeaders + $metadataHeaders;
+            $this->getContainer()->uploadObject($path, '', $allHeaders);
+            // invalidate so that the next access gets the real object
+            // with all properties
+            $this->objectCache->remove($path);
+        } catch (Exceptions\CreateUpdateError $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        return $this->doesObjectExist($path);
+    }
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if (!$this->is_dir($path) || !$this->isDeletable($path)) {
+            return false;
+        }
+
+        $dh = $this->opendir($path);
+        while ($file = readdir($dh)) {
+            if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                continue;
+            }
+
+            if ($this->is_dir($path . '/' . $file)) {
+                $this->rmdir($path . '/' . $file);
+            } else {
+                $this->unlink($path . '/' . $file);
+            }
+        }
+
+        try {
+            $this->getContainer()->dataObject()->setName($path . '/')->delete();
+            $this->objectCache->remove($path . '/');
+        } catch (Exceptions\DeleteError $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
+
+        $path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
+
+        try {
+            $files = array();
+            /** @var OpenCloud\Common\Collection $objects */
+            $objects = $this->getContainer()->objectList(array(
+                'prefix' => $path,
+                'delimiter' => '/'
+            ));
+
+            /** @var OpenCloud\ObjectStore\Resource\DataObject $object */
+            foreach ($objects as $object) {
+                $file = basename($object->getName());
+                if ($file !== basename($path)) {
+                    $files[] = $file;
+                }
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else if ($this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        try {
+            /** @var DataObject $object */
+            $object = $this->fetchObject($path);
+            if (!$object) {
+                return false;
+            }
+        } catch (ClientErrorResponseException $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        $dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->getLastModified());
+        if ($dateTime !== false) {
+            $mtime = $dateTime->getTimestamp();
+        } else {
+            $mtime = null;
+        }
+        $objectMetadata = $object->getMetadata();
+        $metaTimestamp = $objectMetadata->getProperty('timestamp');
+        if (isset($metaTimestamp)) {
+            $mtime = $metaTimestamp;
+        }
+
+        if (!empty($mtime)) {
+            $mtime = floor($mtime);
+        }
+
+        $stat = array();
+        $stat['size'] = (int)$object->getContentLength();
+        $stat['mtime'] = $mtime;
+        $stat['atime'] = time();
+        return $stat;
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->doesObjectExist($path)) {
+            return 'file';
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        if ($this->doesObjectExist($path)) {
+            return 'dir';
+        }
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->getContainer()->dataObject()->setName($path)->delete();
+            $this->objectCache->remove($path);
+            $this->objectCache->remove($path . '/');
+        } catch (ClientErrorResponseException $e) {
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    $c = $this->getContainer();
+                    $streamFactory = new \Guzzle\Stream\PhpStreamRequestFactory();
+                    $streamInterface = $streamFactory->fromRequest(
+                        $c->getClient()
+                            ->get($c->getUrl($path)));
+                    $streamInterface->rewind();
+                    $stream = $streamInterface->getStream();
+                    stream_context_set_option($stream, 'swift','content', $streamInterface);
+                    if(!strrpos($streamInterface
+                        ->getMetaData('wrapper_data')[0], '404 Not Found')) {
+                        return $stream;
+                    }
+                    return false;
+                } catch (\Guzzle\Http\Exception\BadResponseException $e) {
+                    \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                // Fetch existing file if required
+                if ($mode[0] !== 'w' && $this->file_exists($path)) {
+                    if ($mode[0] === 'x') {
+                        // File cannot already exist
+                        return false;
+                    }
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                    // Seek to end if required
+                    if ($mode[0] === 'a') {
+                        fseek($tmpFile, 0, SEEK_END);
+                    }
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = array('timestamp' => $mtime);
+        if ($this->file_exists($path)) {
+            if ($this->is_dir($path) && $path != '.') {
+                $path .= '/';
+            }
+
+            $object = $this->fetchObject($path);
+            if ($object->saveMetadata($metadata)) {
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path);
+            }
+            return true;
+        } else {
+            $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+            $customHeaders = array('content-type' => $mimeType);
+            $metadataHeaders = DataObject::stockHeaders($metadata);
+            $allHeaders = $customHeaders + $metadataHeaders;
+            $this->getContainer()->uploadObject($path, '', $allHeaders);
+            // invalidate target object to force repopulation on fetch
+            $this->objectCache->remove($path);
+            return true;
+        }
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+        if ($fileType === 'file') {
+
+            // make way
+            $this->unlink($path2);
+
+            try {
+                $source = $this->fetchObject($path1);
+                $source->copy($this->bucket . '/' . $path2);
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (ClientErrorResponseException $e) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+
+        } else if ($fileType === 'dir') {
+
+            // make way
+            $this->unlink($path2);
+
+            try {
+                $source = $this->fetchObject($path1 . '/');
+                $source->copy($this->bucket . '/' . $path2 . '/');
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (ClientErrorResponseException $e) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            while ($file = readdir($dh)) {
+                if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                    continue;
+                }
+
+                $source = $path1 . '/' . $file;
+                $target = $path2 . '/' . $file;
+                $this->copy($source, $target);
+            }
+
+        } else {
+            //file does not exist
+            return false;
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+
+        if ($fileType === 'dir' || $fileType === 'file') {
+            // copy
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            // cleanup
+            if ($this->unlink($path1) === false) {
+                $this->unlink($path2);
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Returns the connection
+     *
+     * @return OpenCloud\ObjectStore\Service connected client
+     * @throws \Exception if connection could not be made
+     */
+    public function getConnection() {
+        if (!is_null($this->connection)) {
+            return $this->connection;
+        }
+
+        $settings = array(
+            'username' => $this->params['user'],
+        );
+
+        if (!empty($this->params['password'])) {
+            $settings['password'] = $this->params['password'];
+        } else if (!empty($this->params['key'])) {
+            $settings['apiKey'] = $this->params['key'];
+        }
+
+        if (!empty($this->params['tenant'])) {
+            $settings['tenantName'] = $this->params['tenant'];
+        }
+
+        if (!empty($this->params['timeout'])) {
+            $settings['timeout'] = $this->params['timeout'];
+        }
+
+        if (isset($settings['apiKey'])) {
+            $this->anchor = new Rackspace($this->params['url'], $settings);
+        } else {
+            $this->anchor = new OpenStack($this->params['url'], $settings);
+        }
+
+        $connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
+
+        if (!empty($this->params['endpoint_url'])) {
+            $endpoint = $connection->getEndpoint();
+            $endpoint->setPublicUrl($this->params['endpoint_url']);
+            $endpoint->setPrivateUrl($this->params['endpoint_url']);
+            $connection->setEndpoint($endpoint);
+        }
+
+        $this->connection = $connection;
+
+        return $this->connection;
+    }
+
+    /**
+     * Returns the initialized object store container.
+     *
+     * @return OpenCloud\ObjectStore\Resource\Container
+     */
+    public function getContainer() {
+        if (!is_null($this->container)) {
+            return $this->container;
+        }
+
+        try {
+            $this->container = $this->getConnection()->getContainer($this->bucket);
+        } catch (ClientErrorResponseException $e) {
+            $this->container = $this->getConnection()->createContainer($this->bucket);
+        }
+
+        if (!$this->file_exists('.')) {
+            $this->mkdir('.');
+        }
+
+        return $this->container;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        $fileData = fopen($tmpFile, 'r');
+        $this->getContainer()->uploadObject($path, $fileData);
+        // invalidate target object to force repopulation on fetch
+        $this->objectCache->remove(self::$tmpFiles[$tmpFile]);
+        unlink($tmpFile);
+    }
+
+    public function hasUpdated($path, $time) {
+        if ($this->is_file($path)) {
+            return parent::hasUpdated($path, $time);
+        }
+        $path = $this->normalizePath($path);
+        $dh = $this->opendir($path);
+        $content = array();
+        while (($file = readdir($dh)) !== false) {
+            $content[] = $file;
+        }
+        if ($path === '.') {
+            $path = '';
+        }
+        $cachedContent = $this->getCache()->getFolderContents($path);
+        $cachedNames = array_map(function ($content) {
+            return $content['name'];
+        }, $cachedContent);
+        sort($cachedNames);
+        sort($content);
+        return $cachedNames != $content;
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/Storage/OwnCloud.php

Indentation +35 added lines, -35 removed lines

@@ -32,44 +32,44 @@
  *
  */
 class OwnCloud extends \OC\Files\Storage\DAV{
-	const OC_URL_SUFFIX = 'remote.php/webdav';
+    const OC_URL_SUFFIX = 'remote.php/webdav';
 
-	public function __construct($params) {
-		// extract context path from host if specified
-		// (owncloud install path on host)
-		$host = $params['host'];
-		// strip protocol
-		if (substr($host, 0, 8) == "https://") {
-			$host = substr($host, 8);
-			$params['secure'] = true;
-		} else if (substr($host, 0, 7) == "http://") {
-			$host = substr($host, 7);
-			$params['secure'] = false;
-		}
-		$contextPath = '';
-		$hostSlashPos = strpos($host, '/');
-		if ($hostSlashPos !== false){
-			$contextPath = substr($host, $hostSlashPos);
-			$host = substr($host, 0, $hostSlashPos);
-		}
+    public function __construct($params) {
+        // extract context path from host if specified
+        // (owncloud install path on host)
+        $host = $params['host'];
+        // strip protocol
+        if (substr($host, 0, 8) == "https://") {
+            $host = substr($host, 8);
+            $params['secure'] = true;
+        } else if (substr($host, 0, 7) == "http://") {
+            $host = substr($host, 7);
+            $params['secure'] = false;
+        }
+        $contextPath = '';
+        $hostSlashPos = strpos($host, '/');
+        if ($hostSlashPos !== false){
+            $contextPath = substr($host, $hostSlashPos);
+            $host = substr($host, 0, $hostSlashPos);
+        }
 
-		if (substr($contextPath, -1) !== '/'){
-			$contextPath .= '/';
-		}
+        if (substr($contextPath, -1) !== '/'){
+            $contextPath .= '/';
+        }
 
-		if (isset($params['root'])){
-			$root = $params['root'];
-			if (substr($root, 0, 1) !== '/'){
-				$root = '/' . $root;
-			}
-		}
-		else{
-			$root = '/';
-		}
+        if (isset($params['root'])){
+            $root = $params['root'];
+            if (substr($root, 0, 1) !== '/'){
+                $root = '/' . $root;
+            }
+        }
+        else{
+            $root = '/';
+        }
 
-		$params['host'] = $host;
-		$params['root'] = $contextPath . self::OC_URL_SUFFIX . $root;
+        $params['host'] = $host;
+        $params['root'] = $contextPath . self::OC_URL_SUFFIX . $root;
 
-		parent::__construct($params);
-	}
+        parent::__construct($params);
+    }
 }

apps/files_external/lib/Lib/Storage/AmazonS3.php

Indentation +494 added lines, -494 removed lines

@@ -37,7 +37,7 @@ 
 namespace OCA\Files_External\Lib\Storage;
 
 set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+    \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
 require_once 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
@@ -47,498 +47,498 @@ 
 use OC\Files\ObjectStore\S3ConnectionTrait;
 
 class AmazonS3 extends \OC\Files\Storage\Common {
-	use S3ConnectionTrait;
-
-	/**
-	 * @var array
-	 */
-	private static $tmpFiles = array();
-
-	/**
-	 * @var int in seconds
-	 */
-	private $rescanDelay = 10;
-
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-		$this->parseParams($parameters);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string correctly encoded path
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		return $path;
-	}
-
-	private function isRoot($path) {
-		return $path === '.';
-	}
-
-	private function cleanKey($path) {
-		if ($this->isRoot($path)) {
-			return '/';
-		}
-		return $path;
-	}
-
-	/**
-	 * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
-	 * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
-	 *
-	 * @param array $params
-	 */
-	public function updateLegacyId (array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
-
-		// find by old id or bucket
-		$stmt = \OC::$server->getDatabaseConnection()->prepare(
-			'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
-		);
-		$stmt->execute(array($oldId, $this->id));
-		while ($row = $stmt->fetch()) {
-			$storages[$row['id']] = $row['numeric_id'];
-		}
-
-		if (isset($storages[$this->id]) && isset($storages[$oldId])) {
-			// if both ids exist, delete the old storage and corresponding filecache entries
-			\OC\Files\Cache\Storage::remove($oldId);
-		} else if (isset($storages[$oldId])) {
-			// if only the old id exists do an update
-			$stmt = \OC::$server->getDatabaseConnection()->prepare(
-				'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
-			);
-			$stmt->execute(array($this->id, $oldId));
-		}
-		// only the bucket based id may exist, do nothing
-	}
-
-	/**
-	 * Remove a file or folder
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function remove($path) {
-		// remember fileType to reduce http calls
-		$fileType = $this->filetype($path);
-		if ($fileType === 'dir') {
-			return $this->rmdir($path);
-		} else if ($fileType === 'file') {
-			return $this->unlink($path);
-		} else {
-			return false;
-		}
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
-				'Body' => '',
-				'ContentType' => 'httpd/unix-directory'
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		return $this->filetype($path) !== false;
-	}
-
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return $this->clearBucket();
-		}
-
-		if (!$this->file_exists($path)) {
-			return false;
-		}
-
-		return $this->batchDelete($path);
-	}
-
-	protected function clearBucket() {
-		try {
-			$this->getConnection()->clearBucket($this->bucket);
-			return true;
-			// clearBucket() is not working with Ceph, so if it fails we try the slower approach
-		} catch (\Exception $e) {
-			return $this->batchDelete();
-		}
-		return false;
-	}
-
-	private function batchDelete ($path = null) {
-		$params = array(
-			'Bucket' => $this->bucket
-		);
-		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
-		}
-		try {
-			// Since there are no real directories on S3, we need
-			// to delete all objects prefixed with the path.
-			do {
-				// instead of the iterator, manually loop over the list ...
-				$objects = $this->getConnection()->listObjects($params);
-				// ... so we can delete the files in batches
-				$this->getConnection()->deleteObjects(array(
-					'Bucket' => $this->bucket,
-					'Objects' => $objects['Contents']
-				));
-				$this->testTimeout();
-				// we reached the end when the list is no longer truncated
-			} while ($objects['IsTruncated']);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
-
-		try {
-			$files = array();
-			$result = $this->getConnection()->getIterator('ListObjects', array(
-				'Bucket' => $this->bucket,
-				'Delimiter' => '/',
-				'Prefix' => $path
-			), array('return_prefixes' => true));
-
-			foreach ($result as $object) {
-				if (isset($object['Key']) && $object['Key'] === $path) {
-					// it's the directory itself, skip
-					continue;
-				}
-				$file = basename(
-					isset($object['Key']) ? $object['Key'] : $object['Prefix']
-				);
-				$files[] = $file;
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$stat = array();
-			if ($this->is_dir($path)) {
-				//folders don't really exist
-				$stat['size'] = -1; //unknown
-				$stat['mtime'] = time() - $this->rescanDelay * 1000;
-			} else {
-				$result = $this->getConnection()->headObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path
-				));
-
-				$stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
-				if ($result['Metadata']['lastmodified']) {
-					$stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
-				} else {
-					$stat['mtime'] = strtotime($result['LastModified']);
-				}
-			}
-			$stat['atime'] = time();
-
-			return $stat;
-		} catch(S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return 'dir';
-		}
-
-		try {
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
-				return 'file';
-			}
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
-				return 'dir';
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return false;
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->getConnection()->deleteObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$tmpFile = \OCP\Files::tmpFile();
-				self::$tmpFiles[$tmpFile] = $path;
-
-				try {
-					$this->getConnection()->getObject(array(
-						'Bucket' => $this->bucket,
-						'Key' => $path,
-						'SaveAs' => $tmpFile
-					));
-				} catch (S3Exception $e) {
-					\OCP\Util::logException('files_external', $e);
-					return false;
-				}
-
-				return fopen($tmpFile, 'r');
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-		return false;
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-
-		$metadata = array();
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = [
-			'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
-		];
-
-		$fileType = $this->filetype($path);
-		try {
-			if ($fileType !== false) {
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
-					$path .= '/';
-				}
-				$this->getConnection()->copyObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			} else {
-				$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-				$this->getConnection()->putObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'Body' => '',
-					'ContentType' => $mimeType,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-		} else {
-			$this->remove($path2);
-
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-						continue;
-					}
-
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
-					$this->copy($source, $target);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->unlink($path1) === false) {
-				$this->unlink($path2);
-				return false;
-			}
-		} else {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->rmdir($path1) === false) {
-				$this->rmdir($path2);
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public function test() {
-		$test = $this->getConnection()->getBucketAcl(array(
-			'Bucket' => $this->bucket,
-		));
-		if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
-			return true;
-		}
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $this->cleanKey($path),
-				'SourceFile' => $tmpFile,
-				'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
-				'ContentLength' => filesize($tmpFile)
-			));
-			$this->testTimeout();
-
-			unlink($tmpFile);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    use S3ConnectionTrait;
+
+    /**
+     * @var array
+     */
+    private static $tmpFiles = array();
+
+    /**
+     * @var int in seconds
+     */
+    private $rescanDelay = 10;
+
+    public function __construct($parameters) {
+        parent::__construct($parameters);
+        $this->parseParams($parameters);
+    }
+
+    /**
+     * @param string $path
+     * @return string correctly encoded path
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        return $path;
+    }
+
+    private function isRoot($path) {
+        return $path === '.';
+    }
+
+    private function cleanKey($path) {
+        if ($this->isRoot($path)) {
+            return '/';
+        }
+        return $path;
+    }
+
+    /**
+     * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
+     * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
+     *
+     * @param array $params
+     */
+    public function updateLegacyId (array $params) {
+        $oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+
+        // find by old id or bucket
+        $stmt = \OC::$server->getDatabaseConnection()->prepare(
+            'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
+        );
+        $stmt->execute(array($oldId, $this->id));
+        while ($row = $stmt->fetch()) {
+            $storages[$row['id']] = $row['numeric_id'];
+        }
+
+        if (isset($storages[$this->id]) && isset($storages[$oldId])) {
+            // if both ids exist, delete the old storage and corresponding filecache entries
+            \OC\Files\Cache\Storage::remove($oldId);
+        } else if (isset($storages[$oldId])) {
+            // if only the old id exists do an update
+            $stmt = \OC::$server->getDatabaseConnection()->prepare(
+                'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
+            );
+            $stmt->execute(array($this->id, $oldId));
+        }
+        // only the bucket based id may exist, do nothing
+    }
+
+    /**
+     * Remove a file or folder
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function remove($path) {
+        // remember fileType to reduce http calls
+        $fileType = $this->filetype($path);
+        if ($fileType === 'dir') {
+            return $this->rmdir($path);
+        } else if ($fileType === 'file') {
+            return $this->unlink($path);
+        } else {
+            return false;
+        }
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path . '/',
+                'Body' => '',
+                'ContentType' => 'httpd/unix-directory'
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        return $this->filetype($path) !== false;
+    }
+
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return $this->clearBucket();
+        }
+
+        if (!$this->file_exists($path)) {
+            return false;
+        }
+
+        return $this->batchDelete($path);
+    }
+
+    protected function clearBucket() {
+        try {
+            $this->getConnection()->clearBucket($this->bucket);
+            return true;
+            // clearBucket() is not working with Ceph, so if it fails we try the slower approach
+        } catch (\Exception $e) {
+            return $this->batchDelete();
+        }
+        return false;
+    }
+
+    private function batchDelete ($path = null) {
+        $params = array(
+            'Bucket' => $this->bucket
+        );
+        if ($path !== null) {
+            $params['Prefix'] = $path . '/';
+        }
+        try {
+            // Since there are no real directories on S3, we need
+            // to delete all objects prefixed with the path.
+            do {
+                // instead of the iterator, manually loop over the list ...
+                $objects = $this->getConnection()->listObjects($params);
+                // ... so we can delete the files in batches
+                $this->getConnection()->deleteObjects(array(
+                    'Bucket' => $this->bucket,
+                    'Objects' => $objects['Contents']
+                ));
+                $this->testTimeout();
+                // we reached the end when the list is no longer truncated
+            } while ($objects['IsTruncated']);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
+
+        try {
+            $files = array();
+            $result = $this->getConnection()->getIterator('ListObjects', array(
+                'Bucket' => $this->bucket,
+                'Delimiter' => '/',
+                'Prefix' => $path
+            ), array('return_prefixes' => true));
+
+            foreach ($result as $object) {
+                if (isset($object['Key']) && $object['Key'] === $path) {
+                    // it's the directory itself, skip
+                    continue;
+                }
+                $file = basename(
+                    isset($object['Key']) ? $object['Key'] : $object['Prefix']
+                );
+                $files[] = $file;
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $stat = array();
+            if ($this->is_dir($path)) {
+                //folders don't really exist
+                $stat['size'] = -1; //unknown
+                $stat['mtime'] = time() - $this->rescanDelay * 1000;
+            } else {
+                $result = $this->getConnection()->headObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path
+                ));
+
+                $stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
+                if ($result['Metadata']['lastmodified']) {
+                    $stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
+                } else {
+                    $stat['mtime'] = strtotime($result['LastModified']);
+                }
+            }
+            $stat['atime'] = time();
+
+            return $stat;
+        } catch(S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return 'dir';
+        }
+
+        try {
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
+                return 'file';
+            }
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
+                return 'dir';
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return false;
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->getConnection()->deleteObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $tmpFile = \OCP\Files::tmpFile();
+                self::$tmpFiles[$tmpFile] = $path;
+
+                try {
+                    $this->getConnection()->getObject(array(
+                        'Bucket' => $this->bucket,
+                        'Key' => $path,
+                        'SaveAs' => $tmpFile
+                    ));
+                } catch (S3Exception $e) {
+                    \OCP\Util::logException('files_external', $e);
+                    return false;
+                }
+
+                return fopen($tmpFile, 'r');
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+        return false;
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+
+        $metadata = array();
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = [
+            'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
+        ];
+
+        $fileType = $this->filetype($path);
+        try {
+            if ($fileType !== false) {
+                if ($fileType === 'dir' && ! $this->isRoot($path)) {
+                    $path .= '/';
+                }
+                $this->getConnection()->copyObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'CopySource' => $this->bucket . '/' . $path,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            } else {
+                $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+                $this->getConnection()->putObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'Body' => '',
+                    'ContentType' => $mimeType,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path2),
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+        } else {
+            $this->remove($path2);
+
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path2 . '/',
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                        continue;
+                    }
+
+                    $source = $path1 . '/' . $file;
+                    $target = $path2 . '/' . $file;
+                    $this->copy($source, $target);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->unlink($path1) === false) {
+                $this->unlink($path2);
+                return false;
+            }
+        } else {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->rmdir($path1) === false) {
+                $this->rmdir($path2);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function test() {
+        $test = $this->getConnection()->getBucketAcl(array(
+            'Bucket' => $this->bucket,
+        ));
+        if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $this->cleanKey($path),
+                'SourceFile' => $tmpFile,
+                'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
+                'ContentLength' => filesize($tmpFile)
+            ));
+            $this->testTimeout();
+
+            unlink($tmpFile);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/Storage/SMB.php

Indentation +450 added lines, -450 removed lines

@@ -53,454 +53,454 @@
 use OCP\Files\StorageNotAvailableException;
 
 class SMB extends Common implements INotifyStorage {
-	/**
-	 * @var \Icewind\SMB\Server
-	 */
-	protected $server;
-
-	/**
-	 * @var \Icewind\SMB\Share
-	 */
-	protected $share;
-
-	/**
-	 * @var string
-	 */
-	protected $root;
-
-	/**
-	 * @var \Icewind\SMB\FileInfo[]
-	 */
-	protected $statCache;
-
-	public function __construct($params) {
-		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
-			if (Server::NativeAvailable()) {
-				$this->server = new NativeServer($params['host'], $params['user'], $params['password']);
-			} else {
-				$this->server = new Server($params['host'], $params['user'], $params['password']);
-			}
-			$this->share = $this->server->getShare(trim($params['share'], '/'));
-
-			$this->root = isset($params['root']) ? $params['root'] : '/';
-			if (!$this->root || $this->root[0] != '/') {
-				$this->root = '/' . $this->root;
-			}
-			if (substr($this->root, -1, 1) != '/') {
-				$this->root .= '/';
-			}
-		} else {
-			throw new \Exception('Invalid configuration');
-		}
-		$this->statCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getId() {
-		// FIXME: double slash to keep compatible with the old storage ids,
-		// failure to do so will lead to creation of a new storage id and
-		// loss of shares from the storage
-		return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function buildPath($path) {
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
-	}
-
-	protected function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return \Icewind\SMB\IFileInfo
-	 * @throws StorageNotAvailableException
-	 */
-	protected function getFileInfo($path) {
-		try {
-			$path = $this->buildPath($path);
-			if (!isset($this->statCache[$path])) {
-				$this->statCache[$path] = $this->share->stat($path);
-			}
-			return $this->statCache[$path];
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return \Icewind\SMB\IFileInfo[]
-	 * @throws StorageNotAvailableException
-	 */
-	protected function getFolderContents($path) {
-		try {
-			$path = $this->buildPath($path);
-			$files = $this->share->dir($path);
-			foreach ($files as $file) {
-				$this->statCache[$path . '/' . $file->getName()] = $file;
-			}
-			return array_filter($files, function (IFileInfo $file) {
-				return !$file->isHidden();
-			});
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param \Icewind\SMB\IFileInfo $info
-	 * @return array
-	 */
-	protected function formatInfo($info) {
-		return array(
-			'size' => $info->getSize(),
-			'mtime' => $info->getMTime()
-		);
-	}
-
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function stat($path) {
-		$result = $this->formatInfo($this->getFileInfo($path));
-		if ($this->remoteIsShare() && $this->isRootDir($path)) {
-			$result['mtime'] = $this->shareMTime();
-		}
-		return $result;
-	}
-
-	/**
-	 * get the best guess for the modification time of the share
-	 *
-	 * @return int
-	 */
-	private function shareMTime() {
-		$highestMTime = 0;
-		$files = $this->share->dir($this->root);
-		foreach ($files as $fileInfo) {
-			if ($fileInfo->getMTime() > $highestMTime) {
-				$highestMTime = $fileInfo->getMTime();
-			}
-		}
-		return $highestMTime;
-	}
-
-	/**
-	 * Check if the path is our root dir (not the smb one)
-	 *
-	 * @param string $path the path
-	 * @return bool
-	 */
-	private function isRootDir($path) {
-		return $path === '' || $path === '/' || $path === '.';
-	}
-
-	/**
-	 * Check if our root points to a smb share
-	 *
-	 * @return bool true if our root points to a share false otherwise
-	 */
-	private function remoteIsShare() {
-		return $this->share->getName() && (!$this->root || $this->root === '/');
-	}
-
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function unlink($path) {
-		try {
-			if ($this->is_dir($path)) {
-				return $this->rmdir($path);
-			} else {
-				$path = $this->buildPath($path);
-				unset($this->statCache[$path]);
-				$this->share->del($path);
-				return true;
-			}
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @param string $path1 the old name
-	 * @param string $path2 the new name
-	 * @return bool
-	 */
-	public function rename($path1, $path2) {
-		try {
-			$this->remove($path2);
-			$path1 = $this->buildPath($path1);
-			$path2 = $this->buildPath($path2);
-			return $this->share->rename($path1, $path2);
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		if (!$path and $this->root == '/') {
-			// mtime doesn't work for shares, but giving the nature of the backend,
-			// doing a full update is still just fast enough
-			return true;
-		} else {
-			$actualTime = $this->filemtime($path);
-			return $actualTime > $time;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource|false
-	 */
-	public function fopen($path, $mode) {
-		$fullPath = $this->buildPath($path);
-		try {
-			switch ($mode) {
-				case 'r':
-				case 'rb':
-					if (!$this->file_exists($path)) {
-						return false;
-					}
-					return $this->share->read($fullPath);
-				case 'w':
-				case 'wb':
-					$source = $this->share->write($fullPath);
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
-						unset($this->statCache[$fullPath]);
-					});
-				case 'a':
-				case 'ab':
-				case 'r+':
-				case 'w+':
-				case 'wb+':
-				case 'a+':
-				case 'x':
-				case 'x+':
-				case 'c':
-				case 'c+':
-					//emulate these
-					if (strrpos($path, '.') !== false) {
-						$ext = substr($path, strrpos($path, '.'));
-					} else {
-						$ext = '';
-					}
-					if ($this->file_exists($path)) {
-						if (!$this->isUpdatable($path)) {
-							return false;
-						}
-						$tmpFile = $this->getCachedFile($path);
-					} else {
-						if (!$this->isCreatable(dirname($path))) {
-							return false;
-						}
-						$tmpFile = \OCP\Files::tmpFile($ext);
-					}
-					$source = fopen($tmpFile, $mode);
-					$share = $this->share;
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
-						unset($this->statCache[$fullPath]);
-						$share->put($tmpFile, $fullPath);
-						unlink($tmpFile);
-					});
-			}
-			return false;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function rmdir($path) {
-		try {
-			$this->statCache = array();
-			$content = $this->share->dir($this->buildPath($path));
-			foreach ($content as $file) {
-				if ($file->isDirectory()) {
-					$this->rmdir($path . '/' . $file->getName());
-				} else {
-					$this->share->del($file->getPath());
-				}
-			}
-			$this->share->rmdir($this->buildPath($path));
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function touch($path, $time = null) {
-		try {
-			if (!$this->file_exists($path)) {
-				$fh = $this->share->write($this->buildPath($path));
-				fclose($fh);
-				return true;
-			}
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function opendir($path) {
-		try {
-			$files = $this->getFolderContents($path);
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-		$names = array_map(function ($info) {
-			/** @var \Icewind\SMB\IFileInfo $info */
-			return $info->getName();
-		}, $files);
-		return IteratorDirectory::wrap($names);
-	}
-
-	public function filetype($path) {
-		try {
-			return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function mkdir($path) {
-		$path = $this->buildPath($path);
-		try {
-			$this->share->mkdir($path);
-			return true;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	public function file_exists($path) {
-		try {
-			$this->getFileInfo($path);
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		} catch (ConnectException $e) {
-			throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
-		}
-	}
-
-	public function isReadable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			return !$info->isHidden();
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function isUpdatable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			// following windows behaviour for read-only folders: they can be written into
-			// (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
-			return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	public function isDeletable($path) {
-		try {
-			$info = $this->getFileInfo($path);
-			return !$info->isHidden() && !$info->isReadOnly();
-		} catch (NotFoundException $e) {
-			return false;
-		} catch (ForbiddenException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * check if smbclient is installed
-	 */
-	public static function checkDependencies() {
-		return (
-			(bool)\OC_Helper::findBinaryPath('smbclient')
-			|| Server::NativeAvailable()
-		) ? true : ['smbclient'];
-	}
-
-	/**
-	 * Test a storage for availability
-	 *
-	 * @return bool
-	 */
-	public function test() {
-		try {
-			return parent::test();
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	public function listen($path, callable $callback) {
-		$this->notify($path)->listen(function (IChange $change) use ($callback) {
-			if ($change instanceof IRenameChange) {
-				return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
-			} else {
-				return $callback($change->getType(), $change->getPath());
-			}
-		});
-	}
-
-	public function notify($path) {
-		$path = '/' . ltrim($path, '/');
-		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
-		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
-	}
+    /**
+     * @var \Icewind\SMB\Server
+     */
+    protected $server;
+
+    /**
+     * @var \Icewind\SMB\Share
+     */
+    protected $share;
+
+    /**
+     * @var string
+     */
+    protected $root;
+
+    /**
+     * @var \Icewind\SMB\FileInfo[]
+     */
+    protected $statCache;
+
+    public function __construct($params) {
+        if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
+            if (Server::NativeAvailable()) {
+                $this->server = new NativeServer($params['host'], $params['user'], $params['password']);
+            } else {
+                $this->server = new Server($params['host'], $params['user'], $params['password']);
+            }
+            $this->share = $this->server->getShare(trim($params['share'], '/'));
+
+            $this->root = isset($params['root']) ? $params['root'] : '/';
+            if (!$this->root || $this->root[0] != '/') {
+                $this->root = '/' . $this->root;
+            }
+            if (substr($this->root, -1, 1) != '/') {
+                $this->root .= '/';
+            }
+        } else {
+            throw new \Exception('Invalid configuration');
+        }
+        $this->statCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @return string
+     */
+    public function getId() {
+        // FIXME: double slash to keep compatible with the old storage ids,
+        // failure to do so will lead to creation of a new storage id and
+        // loss of shares from the storage
+        return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function buildPath($path) {
+        return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
+    }
+
+    protected function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \Icewind\SMB\IFileInfo
+     * @throws StorageNotAvailableException
+     */
+    protected function getFileInfo($path) {
+        try {
+            $path = $this->buildPath($path);
+            if (!isset($this->statCache[$path])) {
+                $this->statCache[$path] = $this->share->stat($path);
+            }
+            return $this->statCache[$path];
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return \Icewind\SMB\IFileInfo[]
+     * @throws StorageNotAvailableException
+     */
+    protected function getFolderContents($path) {
+        try {
+            $path = $this->buildPath($path);
+            $files = $this->share->dir($path);
+            foreach ($files as $file) {
+                $this->statCache[$path . '/' . $file->getName()] = $file;
+            }
+            return array_filter($files, function (IFileInfo $file) {
+                return !$file->isHidden();
+            });
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param \Icewind\SMB\IFileInfo $info
+     * @return array
+     */
+    protected function formatInfo($info) {
+        return array(
+            'size' => $info->getSize(),
+            'mtime' => $info->getMTime()
+        );
+    }
+
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function stat($path) {
+        $result = $this->formatInfo($this->getFileInfo($path));
+        if ($this->remoteIsShare() && $this->isRootDir($path)) {
+            $result['mtime'] = $this->shareMTime();
+        }
+        return $result;
+    }
+
+    /**
+     * get the best guess for the modification time of the share
+     *
+     * @return int
+     */
+    private function shareMTime() {
+        $highestMTime = 0;
+        $files = $this->share->dir($this->root);
+        foreach ($files as $fileInfo) {
+            if ($fileInfo->getMTime() > $highestMTime) {
+                $highestMTime = $fileInfo->getMTime();
+            }
+        }
+        return $highestMTime;
+    }
+
+    /**
+     * Check if the path is our root dir (not the smb one)
+     *
+     * @param string $path the path
+     * @return bool
+     */
+    private function isRootDir($path) {
+        return $path === '' || $path === '/' || $path === '.';
+    }
+
+    /**
+     * Check if our root points to a smb share
+     *
+     * @return bool true if our root points to a share false otherwise
+     */
+    private function remoteIsShare() {
+        return $this->share->getName() && (!$this->root || $this->root === '/');
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path) {
+        try {
+            if ($this->is_dir($path)) {
+                return $this->rmdir($path);
+            } else {
+                $path = $this->buildPath($path);
+                unset($this->statCache[$path]);
+                $this->share->del($path);
+                return true;
+            }
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @param string $path1 the old name
+     * @param string $path2 the new name
+     * @return bool
+     */
+    public function rename($path1, $path2) {
+        try {
+            $this->remove($path2);
+            $path1 = $this->buildPath($path1);
+            $path2 = $this->buildPath($path2);
+            return $this->share->rename($path1, $path2);
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        if (!$path and $this->root == '/') {
+            // mtime doesn't work for shares, but giving the nature of the backend,
+            // doing a full update is still just fast enough
+            return true;
+        } else {
+            $actualTime = $this->filemtime($path);
+            return $actualTime > $time;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @return resource|false
+     */
+    public function fopen($path, $mode) {
+        $fullPath = $this->buildPath($path);
+        try {
+            switch ($mode) {
+                case 'r':
+                case 'rb':
+                    if (!$this->file_exists($path)) {
+                        return false;
+                    }
+                    return $this->share->read($fullPath);
+                case 'w':
+                case 'wb':
+                    $source = $this->share->write($fullPath);
+                    return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
+                        unset($this->statCache[$fullPath]);
+                    });
+                case 'a':
+                case 'ab':
+                case 'r+':
+                case 'w+':
+                case 'wb+':
+                case 'a+':
+                case 'x':
+                case 'x+':
+                case 'c':
+                case 'c+':
+                    //emulate these
+                    if (strrpos($path, '.') !== false) {
+                        $ext = substr($path, strrpos($path, '.'));
+                    } else {
+                        $ext = '';
+                    }
+                    if ($this->file_exists($path)) {
+                        if (!$this->isUpdatable($path)) {
+                            return false;
+                        }
+                        $tmpFile = $this->getCachedFile($path);
+                    } else {
+                        if (!$this->isCreatable(dirname($path))) {
+                            return false;
+                        }
+                        $tmpFile = \OCP\Files::tmpFile($ext);
+                    }
+                    $source = fopen($tmpFile, $mode);
+                    $share = $this->share;
+                    return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
+                        unset($this->statCache[$fullPath]);
+                        $share->put($tmpFile, $fullPath);
+                        unlink($tmpFile);
+                    });
+            }
+            return false;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function rmdir($path) {
+        try {
+            $this->statCache = array();
+            $content = $this->share->dir($this->buildPath($path));
+            foreach ($content as $file) {
+                if ($file->isDirectory()) {
+                    $this->rmdir($path . '/' . $file->getName());
+                } else {
+                    $this->share->del($file->getPath());
+                }
+            }
+            $this->share->rmdir($this->buildPath($path));
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function touch($path, $time = null) {
+        try {
+            if (!$this->file_exists($path)) {
+                $fh = $this->share->write($this->buildPath($path));
+                fclose($fh);
+                return true;
+            }
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function opendir($path) {
+        try {
+            $files = $this->getFolderContents($path);
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+        $names = array_map(function ($info) {
+            /** @var \Icewind\SMB\IFileInfo $info */
+            return $info->getName();
+        }, $files);
+        return IteratorDirectory::wrap($names);
+    }
+
+    public function filetype($path) {
+        try {
+            return $this->getFileInfo($path)->isDirectory() ? 'dir' : 'file';
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function mkdir($path) {
+        $path = $this->buildPath($path);
+        try {
+            $this->share->mkdir($path);
+            return true;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    public function file_exists($path) {
+        try {
+            $this->getFileInfo($path);
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        } catch (ConnectException $e) {
+            throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function isReadable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            return !$info->isHidden();
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function isUpdatable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            // following windows behaviour for read-only folders: they can be written into
+            // (https://support.microsoft.com/en-us/kb/326549 - "cause" section)
+            return !$info->isHidden() && (!$info->isReadOnly() || $this->is_dir($path));
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    public function isDeletable($path) {
+        try {
+            $info = $this->getFileInfo($path);
+            return !$info->isHidden() && !$info->isReadOnly();
+        } catch (NotFoundException $e) {
+            return false;
+        } catch (ForbiddenException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * check if smbclient is installed
+     */
+    public static function checkDependencies() {
+        return (
+            (bool)\OC_Helper::findBinaryPath('smbclient')
+            || Server::NativeAvailable()
+        ) ? true : ['smbclient'];
+    }
+
+    /**
+     * Test a storage for availability
+     *
+     * @return bool
+     */
+    public function test() {
+        try {
+            return parent::test();
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    public function listen($path, callable $callback) {
+        $this->notify($path)->listen(function (IChange $change) use ($callback) {
+            if ($change instanceof IRenameChange) {
+                return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
+            } else {
+                return $callback($change->getType(), $change->getPath());
+            }
+        });
+    }
+
+    public function notify($path) {
+        $path = '/' . ltrim($path, '/');
+        $shareNotifyHandler = $this->share->notify($this->buildPath($path));
+        return new SMBNotifyHandler($shareNotifyHandler, $this->root);
+    }
 }

apps/files_external/lib/Lib/Storage/Dropbox.php

Indentation +290 added lines, -290 removed lines

@@ -40,317 +40,317 @@
 
 class Dropbox extends \OC\Files\Storage\Common {
 
-	private $dropbox;
-	private $root;
-	private $id;
-	private $metaData = array();
-	private $oauth;
+    private $dropbox;
+    private $root;
+    private $id;
+    private $metaData = array();
+    private $oauth;
 
-	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true'
-			&& isset($params['app_key'])
-			&& isset($params['app_secret'])
-			&& isset($params['token'])
-			&& isset($params['token_secret'])
-		) {
-			$this->root = isset($params['root']) ? $params['root'] : '';
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
-			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
-			$this->oauth->setToken($params['token'], $params['token_secret']);
-			// note: Dropbox_API connection is lazy
-			$this->dropbox = new \Dropbox_API($this->oauth, 'auto');
-		} else {
-			throw new \Exception('Creating Dropbox storage failed');
-		}
-	}
+    public function __construct($params) {
+        if (isset($params['configured']) && $params['configured'] == 'true'
+            && isset($params['app_key'])
+            && isset($params['app_secret'])
+            && isset($params['token'])
+            && isset($params['token_secret'])
+        ) {
+            $this->root = isset($params['root']) ? $params['root'] : '';
+            $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
+            $this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+            $this->oauth->setToken($params['token'], $params['token_secret']);
+            // note: Dropbox_API connection is lazy
+            $this->dropbox = new \Dropbox_API($this->oauth, 'auto');
+        } else {
+            throw new \Exception('Creating Dropbox storage failed');
+        }
+    }
 
-	/**
-	 * @param string $path
-	 */
-	private function deleteMetaData($path) {
-		$path = ltrim($this->root.$path, '/');
-		if (isset($this->metaData[$path])) {
-			unset($this->metaData[$path]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $path
+     */
+    private function deleteMetaData($path) {
+        $path = ltrim($this->root.$path, '/');
+        if (isset($this->metaData[$path])) {
+            unset($this->metaData[$path]);
+            return true;
+        }
+        return false;
+    }
 
-	private function setMetaData($path, $metaData) {
-		$this->metaData[ltrim($path, '/')] = $metaData;
-	}
+    private function setMetaData($path, $metaData) {
+        $this->metaData[ltrim($path, '/')] = $metaData;
+    }
 
-	/**
-	 * Returns the path's metadata
-	 * @param string $path path for which to return the metadata
-	 * @param bool $list if true, also return the directory's contents
-	 * @return mixed directory contents if $list is true, file metadata if $list is
-	 * false, null if the file doesn't exist or "false" if the operation failed
-	 */
-	private function getDropBoxMetaData($path, $list = false) {
-		$path = ltrim($this->root.$path, '/');
-		if ( ! $list && isset($this->metaData[$path])) {
-			return $this->metaData[$path];
-		} else {
-			if ($list) {
-				try {
-					$response = $this->dropbox->getMetaData($path);
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-				$contents = array();
-				if ($response && isset($response['contents'])) {
-					// Cache folder's contents
-					foreach ($response['contents'] as $file) {
-						if (!isset($file['is_deleted']) || !$file['is_deleted']) {
-							$this->setMetaData($path.'/'.basename($file['path']), $file);
-							$contents[] = $file;
-						}
-					}
-					unset($response['contents']);
-				}
-				if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-					$this->setMetaData($path, $response);
-				}
-				// Return contents of folder only
-				return $contents;
-			} else {
-				try {
-					$requestPath = $path;
-					if ($path === '.') {
-						$requestPath = '';
-					}
+    /**
+     * Returns the path's metadata
+     * @param string $path path for which to return the metadata
+     * @param bool $list if true, also return the directory's contents
+     * @return mixed directory contents if $list is true, file metadata if $list is
+     * false, null if the file doesn't exist or "false" if the operation failed
+     */
+    private function getDropBoxMetaData($path, $list = false) {
+        $path = ltrim($this->root.$path, '/');
+        if ( ! $list && isset($this->metaData[$path])) {
+            return $this->metaData[$path];
+        } else {
+            if ($list) {
+                try {
+                    $response = $this->dropbox->getMetaData($path);
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+                $contents = array();
+                if ($response && isset($response['contents'])) {
+                    // Cache folder's contents
+                    foreach ($response['contents'] as $file) {
+                        if (!isset($file['is_deleted']) || !$file['is_deleted']) {
+                            $this->setMetaData($path.'/'.basename($file['path']), $file);
+                            $contents[] = $file;
+                        }
+                    }
+                    unset($response['contents']);
+                }
+                if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                    $this->setMetaData($path, $response);
+                }
+                // Return contents of folder only
+                return $contents;
+            } else {
+                try {
+                    $requestPath = $path;
+                    if ($path === '.') {
+                        $requestPath = '';
+                    }
 
-					$response = $this->dropbox->getMetaData($requestPath, 'false');
-					if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-						$this->setMetaData($path, $response);
-						return $response;
-					}
-					return null;
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					if ($exception instanceof \Dropbox_Exception_NotFound) {
-						// don't log, might be a file_exist check
-						return false;
-					}
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			}
-		}
-	}
+                    $response = $this->dropbox->getMetaData($requestPath, 'false');
+                    if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                        $this->setMetaData($path, $response);
+                        return $response;
+                    }
+                    return null;
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    if ($exception instanceof \Dropbox_Exception_NotFound) {
+                        // don't log, might be a file_exist check
+                        return false;
+                    }
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            }
+        }
+    }
 
-	public function getId(){
-		return $this->id;
-	}
+    public function getId(){
+        return $this->id;
+    }
 
-	public function mkdir($path) {
-		$path = $this->root.$path;
-		try {
-			$this->dropbox->createFolder($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function mkdir($path) {
+        $path = $this->root.$path;
+        try {
+            $this->dropbox->createFolder($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rmdir($path) {
-		return $this->unlink($path);
-	}
+    public function rmdir($path) {
+        return $this->unlink($path);
+    }
 
-	public function opendir($path) {
-		$contents = $this->getDropBoxMetaData($path, true);
-		if ($contents !== false) {
-			$files = array();
-			foreach ($contents as $file) {
-				$files[] = basename($file['path']);
-			}
-			return IteratorDirectory::wrap($files);
-		}
-		return false;
-	}
+    public function opendir($path) {
+        $contents = $this->getDropBoxMetaData($path, true);
+        if ($contents !== false) {
+            $files = array();
+            foreach ($contents as $file) {
+                $files[] = basename($file['path']);
+            }
+            return IteratorDirectory::wrap($files);
+        }
+        return false;
+    }
 
-	public function stat($path) {
-		$metaData = $this->getDropBoxMetaData($path);
-		if ($metaData) {
-			$stat['size'] = $metaData['bytes'];
-			$stat['atime'] = time();
-			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
-			return $stat;
-		}
-		return false;
-	}
+    public function stat($path) {
+        $metaData = $this->getDropBoxMetaData($path);
+        if ($metaData) {
+            $stat['size'] = $metaData['bytes'];
+            $stat['atime'] = time();
+            $stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
+            return $stat;
+        }
+        return false;
+    }
 
-	public function filetype($path) {
-		if ($path == '' || $path == '/') {
-			return 'dir';
-		} else {
-			$metaData = $this->getDropBoxMetaData($path);
-			if ($metaData) {
-				if ($metaData['is_dir'] == 'true') {
-					return 'dir';
-				} else {
-					return 'file';
-				}
-			}
-		}
-		return false;
-	}
+    public function filetype($path) {
+        if ($path == '' || $path == '/') {
+            return 'dir';
+        } else {
+            $metaData = $this->getDropBoxMetaData($path);
+            if ($metaData) {
+                if ($metaData['is_dir'] == 'true') {
+                    return 'dir';
+                } else {
+                    return 'file';
+                }
+            }
+        }
+        return false;
+    }
 
-	public function file_exists($path) {
-		if ($path == '' || $path == '/') {
-			return true;
-		}
-		if ($this->getDropBoxMetaData($path)) {
-			return true;
-		}
-		return false;
-	}
+    public function file_exists($path) {
+        if ($path == '' || $path == '/') {
+            return true;
+        }
+        if ($this->getDropBoxMetaData($path)) {
+            return true;
+        }
+        return false;
+    }
 
-	public function unlink($path) {
-		try {
-			$this->dropbox->delete($this->root.$path);
-			$this->deleteMetaData($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function unlink($path) {
+        try {
+            $this->dropbox->delete($this->root.$path);
+            $this->deleteMetaData($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rename($path1, $path2) {
-		try {
-			// overwrite if target file exists and is not a directory
-			$destMetaData = $this->getDropBoxMetaData($path2);
-			if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
-				$this->unlink($path2);
-			}
-			$this->dropbox->move($this->root.$path1, $this->root.$path2);
-			$this->deleteMetaData($path1);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function rename($path1, $path2) {
+        try {
+            // overwrite if target file exists and is not a directory
+            $destMetaData = $this->getDropBoxMetaData($path2);
+            if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
+                $this->unlink($path2);
+            }
+            $this->dropbox->move($this->root.$path1, $this->root.$path2);
+            $this->deleteMetaData($path1);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function copy($path1, $path2) {
-		$path1 = $this->root.$path1;
-		$path2 = $this->root.$path2;
-		try {
-			$this->dropbox->copy($path1, $path2);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function copy($path1, $path2) {
+        $path1 = $this->root.$path1;
+        $path2 = $this->root.$path2;
+        try {
+            $this->dropbox->copy($path1, $path2);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function fopen($path, $mode) {
-		$path = $this->root.$path;
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					// slashes need to stay
-					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
-					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
+    public function fopen($path, $mode) {
+        $path = $this->root.$path;
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    // slashes need to stay
+                    $encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
+                    $downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
+                    $headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
 
-					$client = \OC::$server->getHTTPClientService()->newClient();
-					try {
-						$response = $client->get($downloadUrl, [
-							'headers' => $headers,
-							'stream' => true,
-						]);
-					} catch (RequestException $e) {
-						if (!is_null($e->getResponse())) {
-							if ($e->getResponse()->getStatusCode() === 404) {
-								return false;
-							} else {
-								throw $e;
-							}
-						} else {
-							throw $e;
-						}
-					}
+                    $client = \OC::$server->getHTTPClientService()->newClient();
+                    try {
+                        $response = $client->get($downloadUrl, [
+                            'headers' => $headers,
+                            'stream' => true,
+                        ]);
+                    } catch (RequestException $e) {
+                        if (!is_null($e->getResponse())) {
+                            if ($e->getResponse()->getStatusCode() === 404) {
+                                return false;
+                            } else {
+                                throw $e;
+                            }
+                        } else {
+                            throw $e;
+                        }
+                    }
 
-					$handle = $response->getBody();
-					return RetryWrapper::wrap($handle);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-				$this->writeBack($tmpFile, $path);
-			});
-		}
-		return false;
-	}
+                    $handle = $response->getBody();
+                    return RetryWrapper::wrap($handle);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+            $handle = fopen($tmpFile, $mode);
+            return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                $this->writeBack($tmpFile, $path);
+            });
+        }
+        return false;
+    }
 
-	public function writeBack($tmpFile, $path) {
-		$handle = fopen($tmpFile, 'r');
-		try {
-			$this->dropbox->putFile($path, $handle);
-			unlink($tmpFile);
-			$this->deleteMetaData($path);
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-		}
-	}
+    public function writeBack($tmpFile, $path) {
+        $handle = fopen($tmpFile, 'r');
+        try {
+            $this->dropbox->putFile($path, $handle);
+            unlink($tmpFile);
+            $this->deleteMetaData($path);
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+        }
+    }
 
-	public function free_space($path) {
-		try {
-			$info = $this->dropbox->getAccountInfo();
-			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function free_space($path) {
+        try {
+            $info = $this->dropbox->getAccountInfo();
+            return $info['quota_info']['quota'] - $info['quota_info']['normal'];
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function touch($path, $mtime = null) {
-		if ($this->file_exists($path)) {
-			return false;
-		} else {
-			$this->file_put_contents($path, '');
-		}
-		return true;
-	}
+    public function touch($path, $mtime = null) {
+        if ($this->file_exists($path)) {
+            return false;
+        } else {
+            $this->file_put_contents($path, '');
+        }
+        return true;
+    }
 
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

apps/files_external/lib/Lib/StorageModifierTrait.php

Indentation +21 added lines, -21 removed lines

@@ -43,28 +43,28 @@
  */
 trait StorageModifierTrait {
 
-	/**
-	 * Modify a StorageConfig parameters
-	 *
-	 * @param StorageConfig $storage
-	 * @param IUser $user User the storage is being used as
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-	}
+    /**
+     * Modify a StorageConfig parameters
+     *
+     * @param StorageConfig $storage
+     * @param IUser $user User the storage is being used as
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+    }
 
-	/**
-	 * Wrap a Storage if necessary
-	 *
-	 * @param Storage $storage
-	 * @return Storage
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function wrapStorage(Storage $storage) {
-		return $storage;
-	}
+    /**
+     * Wrap a Storage if necessary
+     *
+     * @param Storage $storage
+     * @return Storage
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function wrapStorage(Storage $storage) {
+        return $storage;
+    }
 
 }
 

apps/files_external/lib/Lib/PersonalMount.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
  * Person mount points can be moved by the user
  */
 class PersonalMount extends MountPoint implements MoveableMount {
-	/** @var UserStoragesService */
-	protected $storagesService;
+    /** @var UserStoragesService */
+    protected $storagesService;
 
-	/** @var int */
-	protected $numericStorageId;
+    /** @var int */
+    protected $numericStorageId;
 
-	/**
-	 * @param UserStoragesService $storagesService
-	 * @param int $storageId
-	 * @param \OCP\Files\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 */
-	public function __construct(
-		UserStoragesService $storagesService,
-		$storageId,
-		$storage,
-		$mountpoint,
-		$arguments = null,
-		$loader = null,
-		$mountOptions = null
-	) {
-		parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
-		$this->storagesService = $storagesService;
-		$this->numericStorageId = $storageId;
-	}
+    /**
+     * @param UserStoragesService $storagesService
+     * @param int $storageId
+     * @param \OCP\Files\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     */
+    public function __construct(
+        UserStoragesService $storagesService,
+        $storageId,
+        $storage,
+        $mountpoint,
+        $arguments = null,
+        $loader = null,
+        $mountOptions = null
+    ) {
+        parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
+        $this->storagesService = $storagesService;
+        $this->numericStorageId = $storageId;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$storage = $this->storagesService->getStorage($this->numericStorageId);
-		// remove "/$user/files" prefix
-		$targetParts = explode('/', trim($target, '/'), 3);
-		$storage->setMountPoint($targetParts[2]);
-		$this->storagesService->updateStorage($storage);
-		$this->setMountPoint($target);
-		return true;
-	}
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $storage = $this->storagesService->getStorage($this->numericStorageId);
+        // remove "/$user/files" prefix
+        $targetParts = explode('/', trim($target, '/'), 3);
+        $storage->setMountPoint($targetParts[2]);
+        $this->storagesService->updateStorage($storage);
+        $this->setMountPoint($target);
+        return true;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$this->storagesService->removeStorage($this->numericStorageId);
-		return true;
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $this->storagesService->removeStorage($this->numericStorageId);
+        return true;
+    }
 }

apps/files_external/lib/Lib/Notify/SMBNotifyHandler.php

Indentation +109 added lines, -109 removed lines

@@ -29,122 +29,122 @@
 use OCP\Files\Notify\INotifyHandler;
 
 class SMBNotifyHandler implements INotifyHandler {
-	/**
-	 * @var \Icewind\SMB\INotifyHandler
-	 */
-	private $shareNotifyHandler;
+    /**
+     * @var \Icewind\SMB\INotifyHandler
+     */
+    private $shareNotifyHandler;
 
-	/**
-	 * @var string
-	 */
-	private $root;
+    /**
+     * @var string
+     */
+    private $root;
 
-	private $oldRenamePath = null;
+    private $oldRenamePath = null;
 
-	/**
-	 * SMBNotifyHandler constructor.
-	 *
-	 * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
-	 * @param string $root
-	 */
-	public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
-		$this->shareNotifyHandler = $shareNotifyHandler;
-		$this->root = $root;
-	}
+    /**
+     * SMBNotifyHandler constructor.
+     *
+     * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
+     * @param string $root
+     */
+    public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
+        $this->shareNotifyHandler = $shareNotifyHandler;
+        $this->root = $root;
+    }
 
-	private function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
+    private function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
 
-	public function listen(callable $callback) {
-		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
-			$change = $this->mapChange($shareChange);
-			if (!is_null($change)) {
-				return $callback($change);
-			} else {
-				return true;
-			}
-		});
-	}
+    public function listen(callable $callback) {
+        $oldRenamePath = null;
+        $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+            $change = $this->mapChange($shareChange);
+            if (!is_null($change)) {
+                return $callback($change);
+            } else {
+                return true;
+            }
+        });
+    }
 
-	/**
-	 * Get all changes detected since the start of the notify process or the last call to getChanges
-	 *
-	 * @return IChange[]
-	 */
-	public function getChanges() {
-		$shareChanges = $this->shareNotifyHandler->getChanges();
-		$changes = [];
-		foreach ($shareChanges as $shareChange) {
-			$change = $this->mapChange($shareChange);
-			if ($change) {
-				$changes[] = $change;
-			}
-		}
-		return $changes;
-	}
+    /**
+     * Get all changes detected since the start of the notify process or the last call to getChanges
+     *
+     * @return IChange[]
+     */
+    public function getChanges() {
+        $shareChanges = $this->shareNotifyHandler->getChanges();
+        $changes = [];
+        foreach ($shareChanges as $shareChange) {
+            $change = $this->mapChange($shareChange);
+            if ($change) {
+                $changes[] = $change;
+            }
+        }
+        return $changes;
+    }
 
-	/**
-	 * Stop listening for changes
-	 *
-	 * Note that any pending changes will be discarded
-	 */
-	public function stop() {
-		$this->shareNotifyHandler->stop();
-	}
+    /**
+     * Stop listening for changes
+     *
+     * Note that any pending changes will be discarded
+     */
+    public function stop() {
+        $this->shareNotifyHandler->stop();
+    }
 
-	/**
-	 * @param \Icewind\SMB\Change $change
-	 * @return IChange|null
-	 */
-	private function mapChange(\Icewind\SMB\Change $change) {
-		$path = $this->relativePath($change->getPath());
-		if (is_null($path)) {
-			return null;
-		}
-		if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
-			$this->oldRenamePath = $path;
-			return null;
-		}
-		$type = $this->mapNotifyType($change->getCode());
-		if (is_null($type)) {
-			return null;
-		}
-		if ($type === IChange::RENAMED) {
-			if (!is_null($this->oldRenamePath)) {
-				$result = new RenameChange($type, $this->oldRenamePath, $path);
-				$this->oldRenamePath = null;
-			} else {
-				$result = null;
-			}
-		} else {
-			$result = new Change($type, $path);
-		}
-		return $result;
-	}
+    /**
+     * @param \Icewind\SMB\Change $change
+     * @return IChange|null
+     */
+    private function mapChange(\Icewind\SMB\Change $change) {
+        $path = $this->relativePath($change->getPath());
+        if (is_null($path)) {
+            return null;
+        }
+        if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
+            $this->oldRenamePath = $path;
+            return null;
+        }
+        $type = $this->mapNotifyType($change->getCode());
+        if (is_null($type)) {
+            return null;
+        }
+        if ($type === IChange::RENAMED) {
+            if (!is_null($this->oldRenamePath)) {
+                $result = new RenameChange($type, $this->oldRenamePath, $path);
+                $this->oldRenamePath = null;
+            } else {
+                $result = null;
+            }
+        } else {
+            $result = new Change($type, $path);
+        }
+        return $result;
+    }
 
-	private function mapNotifyType($smbType) {
-		switch ($smbType) {
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
-				return IChange::ADDED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
-				return IChange::REMOVED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
-				return IChange::MODIFIED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
-				return IChange::RENAMED;
-			default:
-				return null;
-		}
-	}
+    private function mapNotifyType($smbType) {
+        switch ($smbType) {
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
+                return IChange::ADDED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
+                return IChange::REMOVED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
+                return IChange::MODIFIED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
+                return IChange::RENAMED;
+            default:
+                return null;
+        }
+    }
 }

apps/files_external/lib/Lib/StorageConfig.php

Indentation +394 added lines, -394 removed lines

@@ -35,398 +35,398 @@
  * External storage configuration
  */
 class StorageConfig implements \JsonSerializable {
-	const MOUNT_TYPE_ADMIN = 1;
-	const MOUNT_TYPE_PERSONAl = 2;
-
-	/**
-	 * Storage config id
-	 *
-	 * @var int
-	 */
-	private $id;
-
-	/**
-	 * Backend
-	 *
-	 * @var Backend
-	 */
-	private $backend;
-
-	/**
-	 * Authentication mechanism
-	 *
-	 * @var AuthMechanism
-	 */
-	private $authMechanism;
-
-	/**
-	 * Backend options
-	 *
-	 * @var array
-	 */
-	private $backendOptions = [];
-
-	/**
-	 * Mount point path, relative to the user's "files" folder
-	 *
-	 * @var string
-	 */
-	private $mountPoint;
-
-	/**
-	 * Storage status
-	 *
-	 * @var int
-	 */
-	private $status;
-
-	/**
-	 * Status message
-	 *
-	 * @var string
-	 */
-	private $statusMessage;
-
-	/**
-	 * Priority
-	 *
-	 * @var int
-	 */
-	private $priority;
-
-	/**
-	 * List of users who have access to this storage
-	 *
-	 * @var array
-	 */
-	private $applicableUsers = [];
-
-	/**
-	 * List of groups that have access to this storage
-	 *
-	 * @var array
-	 */
-	private $applicableGroups = [];
-
-	/**
-	 * Mount-specific options
-	 *
-	 * @var array
-	 */
-	private $mountOptions = [];
-
-	/**
-	 * Whether it's a personal or admin mount
-	 *
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Creates a storage config
-	 *
-	 * @param int|null $id config id or null for a new config
-	 */
-	public function __construct($id = null) {
-		$this->id = $id;
-		$this->mountOptions['enable_sharing'] = false;
-	}
-
-	/**
-	 * Returns the configuration id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Sets the configuration id
-	 *
-	 * @param int $id configuration id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * Returns mount point path relative to the user's
-	 * "files" folder.
-	 *
-	 * @return string path
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	/**
-	 * Sets mount point path relative to the user's
-	 * "files" folder.
-	 * The path will be normalized.
-	 *
-	 * @param string $mountPoint path
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
-	}
-
-	/**
-	 * @return Backend
-	 */
-	public function getBackend() {
-		return $this->backend;
-	}
-
-	/**
-	 * @param Backend $backend
-	 */
-	public function setBackend(Backend $backend) {
-		$this->backend= $backend;
-	}
-
-	/**
-	 * @return AuthMechanism
-	 */
-	public function getAuthMechanism() {
-		return $this->authMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 */
-	public function setAuthMechanism(AuthMechanism $authMechanism) {
-		$this->authMechanism = $authMechanism;
-	}
-
-	/**
-	 * Returns the external storage backend-specific options
-	 *
-	 * @return array backend options
-	 */
-	public function getBackendOptions() {
-		return $this->backendOptions;
-	}
-
-	/**
-	 * Sets the external storage backend-specific options
-	 *
-	 * @param array $backendOptions backend options
-	 */
-	public function setBackendOptions($backendOptions) {
-		if($this->getBackend() instanceof  Backend) {
-			$parameters = $this->getBackend()->getParameters();
-			foreach($backendOptions as $key => $value) {
-				if(isset($parameters[$key])) {
-					switch ($parameters[$key]->getType()) {
-						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
-							break;
-					}
-					$backendOptions[$key] = $value;
-				}
-			}
-		}
-
-		$this->backendOptions = $backendOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getBackendOption($key) {
-		if (isset($this->backendOptions[$key])) {
-			return $this->backendOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setBackendOption($key, $value) {
-		$this->backendOptions[$key] = $value;
-	}
-
-	/**
-	 * Returns the mount priority
-	 *
-	 * @return int priority
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
-
-	/**
-	 * Sets the mount priotity
-	 *
-	 * @param int $priority priority
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-	}
-
-	/**
-	 * Returns the users for which to mount this storage
-	 *
-	 * @return array applicable users
-	 */
-	public function getApplicableUsers() {
-		return $this->applicableUsers;
-	}
-
-	/**
-	 * Sets the users for which to mount this storage
-	 *
-	 * @param array|null $applicableUsers applicable users
-	 */
-	public function setApplicableUsers($applicableUsers) {
-		if (is_null($applicableUsers)) {
-			$applicableUsers = [];
-		}
-		$this->applicableUsers = $applicableUsers;
-	}
-
-	/**
-	 * Returns the groups for which to mount this storage
-	 *
-	 * @return array applicable groups
-	 */
-	public function getApplicableGroups() {
-		return $this->applicableGroups;
-	}
-
-	/**
-	 * Sets the groups for which to mount this storage
-	 *
-	 * @param array|null $applicableGroups applicable groups
-	 */
-	public function setApplicableGroups($applicableGroups) {
-		if (is_null($applicableGroups)) {
-			$applicableGroups = [];
-		}
-		$this->applicableGroups = $applicableGroups;
-	}
-
-	/**
-	 * Returns the mount-specific options
-	 *
-	 * @return array mount specific options
-	 */
-	public function getMountOptions() {
-		return $this->mountOptions;
-	}
-
-	/**
-	 * Sets the mount-specific options
-	 *
-	 * @param array $mountOptions applicable groups
-	 */
-	public function setMountOptions($mountOptions) {
-		if (is_null($mountOptions)) {
-			$mountOptions = [];
-		}
-		$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
-	 *
-	 * @return int $status status
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-	/**
-	 * Gets the message describing the storage status
-	 *
-	 * @return string|null
-	 */
-	public function getStatusMessage() {
-		return $this->statusMessage;
-	}
-
-	/**
-	 * Sets the storage status, whether the config worked last time
-	 *
-	 * @param int $status status
-	 * @param string|null $message optional message
-	 */
-	public function setStatus($status, $message = null) {
-		$this->status = $status;
-		$this->statusMessage = $message;
-	}
-
-	/**
-	 * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function setType($type) {
-		$this->type = $type;
-	}
-
-	/**
-	 * Serialize config to JSON
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$result = [];
-		if (!is_null($this->id)) {
-			$result['id'] = $this->id;
-		}
-		$result['mountPoint'] = $this->mountPoint;
-		$result['backend'] = $this->backend->getIdentifier();
-		$result['authMechanism'] = $this->authMechanism->getIdentifier();
-		$result['backendOptions'] = $this->backendOptions;
-		if (!is_null($this->priority)) {
-			$result['priority'] = $this->priority;
-		}
-		if (!empty($this->applicableUsers)) {
-			$result['applicableUsers'] = $this->applicableUsers;
-		}
-		if (!empty($this->applicableGroups)) {
-			$result['applicableGroups'] = $this->applicableGroups;
-		}
-		if (!empty($this->mountOptions)) {
-			$result['mountOptions'] = $this->mountOptions;
-		}
-		if (!is_null($this->status)) {
-			$result['status'] = $this->status;
-		}
-		if (!is_null($this->statusMessage)) {
-			$result['statusMessage'] = $this->statusMessage;
-		}
-		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
-		return $result;
-	}
+    const MOUNT_TYPE_ADMIN = 1;
+    const MOUNT_TYPE_PERSONAl = 2;
+
+    /**
+     * Storage config id
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * Backend
+     *
+     * @var Backend
+     */
+    private $backend;
+
+    /**
+     * Authentication mechanism
+     *
+     * @var AuthMechanism
+     */
+    private $authMechanism;
+
+    /**
+     * Backend options
+     *
+     * @var array
+     */
+    private $backendOptions = [];
+
+    /**
+     * Mount point path, relative to the user's "files" folder
+     *
+     * @var string
+     */
+    private $mountPoint;
+
+    /**
+     * Storage status
+     *
+     * @var int
+     */
+    private $status;
+
+    /**
+     * Status message
+     *
+     * @var string
+     */
+    private $statusMessage;
+
+    /**
+     * Priority
+     *
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * List of users who have access to this storage
+     *
+     * @var array
+     */
+    private $applicableUsers = [];
+
+    /**
+     * List of groups that have access to this storage
+     *
+     * @var array
+     */
+    private $applicableGroups = [];
+
+    /**
+     * Mount-specific options
+     *
+     * @var array
+     */
+    private $mountOptions = [];
+
+    /**
+     * Whether it's a personal or admin mount
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Creates a storage config
+     *
+     * @param int|null $id config id or null for a new config
+     */
+    public function __construct($id = null) {
+        $this->id = $id;
+        $this->mountOptions['enable_sharing'] = false;
+    }
+
+    /**
+     * Returns the configuration id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Sets the configuration id
+     *
+     * @param int $id configuration id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * Returns mount point path relative to the user's
+     * "files" folder.
+     *
+     * @return string path
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    /**
+     * Sets mount point path relative to the user's
+     * "files" folder.
+     * The path will be normalized.
+     *
+     * @param string $mountPoint path
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
+    }
+
+    /**
+     * @return Backend
+     */
+    public function getBackend() {
+        return $this->backend;
+    }
+
+    /**
+     * @param Backend $backend
+     */
+    public function setBackend(Backend $backend) {
+        $this->backend= $backend;
+    }
+
+    /**
+     * @return AuthMechanism
+     */
+    public function getAuthMechanism() {
+        return $this->authMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     */
+    public function setAuthMechanism(AuthMechanism $authMechanism) {
+        $this->authMechanism = $authMechanism;
+    }
+
+    /**
+     * Returns the external storage backend-specific options
+     *
+     * @return array backend options
+     */
+    public function getBackendOptions() {
+        return $this->backendOptions;
+    }
+
+    /**
+     * Sets the external storage backend-specific options
+     *
+     * @param array $backendOptions backend options
+     */
+    public function setBackendOptions($backendOptions) {
+        if($this->getBackend() instanceof  Backend) {
+            $parameters = $this->getBackend()->getParameters();
+            foreach($backendOptions as $key => $value) {
+                if(isset($parameters[$key])) {
+                    switch ($parameters[$key]->getType()) {
+                        case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
+                            $value = (bool)$value;
+                            break;
+                    }
+                    $backendOptions[$key] = $value;
+                }
+            }
+        }
+
+        $this->backendOptions = $backendOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getBackendOption($key) {
+        if (isset($this->backendOptions[$key])) {
+            return $this->backendOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setBackendOption($key, $value) {
+        $this->backendOptions[$key] = $value;
+    }
+
+    /**
+     * Returns the mount priority
+     *
+     * @return int priority
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
+
+    /**
+     * Sets the mount priotity
+     *
+     * @param int $priority priority
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+    }
+
+    /**
+     * Returns the users for which to mount this storage
+     *
+     * @return array applicable users
+     */
+    public function getApplicableUsers() {
+        return $this->applicableUsers;
+    }
+
+    /**
+     * Sets the users for which to mount this storage
+     *
+     * @param array|null $applicableUsers applicable users
+     */
+    public function setApplicableUsers($applicableUsers) {
+        if (is_null($applicableUsers)) {
+            $applicableUsers = [];
+        }
+        $this->applicableUsers = $applicableUsers;
+    }
+
+    /**
+     * Returns the groups for which to mount this storage
+     *
+     * @return array applicable groups
+     */
+    public function getApplicableGroups() {
+        return $this->applicableGroups;
+    }
+
+    /**
+     * Sets the groups for which to mount this storage
+     *
+     * @param array|null $applicableGroups applicable groups
+     */
+    public function setApplicableGroups($applicableGroups) {
+        if (is_null($applicableGroups)) {
+            $applicableGroups = [];
+        }
+        $this->applicableGroups = $applicableGroups;
+    }
+
+    /**
+     * Returns the mount-specific options
+     *
+     * @return array mount specific options
+     */
+    public function getMountOptions() {
+        return $this->mountOptions;
+    }
+
+    /**
+     * Sets the mount-specific options
+     *
+     * @param array $mountOptions applicable groups
+     */
+    public function setMountOptions($mountOptions) {
+        if (is_null($mountOptions)) {
+            $mountOptions = [];
+        }
+        $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
+     *
+     * @return int $status status
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+    /**
+     * Gets the message describing the storage status
+     *
+     * @return string|null
+     */
+    public function getStatusMessage() {
+        return $this->statusMessage;
+    }
+
+    /**
+     * Sets the storage status, whether the config worked last time
+     *
+     * @param int $status status
+     * @param string|null $message optional message
+     */
+    public function setStatus($status, $message = null) {
+        $this->status = $status;
+        $this->statusMessage = $message;
+    }
+
+    /**
+     * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    /**
+     * Serialize config to JSON
+     *
+     * @return array
+     */
+    public function jsonSerialize() {
+        $result = [];
+        if (!is_null($this->id)) {
+            $result['id'] = $this->id;
+        }
+        $result['mountPoint'] = $this->mountPoint;
+        $result['backend'] = $this->backend->getIdentifier();
+        $result['authMechanism'] = $this->authMechanism->getIdentifier();
+        $result['backendOptions'] = $this->backendOptions;
+        if (!is_null($this->priority)) {
+            $result['priority'] = $this->priority;
+        }
+        if (!empty($this->applicableUsers)) {
+            $result['applicableUsers'] = $this->applicableUsers;
+        }
+        if (!empty($this->applicableGroups)) {
+            $result['applicableGroups'] = $this->applicableGroups;
+        }
+        if (!empty($this->mountOptions)) {
+            $result['mountOptions'] = $this->mountOptions;
+        }
+        if (!is_null($this->status)) {
+            $result['status'] = $this->status;
+        }
+        if (!is_null($this->statusMessage)) {
+            $result['statusMessage'] = $this->statusMessage;
+        }
+        $result['userProvided'] = $this->authMechanism instanceof IUserProvided;
+        $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+        return $result;
+    }
 }