Move over files_trashbin

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

apps/files_trashbin/ajax/preview.php

-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Georg Ehrke <georg@owncloud.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-\OC_Util::checkLoggedIn();
-\OC::$server->getSession()->close();
-
-if(!\OC_App::isEnabled('files_trashbin')){
-	exit;
-}
-
-$file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : '';
-$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44';
-$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44';
-$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
-
-if($file === '') {
-	\OC_Response::setStatus(400); //400 Bad Request
-	\OCP\Util::writeLog('core-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
-	exit;
-}
-
-if($maxX === 0 || $maxY === 0) {
-	\OC_Response::setStatus(400); //400 Bad Request
-	\OCP\Util::writeLog('core-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
-	exit;
-}
-
-try{
-	$preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files', $file);
-	$view = new \OC\Files\View('/'.\OC_User::getUser(). '/files_trashbin/files');
-	if ($view->is_dir($file)) {
-		$mimetype = 'httpd/unix-directory';
-	} else {
-		$pathInfo = pathinfo(ltrim($file, '/'));
-		$fileName = $pathInfo['basename'];
-		// if in root dir
-		if ($pathInfo['dirname'] === '.') {
-			// cut off the .d* suffix
-			$i = strrpos($fileName, '.');
-			if ($i !== false) {
-				$fileName = substr($fileName, 0, $i);
-			}
-		}
-		$mimetype = \OC::$server->getMimeTypeDetector()->detectPath($fileName);
-	}
-	$preview->setMimetype($mimetype);
-	$preview->setMaxX($maxX);
-	$preview->setMaxY($maxY);
-	$preview->setScalingUp($scalingUp);
-
-	$preview->showPreview();
-} catch (\OC\PreviewNotAvailableException $e) {
-	\OC_Response::setStatus(404);
-}catch(\Exception $e) {
-	\OC_Response::setStatus(500);
-	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
-}

apps/files_trashbin/appinfo/routes.php

 <?php
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @author Lukas Reschke <lukas@statuscode.ch>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
@@ -25,9 +26,16 @@
 namespace OCA\Files_Trashbin\AppInfo;
 
 $application = new Application();
+$application->registerRoutes($this, [
+	'routes' => [
+		[
+			'name' => 'Preview#getPreview',
+			'url' => '/ajax/preview.php',
+			'verb' => 'GET',
+		],
+	],
+]);
 
-$this->create('core_ajax_trashbin_preview', 'ajax/preview.php')
-	->actionInclude('files_trashbin/ajax/preview.php');
 $this->create('files_trashbin_ajax_delete', 'ajax/delete.php')
 	->actionInclude('files_trashbin/ajax/delete.php');
 $this->create('files_trashbin_ajax_isEmpty', 'ajax/isEmpty.php')

apps/files_trashbin/lib/Controller/PreviewController.php

+<?php
+/**
+ * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\IPreview;
+use OCP\IRequest;
+
+class PreviewController extends Controller {
+
+	/** @var IRootFolder */
+	private $rootFolder;
+
+	/** @var string */
+	private $userId;
+
+	/** @var IMimeTypeDetector */
+	private $mimeTypeDetector;
+
+	/** @var IPreview */
+	private $previewManager;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IRootFolder $rootFolder
+	 * @param $userId
+	 * @param IMimeTypeDetector $mimeTypeDetector
+	 * @param IPreview $previewManager
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								IRootFolder $rootFolder,
+								$userId,
+								IMimeTypeDetector $mimeTypeDetector,
+								IPreview $previewManager) {
+		parent::__construct($appName, $request);
+
+		$this->rootFolder = $rootFolder;
+		$this->userId = $userId;
+		$this->mimeTypeDetector = $mimeTypeDetector;
+		$this->previewManager = $previewManager;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 *
+	 * @param string $file
+	 * @param int $x
+	 * @param int $y
+	 * @return DataResponse|Http\FileDisplayResponse
+	 */
+	public function getPreview(
+		$file = '',
+		$x = 44,
+		$y = 44
+	) {
+		if ($file === '') {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		if ($x === 0 || $y === 0) {
+			return new DataResponse([], Http::STATUS_BAD_REQUEST);
+		}
+
+		try {
+			$userFolder = $this->rootFolder->getUserFolder($this->userId);
+			/** @var Folder $trash */
+			$trash = $userFolder->getParent()->get('files_trashbin/files');
+			$trashFile = $trash->get($file);
+
+			if ($trashFile instanceof Folder) {
+				return new DataResponse([], Http::STATUS_BAD_REQUEST);
+			}
+
+			/** @var File $trashFile */
+			$fileName = $trashFile->getName();
+			$i = strrpos($fileName, '.');
+			if ($i !== false) {
+				$fileName = substr($fileName, 0, $i);
+			}
+
+			$mimeType = $this->mimeTypeDetector->detectPath($fileName);
+
+			$f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+			return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+		} catch (NotFoundException $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		} catch (\OC\PreviewNotAvailableException $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}catch(\Exception $e) {
+			return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
+
+	}
+}