From 9bbfb5ffebf50e936b185e4e8dfea0b3c4449de5 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 4 Jan 2017 16:51:44 +0100
Subject: [PATCH] Rewrite old preview endpoint for PreviewManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/PreviewManager.php | 24 +++++++++++++++++++++---
 lib/private/Server.php         |  3 ++-
 lib/public/IPreview.php        |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php
index 36b3730a72..8c5a7ad29f 100644
--- a/lib/private/PreviewManager.php
+++ b/lib/private/PreviewManager.php
@@ -68,6 +68,9 @@ class PreviewManager implements IPreview {
 	/** @var array */
 	protected $defaultProviders;
 
+	/** @var string */
+	protected $userId;
+
 	/**
 	 * PreviewManager constructor.
 	 *
@@ -75,15 +78,18 @@ class PreviewManager implements IPreview {
 	 * @param IRootFolder $rootFolder
 	 * @param IAppData $appData
 	 * @param EventDispatcherInterface $eventDispatcher
+	 * @param string $userId
 	 */
 	public function __construct(IConfig $config,
 								IRootFolder $rootFolder,
 								IAppData $appData,
-								EventDispatcherInterface $eventDispatcher) {
+								EventDispatcherInterface $eventDispatcher,
+								$userId) {
 		$this->config = $config;
 		$this->rootFolder = $rootFolder;
 		$this->appData = $appData;
 		$this->eventDispatcher = $eventDispatcher;
+		$this->userId = $userId;
 	}
 
 	/**
@@ -144,10 +150,22 @@ class PreviewManager implements IPreview {
 	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
 	 * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
 	 * @return \OCP\IImage
+	 * @deprecated 11 Use getPreview
 	 */
 	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false) {
-		$preview = new \OC\Preview('', '/', $file, $maxX, $maxY, $scaleUp);
-		return $preview->getPreview();
+		try {
+			$userRoot = $this->rootFolder->getUserFolder($this->userId)->getParent();
+			$node = $userRoot->get($file);
+			if (!($file instanceof File)) {
+				throw new NotFoundException();
+			}
+
+			$preview = $this->getPreview($node, $maxX, $maxY);
+		} catch (\Exception $e) {
+			return new \OC_Image();
+		}
+
+		return new \OC_Image($preview->getContent());
 	}
 
 	/**
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 5bc72e3614..06be694622 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -124,7 +124,8 @@ class Server extends ServerContainer implements IServerContainer {
 				$c->getConfig(),
 				$c->getRootFolder(),
 				$c->getAppDataDir('preview'),
-				$c->getEventDispatcher()
+				$c->getEventDispatcher(),
+				$c->getSession()->get('user_id')
 			);
 		});
 
diff --git a/lib/public/IPreview.php b/lib/public/IPreview.php
index a1a03fee3e..207539b117 100644
--- a/lib/public/IPreview.php
+++ b/lib/public/IPreview.php
@@ -86,7 +86,7 @@ interface IPreview {
 	 * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
 	 * @return \OCP\IImage
 	 * @since 6.0.0
-	 * @deprecated 9.2.0 Use getPreview
+	 * @deprecated 11 Use getPreview
 	 */
 	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);