nextcloud / server

lib/private/L10N/LazyL10N.php

Indentation +28 added lines, -28 removed lines

@@ -28,43 +28,43 @@
 
 class LazyL10N implements IL10N {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var \Closure */
-	private $factory;
+    /** @var \Closure */
+    private $factory;
 
 
-	public function __construct(\Closure $factory) {
-		$this->factory = $factory;
-	}
+    public function __construct(\Closure $factory) {
+        $this->factory = $factory;
+    }
 
-	private function getL(): IL10N {
-		if ($this->l === null) {
-			$this->l = ($this->factory)();
-		}
+    private function getL(): IL10N {
+        if ($this->l === null) {
+            $this->l = ($this->factory)();
+        }
 
-		return $this->l;
-	}
+        return $this->l;
+    }
 
-	public function t(string $text, $parameters = []): string {
-		return $this->getL()->t($text, $parameters);
-	}
+    public function t(string $text, $parameters = []): string {
+        return $this->getL()->t($text, $parameters);
+    }
 
-	public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string {
-		return $this->getL()->n($text_singular, $text_plural, $count, $parameters);
-	}
+    public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string {
+        return $this->getL()->n($text_singular, $text_plural, $count, $parameters);
+    }
 
-	public function l(string $type, $data, array $options = []) {
-		return $this->getL()->l($type, $data, $options);
-	}
+    public function l(string $type, $data, array $options = []) {
+        return $this->getL()->l($type, $data, $options);
+    }
 
-	public function getLanguageCode(): string {
-		return $this->getL()->getLanguageCode();
-	}
+    public function getLanguageCode(): string {
+        return $this->getL()->getLanguageCode();
+    }
 
-	public function getLocaleCode(): string {
-		return $this->getL()->getLocaleCode();
-	}
+    public function getLocaleCode(): string {
+        return $this->getL()->getLocaleCode();
+    }
 
 }

lib/private/Files/ObjectStore/ObjectStoreStorage.php

Spacing +14 added lines, -14 removed lines

@@ -57,9 +57,9 @@ 
 			throw new \Exception('missing IObjectStore instance');
 		}
 		if (isset($params['storageid'])) {
-			$this->id = 'object::store:' . $params['storageid'];
+			$this->id = 'object::store:'.$params['storageid'];
 		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
+			$this->id = 'object::store:'.$this->objectStore->getStorageId();
 		}
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
@@ -193,7 +193,7 @@ 
 				if ($ex->getCode() !== 404) {
 					$this->logger->logException($ex, [
 						'app' => 'objectstore',
-						'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
+						'message' => 'Could not delete object '.$this->getURN($stat['fileid']).' for '.$path,
 					]);
 					return false;
 				}
@@ -225,7 +225,7 @@ 
 	 */
 	public function getURN($fileId) {
 		if (is_numeric($fileId)) {
-			return $this->objectPrefix . $fileId;
+			return $this->objectPrefix.$fileId;
 		}
 		return null;
 	}
@@ -279,13 +279,13 @@ 
 					} catch (NotFoundException $e) {
 						$this->logger->logException($e, [
 							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'message' => 'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 						]);
 						throw $e;
 					} catch (\Exception $ex) {
 						$this->logger->logException($ex, [
 							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'message' => 'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 						]);
 						return false;
 					}
@@ -298,7 +298,7 @@ 
 			case 'wb+':
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 			case 'a':
@@ -315,7 +315,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}
@@ -324,7 +324,7 @@ 
 
 	public function file_exists($path) {
 		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
+		return (bool) $this->stat($path);
 	}
 
 	public function rename($source, $target) {
@@ -381,7 +381,7 @@ 
 			} catch (\Exception $ex) {
 				$this->logger->logException($ex, [
 					'app' => 'objectstore',
-					'message' => 'Could not create object for ' . $path,
+					'message' => 'Could not create object for '.$path,
 				]);
 				throw $ex;
 			}
@@ -426,7 +426,7 @@ 
 		}
 		// update stat with new data
 		$mTime = time();
-		$stat['size'] = (int)$size;
+		$stat['size'] = (int) $size;
 		$stat['mtime'] = $mTime;
 		$stat['storage_mtime'] = $mTime;
 
@@ -437,13 +437,13 @@ 
 		$stat['etag'] = $this->getETag($path);
 
 		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
+		$uploadPath = $exists ? $path : $path.'.part';
 		$fileId = $this->getCache()->put($uploadPath, $stat);
 		$urn = $this->getURN($fileId);
 		try {
 			//upload to object storage
 			if ($size === null) {
-				$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
+				$countStream = CountWrapper::wrap($stream, function($writtenSize) use ($fileId, &$size) {
 					$this->getCache()->update($fileId, [
 						'size' => $writtenSize
 					]);
@@ -460,7 +460,7 @@ 
 			$this->getCache()->remove($uploadPath);
 			$this->logger->logException($ex, [
 				'app' => 'objectstore',
-				'message' => 'Could not create object ' . $urn . ' for ' . $path,
+				'message' => 'Could not create object '.$urn.' for '.$path,
 			]);
 			throw $ex; // make this bubble up
 		}

Indentation +451 added lines, -451 removed lines

@@ -37,455 +37,455 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class ObjectStoreStorage extends \OC\Files\Storage\Common {
-	/**
-	 * @var \OCP\Files\ObjectStore\IObjectStore $objectStore
-	 */
-	protected $objectStore;
-	/**
-	 * @var string $id
-	 */
-	protected $id;
-	/**
-	 * @var \OC\User\User $user
-	 */
-	protected $user;
-
-	private $objectPrefix = 'urn:oid:';
-
-	private $logger;
-
-	public function __construct($params) {
-		if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
-			$this->objectStore = $params['objectstore'];
-		} else {
-			throw new \Exception('missing IObjectStore instance');
-		}
-		if (isset($params['storageid'])) {
-			$this->id = 'object::store:' . $params['storageid'];
-		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
-		}
-		if (isset($params['objectPrefix'])) {
-			$this->objectPrefix = $params['objectPrefix'];
-		}
-		//initialize cache with root directory in cache
-		if (!$this->is_dir('/')) {
-			$this->mkdir('/');
-		}
-
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->file_exists($path)) {
-			return false;
-		}
-
-		$mTime = time();
-		$data = [
-			'mimetype' => 'httpd/unix-directory',
-			'size' => 0,
-			'mtime' => $mTime,
-			'storage_mtime' => $mTime,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		];
-		if ($path === '') {
-			//create root on the fly
-			$data['etag'] = $this->getETag('');
-			$this->getCache()->put('', $data);
-			return true;
-		} else {
-			// if parent does not exist, create it
-			$parent = $this->normalizePath(dirname($path));
-			$parentType = $this->filetype($parent);
-			if ($parentType === false) {
-				if (!$this->mkdir($parent)) {
-					// something went wrong
-					return false;
-				}
-			} elseif ($parentType === 'file') {
-				// parent is a file
-				return false;
-			}
-			// finally create the new dir
-			$mTime = time(); // update mtime
-			$data['mtime'] = $mTime;
-			$data['storage_mtime'] = $mTime;
-			$data['etag'] = $this->getETag($path);
-			$this->getCache()->put($path, $data);
-			return true;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-		//FIXME why do we sometimes get a path like 'files//username'?
-		$path = str_replace('//', '/', $path);
-
-		// dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
-		if (!$path || $path === '.') {
-			$path = '';
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Object Stores use a NoopScanner because metadata is directly stored in
-	 * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
-	 * @return \OC\Files\ObjectStore\NoopScanner
-	 */
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->scanner)) {
-			$this->scanner = new NoopScanner($storage);
-		}
-		return $this->scanner;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if (!$this->is_dir($path)) {
-			return false;
-		}
-
-		if (!$this->rmObjects($path)) {
-			return false;
-		}
-
-		$this->getCache()->remove($path);
-
-		return true;
-	}
-
-	private function rmObjects($path) {
-		$children = $this->getCache()->getFolderContents($path);
-		foreach ($children as $child) {
-			if ($child['mimetype'] === 'httpd/unix-directory') {
-				if (!$this->rmObjects($child['path'])) {
-					return false;
-				}
-			} else {
-				if (!$this->unlink($child['path'])) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-		$stat = $this->stat($path);
-
-		if ($stat && isset($stat['fileid'])) {
-			if ($stat['mimetype'] === 'httpd/unix-directory') {
-				return $this->rmdir($path);
-			}
-			try {
-				$this->objectStore->deleteObject($this->getURN($stat['fileid']));
-			} catch (\Exception $ex) {
-				if ($ex->getCode() !== 404) {
-					$this->logger->logException($ex, [
-						'app' => 'objectstore',
-						'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
-					]);
-					return false;
-				}
-				//removing from cache is ok as it does not exist in the objectstore anyway
-			}
-			$this->getCache()->remove($path);
-			return true;
-		}
-		return false;
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-		$cacheEntry = $this->getCache()->get($path);
-		if ($cacheEntry instanceof CacheEntry) {
-			return $cacheEntry->getData();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Override this method if you need a different unique resource identifier for your object storage implementation.
-	 * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
-	 * You may need a mapping table to store your URN if it cannot be generated from the fileid.
-	 *
-	 * @param int $fileId the fileid
-	 * @return null|string the unified resource name used to identify the object
-	 */
-	public function getURN($fileId) {
-		if (is_numeric($fileId)) {
-			return $this->objectPrefix . $fileId;
-		}
-		return null;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$files = [];
-			$folderContents = $this->getCache()->getFolderContents($path);
-			foreach ($folderContents as $file) {
-				$files[] = $file['name'];
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			return false;
-		}
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-		$stat = $this->stat($path);
-		if ($stat) {
-			if ($stat['mimetype'] === 'httpd/unix-directory') {
-				return 'dir';
-			}
-			return 'file';
-		} else {
-			return false;
-		}
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		if (strrpos($path, '.') !== false) {
-			$ext = substr($path, strrpos($path, '.'));
-		} else {
-			$ext = '';
-		}
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$stat = $this->stat($path);
-				if (is_array($stat)) {
-					try {
-						return $this->objectStore->readObject($this->getURN($stat['fileid']));
-					} catch (NotFoundException $e) {
-						$this->logger->logException($e, [
-							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-						]);
-						throw $e;
-					} catch (\Exception $ex) {
-						$this->logger->logException($ex, [
-							'app' => 'objectstore',
-							'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-						]);
-						return false;
-					}
-				} else {
-					return false;
-				}
-				// no break
-			case 'w':
-			case 'wb':
-			case 'w+':
-			case 'wb+':
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($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 file_exists($path) {
-		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
-	}
-
-	public function rename($source, $target) {
-		$source = $this->normalizePath($source);
-		$target = $this->normalizePath($target);
-		$this->remove($target);
-		$this->getCache()->move($source, $target);
-		$this->touch(dirname($target));
-		return true;
-	}
-
-	public function getMimeType($path) {
-		$path = $this->normalizePath($path);
-		return parent::getMimeType($path);
-	}
-
-	public function touch($path, $mtime = null) {
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-
-		$path = $this->normalizePath($path);
-		$dirName = dirname($path);
-		$parentExists = $this->is_dir($dirName);
-		if (!$parentExists) {
-			return false;
-		}
-
-		$stat = $this->stat($path);
-		if (is_array($stat)) {
-			// update existing mtime in db
-			$stat['mtime'] = $mtime;
-			$this->getCache()->update($stat['fileid'], $stat);
-		} else {
-			try {
-				//create a empty file, need to have at least on char to make it
-				// work with all object storage implementations
-				$this->file_put_contents($path, ' ');
-				$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-				$stat = [
-					'etag' => $this->getETag($path),
-					'mimetype' => $mimeType,
-					'size' => 0,
-					'mtime' => $mtime,
-					'storage_mtime' => $mtime,
-					'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
-				];
-				$this->getCache()->put($path, $stat);
-			} catch (\Exception $ex) {
-				$this->logger->logException($ex, [
-					'app' => 'objectstore',
-					'message' => 'Could not create object for ' . $path,
-				]);
-				throw $ex;
-			}
-		}
-		return true;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		$size = filesize($tmpFile);
-		$this->writeStream($path, fopen($tmpFile, 'r'), $size);
-	}
-
-	/**
-	 * external changes are not supported, exclusive access to the object storage is assumed
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return false
-	 */
-	public function hasUpdated($path, $time) {
-		return false;
-	}
-
-	public function needsPartFile() {
-		return false;
-	}
-
-	public function file_put_contents($path, $data) {
-		$handle = $this->fopen($path, 'w+');
-		fwrite($handle, $data);
-		fclose($handle);
-		return true;
-	}
-
-	public function writeStream(string $path, $stream, int $size = null): int {
-		$stat = $this->stat($path);
-		if (empty($stat)) {
-			// create new file
-			$stat = [
-				'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
-			];
-		}
-		// update stat with new data
-		$mTime = time();
-		$stat['size'] = (int)$size;
-		$stat['mtime'] = $mTime;
-		$stat['storage_mtime'] = $mTime;
-
-		$mimetypeDetector = \OC::$server->getMimeTypeDetector();
-		$mimetype = $mimetypeDetector->detectPath($path);
-
-		$stat['mimetype'] = $mimetype;
-		$stat['etag'] = $this->getETag($path);
-
-		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
-		$fileId = $this->getCache()->put($uploadPath, $stat);
-		$urn = $this->getURN($fileId);
-		try {
-			//upload to object storage
-			if ($size === null) {
-				$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
-					$this->getCache()->update($fileId, [
-						'size' => $writtenSize
-					]);
-					$size = $writtenSize;
-				});
-				$this->objectStore->writeObject($urn, $countStream);
-				if (is_resource($countStream)) {
-					fclose($countStream);
-				}
-			} else {
-				$this->objectStore->writeObject($urn, $stream);
-			}
-		} catch (\Exception $ex) {
-			$this->getCache()->remove($uploadPath);
-			$this->logger->logException($ex, [
-				'app' => 'objectstore',
-				'message' => 'Could not create object ' . $urn . ' for ' . $path,
-			]);
-			throw $ex; // make this bubble up
-		}
-
-		if (!$exists) {
-			if ($this->objectStore->objectExists($urn)) {
-				$this->getCache()->move($uploadPath, $path);
-			} else {
-				$this->getCache()->remove($uploadPath);
-				throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
-			}
-		}
-
-		return $size;
-	}
-
-	public function getObjectStore(): IObjectStore {
-		return $this->objectStore;
-	}
+    /**
+     * @var \OCP\Files\ObjectStore\IObjectStore $objectStore
+     */
+    protected $objectStore;
+    /**
+     * @var string $id
+     */
+    protected $id;
+    /**
+     * @var \OC\User\User $user
+     */
+    protected $user;
+
+    private $objectPrefix = 'urn:oid:';
+
+    private $logger;
+
+    public function __construct($params) {
+        if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
+            $this->objectStore = $params['objectstore'];
+        } else {
+            throw new \Exception('missing IObjectStore instance');
+        }
+        if (isset($params['storageid'])) {
+            $this->id = 'object::store:' . $params['storageid'];
+        } else {
+            $this->id = 'object::store:' . $this->objectStore->getStorageId();
+        }
+        if (isset($params['objectPrefix'])) {
+            $this->objectPrefix = $params['objectPrefix'];
+        }
+        //initialize cache with root directory in cache
+        if (!$this->is_dir('/')) {
+            $this->mkdir('/');
+        }
+
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->file_exists($path)) {
+            return false;
+        }
+
+        $mTime = time();
+        $data = [
+            'mimetype' => 'httpd/unix-directory',
+            'size' => 0,
+            'mtime' => $mTime,
+            'storage_mtime' => $mTime,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ];
+        if ($path === '') {
+            //create root on the fly
+            $data['etag'] = $this->getETag('');
+            $this->getCache()->put('', $data);
+            return true;
+        } else {
+            // if parent does not exist, create it
+            $parent = $this->normalizePath(dirname($path));
+            $parentType = $this->filetype($parent);
+            if ($parentType === false) {
+                if (!$this->mkdir($parent)) {
+                    // something went wrong
+                    return false;
+                }
+            } elseif ($parentType === 'file') {
+                // parent is a file
+                return false;
+            }
+            // finally create the new dir
+            $mTime = time(); // update mtime
+            $data['mtime'] = $mTime;
+            $data['storage_mtime'] = $mTime;
+            $data['etag'] = $this->getETag($path);
+            $this->getCache()->put($path, $data);
+            return true;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+        //FIXME why do we sometimes get a path like 'files//username'?
+        $path = str_replace('//', '/', $path);
+
+        // dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
+        if (!$path || $path === '.') {
+            $path = '';
+        }
+
+        return $path;
+    }
+
+    /**
+     * Object Stores use a NoopScanner because metadata is directly stored in
+     * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
+     * @return \OC\Files\ObjectStore\NoopScanner
+     */
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->scanner)) {
+            $this->scanner = new NoopScanner($storage);
+        }
+        return $this->scanner;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if (!$this->is_dir($path)) {
+            return false;
+        }
+
+        if (!$this->rmObjects($path)) {
+            return false;
+        }
+
+        $this->getCache()->remove($path);
+
+        return true;
+    }
+
+    private function rmObjects($path) {
+        $children = $this->getCache()->getFolderContents($path);
+        foreach ($children as $child) {
+            if ($child['mimetype'] === 'httpd/unix-directory') {
+                if (!$this->rmObjects($child['path'])) {
+                    return false;
+                }
+            } else {
+                if (!$this->unlink($child['path'])) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+        $stat = $this->stat($path);
+
+        if ($stat && isset($stat['fileid'])) {
+            if ($stat['mimetype'] === 'httpd/unix-directory') {
+                return $this->rmdir($path);
+            }
+            try {
+                $this->objectStore->deleteObject($this->getURN($stat['fileid']));
+            } catch (\Exception $ex) {
+                if ($ex->getCode() !== 404) {
+                    $this->logger->logException($ex, [
+                        'app' => 'objectstore',
+                        'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
+                    ]);
+                    return false;
+                }
+                //removing from cache is ok as it does not exist in the objectstore anyway
+            }
+            $this->getCache()->remove($path);
+            return true;
+        }
+        return false;
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+        $cacheEntry = $this->getCache()->get($path);
+        if ($cacheEntry instanceof CacheEntry) {
+            return $cacheEntry->getData();
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Override this method if you need a different unique resource identifier for your object storage implementation.
+     * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
+     * You may need a mapping table to store your URN if it cannot be generated from the fileid.
+     *
+     * @param int $fileId the fileid
+     * @return null|string the unified resource name used to identify the object
+     */
+    public function getURN($fileId) {
+        if (is_numeric($fileId)) {
+            return $this->objectPrefix . $fileId;
+        }
+        return null;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $files = [];
+            $folderContents = $this->getCache()->getFolderContents($path);
+            foreach ($folderContents as $file) {
+                $files[] = $file['name'];
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            return false;
+        }
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+        $stat = $this->stat($path);
+        if ($stat) {
+            if ($stat['mimetype'] === 'httpd/unix-directory') {
+                return 'dir';
+            }
+            return 'file';
+        } else {
+            return false;
+        }
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        if (strrpos($path, '.') !== false) {
+            $ext = substr($path, strrpos($path, '.'));
+        } else {
+            $ext = '';
+        }
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $stat = $this->stat($path);
+                if (is_array($stat)) {
+                    try {
+                        return $this->objectStore->readObject($this->getURN($stat['fileid']));
+                    } catch (NotFoundException $e) {
+                        $this->logger->logException($e, [
+                            'app' => 'objectstore',
+                            'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                        ]);
+                        throw $e;
+                    } catch (\Exception $ex) {
+                        $this->logger->logException($ex, [
+                            'app' => 'objectstore',
+                            'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                        ]);
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+                // no break
+            case 'w':
+            case 'wb':
+            case 'w+':
+            case 'wb+':
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($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 file_exists($path) {
+        $path = $this->normalizePath($path);
+        return (bool)$this->stat($path);
+    }
+
+    public function rename($source, $target) {
+        $source = $this->normalizePath($source);
+        $target = $this->normalizePath($target);
+        $this->remove($target);
+        $this->getCache()->move($source, $target);
+        $this->touch(dirname($target));
+        return true;
+    }
+
+    public function getMimeType($path) {
+        $path = $this->normalizePath($path);
+        return parent::getMimeType($path);
+    }
+
+    public function touch($path, $mtime = null) {
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+
+        $path = $this->normalizePath($path);
+        $dirName = dirname($path);
+        $parentExists = $this->is_dir($dirName);
+        if (!$parentExists) {
+            return false;
+        }
+
+        $stat = $this->stat($path);
+        if (is_array($stat)) {
+            // update existing mtime in db
+            $stat['mtime'] = $mtime;
+            $this->getCache()->update($stat['fileid'], $stat);
+        } else {
+            try {
+                //create a empty file, need to have at least on char to make it
+                // work with all object storage implementations
+                $this->file_put_contents($path, ' ');
+                $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+                $stat = [
+                    'etag' => $this->getETag($path),
+                    'mimetype' => $mimeType,
+                    'size' => 0,
+                    'mtime' => $mtime,
+                    'storage_mtime' => $mtime,
+                    'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
+                ];
+                $this->getCache()->put($path, $stat);
+            } catch (\Exception $ex) {
+                $this->logger->logException($ex, [
+                    'app' => 'objectstore',
+                    'message' => 'Could not create object for ' . $path,
+                ]);
+                throw $ex;
+            }
+        }
+        return true;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        $size = filesize($tmpFile);
+        $this->writeStream($path, fopen($tmpFile, 'r'), $size);
+    }
+
+    /**
+     * external changes are not supported, exclusive access to the object storage is assumed
+     *
+     * @param string $path
+     * @param int $time
+     * @return false
+     */
+    public function hasUpdated($path, $time) {
+        return false;
+    }
+
+    public function needsPartFile() {
+        return false;
+    }
+
+    public function file_put_contents($path, $data) {
+        $handle = $this->fopen($path, 'w+');
+        fwrite($handle, $data);
+        fclose($handle);
+        return true;
+    }
+
+    public function writeStream(string $path, $stream, int $size = null): int {
+        $stat = $this->stat($path);
+        if (empty($stat)) {
+            // create new file
+            $stat = [
+                'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
+            ];
+        }
+        // update stat with new data
+        $mTime = time();
+        $stat['size'] = (int)$size;
+        $stat['mtime'] = $mTime;
+        $stat['storage_mtime'] = $mTime;
+
+        $mimetypeDetector = \OC::$server->getMimeTypeDetector();
+        $mimetype = $mimetypeDetector->detectPath($path);
+
+        $stat['mimetype'] = $mimetype;
+        $stat['etag'] = $this->getETag($path);
+
+        $exists = $this->getCache()->inCache($path);
+        $uploadPath = $exists ? $path : $path . '.part';
+        $fileId = $this->getCache()->put($uploadPath, $stat);
+        $urn = $this->getURN($fileId);
+        try {
+            //upload to object storage
+            if ($size === null) {
+                $countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
+                    $this->getCache()->update($fileId, [
+                        'size' => $writtenSize
+                    ]);
+                    $size = $writtenSize;
+                });
+                $this->objectStore->writeObject($urn, $countStream);
+                if (is_resource($countStream)) {
+                    fclose($countStream);
+                }
+            } else {
+                $this->objectStore->writeObject($urn, $stream);
+            }
+        } catch (\Exception $ex) {
+            $this->getCache()->remove($uploadPath);
+            $this->logger->logException($ex, [
+                'app' => 'objectstore',
+                'message' => 'Could not create object ' . $urn . ' for ' . $path,
+            ]);
+            throw $ex; // make this bubble up
+        }
+
+        if (!$exists) {
+            if ($this->objectStore->objectExists($urn)) {
+                $this->getCache()->move($uploadPath, $path);
+            } else {
+                $this->getCache()->remove($uploadPath);
+                throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
+            }
+        }
+
+        return $size;
+    }
+
+    public function getObjectStore(): IObjectStore {
+        return $this->objectStore;
+    }
 }

apps/dav/lib/Migration/RegenerateBirthdayCalendars.php

Indentation +33 added lines, -33 removed lines

@@ -30,43 +30,43 @@
 
 class RegenerateBirthdayCalendars implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IConfig $config) {
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IConfig $config) {
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Regenerating birthday calendars to use new icons and fix old birthday events without year';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Regenerating birthday calendars to use new icons and fix old birthday events without year';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$output->info('Adding background jobs to regenerate birthday calendar');
-		$this->jobList->add(RegisterRegenerateBirthdayCalendars::class);
+        $output->info('Adding background jobs to regenerate birthday calendar');
+        $this->jobList->add(RegisterRegenerateBirthdayCalendars::class);
 
-		// if all were done, no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix', 'yes');
-	}
+        // if all were done, no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'regeneratedBirthdayCalendarsForYearFix', 'yes');
+    }
 }

lib/public/IContainer.php

Indentation +51 added lines, -51 removed lines

@@ -47,59 +47,59 @@
  */
 interface IContainer {
 
-	/**
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @return \stdClass
-	 * @since 8.2.0
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name);
+    /**
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @return \stdClass
+     * @since 8.2.0
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name);
 
-	/**
-	 * Look up a service for a given name in the container.
-	 *
-	 * @param string $name
-	 * @param bool $autoload Should we try to autoload the service. If we are trying to resolve built in types this makes no sense for example
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 * @since 6.0.0
-	 */
-	public function query(string $name, bool $autoload = true);
+    /**
+     * Look up a service for a given name in the container.
+     *
+     * @param string $name
+     * @param bool $autoload Should we try to autoload the service. If we are trying to resolve built in types this makes no sense for example
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     * @since 6.0.0
+     */
+    public function query(string $name, bool $autoload = true);
 
-	/**
-	 * A value is stored in the container with it's corresponding name
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerParameter($name, $value);
+    /**
+     * A value is stored in the container with it's corresponding name
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerParameter($name, $value);
 
-	/**
-	 * A service is registered in the container where a closure is passed in which will actually
-	 * create the service on demand.
-	 * In case the parameter $shared is set to true (the default usage) the once created service will remain in
-	 * memory and be reused on subsequent calls.
-	 * In case the parameter is false the service will be recreated on every call.
-	 *
-	 * @param string $name
-	 * @param \Closure $closure
-	 * @param bool $shared
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerService($name, Closure $closure, $shared = true);
+    /**
+     * A service is registered in the container where a closure is passed in which will actually
+     * create the service on demand.
+     * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+     * memory and be reused on subsequent calls.
+     * In case the parameter is false the service will be recreated on every call.
+     *
+     * @param string $name
+     * @param \Closure $closure
+     * @param bool $shared
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerService($name, Closure $closure, $shared = true);
 
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 * @since 8.2.0
-	 */
-	public function registerAlias($alias, $target);
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     * @since 8.2.0
+     */
+    public function registerAlias($alias, $target);
 }

apps/federatedfilesharing/templates/settings-personal.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 <div id="fileSharingSettings" class="section">
 	<h2 data-anchor-name="federated-cloud"><?php p($l->t('Federated Cloud')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-	title="<?php p($l->t('Open documentation'));?>"
+	title="<?php p($l->t('Open documentation')); ?>"
 	href="<?php p(link_to_docs('user-sharing-federated')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p>
 

apps/federatedfilesharing/lib/Settings/Personal.php

Indentation +59 added lines, -59 removed lines

@@ -33,68 +33,68 @@
 
 class Personal implements ISettings {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IL10N */
-	private $l;
-	/** @var \OC_Defaults */
-	private $defaults;
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IL10N */
+    private $l;
+    /** @var \OC_Defaults */
+    private $defaults;
 
-	public function __construct(
-		FederatedShareProvider $federatedShareProvider, #
-		IUserSession $userSession,
-		IL10N $l,
-		\OC_Defaults $defaults
-	) {
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->userSession = $userSession;
-		$this->l = $l;
-		$this->defaults = $defaults;
-	}
+    public function __construct(
+        FederatedShareProvider $federatedShareProvider, #
+        IUserSession $userSession,
+        IL10N $l,
+        \OC_Defaults $defaults
+    ) {
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->userSession = $userSession;
+        $this->l = $l;
+        $this->defaults = $defaults;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/sharing#' . $cloudID;
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $cloudID = $this->userSession->getUser()->getCloudId();
+        $url = 'https://nextcloud.com/sharing#' . $cloudID;
 
-		$parameters = [
-			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
-			'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
-			'logoPath' => $this->defaults->getLogo(),
-			'reference' => $url,
-			'cloudId' => $cloudID,
-			'color' => $this->defaults->getColorPrimary(),
-			'textColor' => "#ffffff",
-		];
-		return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
-	}
+        $parameters = [
+            'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
+            'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
+            'logoPath' => $this->defaults->getLogo(),
+            'reference' => $url,
+            'cloudId' => $cloudID,
+            'color' => $this->defaults->getColorPrimary(),
+            'textColor' => "#ffffff",
+        ];
+        return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() ||
-			$this->federatedShareProvider->isIncomingServer2serverGroupShareEnabled()) {
-			return 'sharing';
-		}
-		return null;
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() ||
+            $this->federatedShareProvider->isIncomingServer2serverGroupShareEnabled()) {
+            return 'sharing';
+        }
+        return null;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 40;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 */
 	public function getForm() {
 		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://nextcloud.com/sharing#' . $cloudID;
+		$url = 'https://nextcloud.com/sharing#'.$cloudID;
 
 		$parameters = [
 			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),

apps/files_versions/lib/Controller/PreviewController.php

Indentation +58 added lines, -58 removed lines

@@ -38,70 +38,70 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IVersionManager */
-	private $versionManager;
+    /** @var IVersionManager */
+    private $versionManager;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IRootFolder $rootFolder,
-		IUserSession $userSession,
-		IMimeTypeDetector $mimeTypeDetector,
-		IVersionManager $versionManager,
-		IPreview $previewManager
-	) {
-		parent::__construct($appName, $request);
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IRootFolder $rootFolder,
+        IUserSession $userSession,
+        IMimeTypeDetector $mimeTypeDetector,
+        IVersionManager $versionManager,
+        IPreview $previewManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->versionManager = $versionManager;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->versionManager = $versionManager;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $version
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44,
-		$version = ''
-	) {
-		if ($file === '' || $version === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $version
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44,
+        $version = ''
+    ) {
+        if ($file === '' || $version === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$user = $this->userSession->getUser();
-			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-			$file = $userFolder->get($file);
-			$versionFile = $this->versionManager->getVersionFile($user, $file, $version);
-			$preview = $this->previewManager->getPreview($versionFile, $x, $y, true, IPreview::MODE_FILL, $versionFile->getMimetype());
-			return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+        try {
+            $user = $this->userSession->getUser();
+            $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+            $file = $userFolder->get($file);
+            $versionFile = $this->versionManager->getVersionFile($user, $file, $version);
+            $preview = $this->previewManager->getPreview($versionFile, $x, $y, true, IPreview::MODE_FILL, $versionFile->getMimetype());
+            return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/files_versions/lib/Versions/Version.php

Indentation +84 added lines, -84 removed lines

@@ -26,88 +26,88 @@
 use OCP\IUser;
 
 class Version implements IVersion {
-	/** @var int */
-	private $timestamp;
-
-	/** @var int|string */
-	private $revisionId;
-
-	/** @var string */
-	private $name;
-
-	/** @var int */
-	private $size;
-
-	/** @var string */
-	private $mimetype;
-
-	/** @var string */
-	private $path;
-
-	/** @var FileInfo */
-	private $sourceFileInfo;
-
-	/** @var IVersionBackend */
-	private $backend;
-
-	/** @var IUser */
-	private $user;
-
-	public function __construct(
-		int $timestamp,
-		$revisionId,
-		string $name,
-		int $size,
-		string $mimetype,
-		string $path,
-		FileInfo $sourceFileInfo,
-		IVersionBackend $backend,
-		IUser $user
-	) {
-		$this->timestamp = $timestamp;
-		$this->revisionId = $revisionId;
-		$this->name = $name;
-		$this->size = $size;
-		$this->mimetype = $mimetype;
-		$this->path = $path;
-		$this->sourceFileInfo = $sourceFileInfo;
-		$this->backend = $backend;
-		$this->user = $user;
-	}
-
-	public function getBackend(): IVersionBackend {
-		return $this->backend;
-	}
-
-	public function getSourceFile(): FileInfo {
-		return $this->sourceFileInfo;
-	}
-
-	public function getRevisionId() {
-		return $this->revisionId;
-	}
-
-	public function getTimestamp(): int {
-		return $this->timestamp;
-	}
-
-	public function getSize(): int {
-		return $this->size;
-	}
-
-	public function getSourceFileName(): string {
-		return $this->name;
-	}
-
-	public function getMimeType(): string {
-		return $this->mimetype;
-	}
-
-	public function getVersionPath(): string {
-		return $this->path;
-	}
-
-	public function getUser(): IUser {
-		return $this->user;
-	}
+    /** @var int */
+    private $timestamp;
+
+    /** @var int|string */
+    private $revisionId;
+
+    /** @var string */
+    private $name;
+
+    /** @var int */
+    private $size;
+
+    /** @var string */
+    private $mimetype;
+
+    /** @var string */
+    private $path;
+
+    /** @var FileInfo */
+    private $sourceFileInfo;
+
+    /** @var IVersionBackend */
+    private $backend;
+
+    /** @var IUser */
+    private $user;
+
+    public function __construct(
+        int $timestamp,
+        $revisionId,
+        string $name,
+        int $size,
+        string $mimetype,
+        string $path,
+        FileInfo $sourceFileInfo,
+        IVersionBackend $backend,
+        IUser $user
+    ) {
+        $this->timestamp = $timestamp;
+        $this->revisionId = $revisionId;
+        $this->name = $name;
+        $this->size = $size;
+        $this->mimetype = $mimetype;
+        $this->path = $path;
+        $this->sourceFileInfo = $sourceFileInfo;
+        $this->backend = $backend;
+        $this->user = $user;
+    }
+
+    public function getBackend(): IVersionBackend {
+        return $this->backend;
+    }
+
+    public function getSourceFile(): FileInfo {
+        return $this->sourceFileInfo;
+    }
+
+    public function getRevisionId() {
+        return $this->revisionId;
+    }
+
+    public function getTimestamp(): int {
+        return $this->timestamp;
+    }
+
+    public function getSize(): int {
+        return $this->size;
+    }
+
+    public function getSourceFileName(): string {
+        return $this->name;
+    }
+
+    public function getMimeType(): string {
+        return $this->mimetype;
+    }
+
+    public function getVersionPath(): string {
+        return $this->path;
+    }
+
+    public function getUser(): IUser {
+        return $this->user;
+    }
 }

apps/files_versions/lib/Versions/IVersion.php

Indentation +59 added lines, -59 removed lines

@@ -29,71 +29,71 @@
  * @since 15.0.0
  */
 interface IVersion {
-	/**
-	 * @return IVersionBackend
-	 * @since 15.0.0
-	 */
-	public function getBackend(): IVersionBackend;
+    /**
+     * @return IVersionBackend
+     * @since 15.0.0
+     */
+    public function getBackend(): IVersionBackend;
 
-	/**
-	 * Get the file info of the source file
-	 *
-	 * @return FileInfo
-	 * @since 15.0.0
-	 */
-	public function getSourceFile(): FileInfo;
+    /**
+     * Get the file info of the source file
+     *
+     * @return FileInfo
+     * @since 15.0.0
+     */
+    public function getSourceFile(): FileInfo;
 
-	/**
-	 * Get the id of the revision for the file
-	 *
-	 * @return int|string
-	 * @since 15.0.0
-	 */
-	public function getRevisionId();
+    /**
+     * Get the id of the revision for the file
+     *
+     * @return int|string
+     * @since 15.0.0
+     */
+    public function getRevisionId();
 
-	/**
-	 * Get the timestamp this version was created
-	 *
-	 * @return int
-	 * @since 15.0.0
-	 */
-	public function getTimestamp(): int;
+    /**
+     * Get the timestamp this version was created
+     *
+     * @return int
+     * @since 15.0.0
+     */
+    public function getTimestamp(): int;
 
-	/**
-	 * Get the size of this version
-	 *
-	 * @return int
-	 * @since 15.0.0
-	 */
-	public function getSize(): int;
+    /**
+     * Get the size of this version
+     *
+     * @return int
+     * @since 15.0.0
+     */
+    public function getSize(): int;
 
-	/**
-	 * Get the name of the source file at the time of making this version
-	 *
-	 * @return string
-	 * @since 15.0.0
-	 */
-	public function getSourceFileName(): string;
+    /**
+     * Get the name of the source file at the time of making this version
+     *
+     * @return string
+     * @since 15.0.0
+     */
+    public function getSourceFileName(): string;
 
-	/**
-	 * Get the mimetype of this version
-	 *
-	 * @return string
-	 * @since 15.0.0
-	 */
-	public function getMimeType(): string;
+    /**
+     * Get the mimetype of this version
+     *
+     * @return string
+     * @since 15.0.0
+     */
+    public function getMimeType(): string;
 
-	/**
-	 * Get the path of this version
-	 *
-	 * @return string
-	 * @since 15.0.0
-	 */
-	public function getVersionPath(): string;
+    /**
+     * Get the path of this version
+     *
+     * @return string
+     * @since 15.0.0
+     */
+    public function getVersionPath(): string;
 
-	/**
-	 * @return IUser
-	 * @since 15.0.0
-	 */
-	public function getUser(): IUser;
+    /**
+     * @return IUser
+     * @since 15.0.0
+     */
+    public function getUser(): IUser;
 }