Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v11.0RC2
@@ -1,66 +0,0 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||
* | |||
* @author Björn Schießle <bjoern@schiessle.org> | |||
* @author Morris Jobke <hey@morrisjobke.de> | |||
* @author Roeland Jago Douma <roeland@famdouma.nl> | |||
* @author Thomas Müller <thomas.mueller@tmit.eu> | |||
* @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(); | |||
if(!\OC_App::isEnabled('files_versions')){ | |||
exit; | |||
} | |||
$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; | |||
$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : 44; | |||
$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : 44; | |||
$version = array_key_exists('version', $_GET) ? $_GET['version'] : ''; | |||
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; | |||
if($file === '' && $version === '') { | |||
\OC_Response::setStatus(400); //400 Bad Request | |||
\OCP\Util::writeLog('versions-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('versions-preview', 'x and/or y set to 0', \OCP\Util::DEBUG); | |||
exit; | |||
} | |||
try { | |||
list($user, $file) = \OCA\Files_Versions\Storage::getUidAndFilename($file); | |||
$preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version); | |||
$mimetype = \OC::$server->getMimeTypeDetector()->detectPath($file); | |||
$preview->setMimetype($mimetype); | |||
$preview->setMaxX($maxX); | |||
$preview->setMaxY($maxY); | |||
$preview->setScalingUp($scalingUp); | |||
$preview->showPreview(); | |||
} catch (\OCP\Files\NotFoundException $e) { | |||
\OC_Response::setStatus(404); | |||
\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG); | |||
} catch (\Exception $e) { | |||
\OC_Response::setStatus(500); | |||
\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG); | |||
} |
@@ -1,6 +1,7 @@ | |||
<?php | |||
/** | |||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||
* @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl> | |||
* | |||
* @author Björn Schießle <bjoern@schiessle.org> | |||
* @author Jörn Friedrich Dreyer <jfd@butonic.de> | |||
@@ -29,13 +30,17 @@ | |||
namespace OCA\Files_Versions\AppInfo; | |||
$application = new Application(); | |||
$application->registerRoutes($this, [ | |||
'routes' => [ | |||
[ | |||
'name' => 'Preview#getPreview', | |||
'url' => '/preview', | |||
'verb' => 'GET', | |||
], | |||
], | |||
]); | |||
/** @var $this \OCP\Route\IRouter */ | |||
$this->create('core_ajax_versions_preview', '/preview')->action( | |||
function() { | |||
require_once __DIR__ . '/../ajax/preview.php'; | |||
}); | |||
$this->create('files_versions_download', 'download.php') | |||
->actionInclude('files_versions/download.php'); | |||
$this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php') |
@@ -0,0 +1,111 @@ | |||
<?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_Versions\Controller; | |||
use OCP\AppFramework\Controller; | |||
use OCP\AppFramework\Http; | |||
use OCP\AppFramework\Http\DataResponse; | |||
use OCP\AppFramework\Http\FileDisplayResponse; | |||
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; | |||
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 | |||
* @param string $version | |||
* @return DataResponse|FileDisplayResponse | |||
*/ | |||
public function getPreview( | |||
$file = '', | |||
$x = 44, | |||
$y = 44, | |||
$version = '' | |||
) { | |||
if($file === '' && $version === '') { | |||
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 $versionFolder */ | |||
$versionFolder = $userFolder->getParent()->get('files_versions'); | |||
$mimeType = $this->mimeTypeDetector->detectPath($file); | |||
$file = $versionFolder->get($file.'.v'.$version); | |||
if ($file instanceof Folder) { | |||
return new DataResponse([], Http::STATUS_BAD_REQUEST); | |||
} | |||
/** @var File $file */ | |||
$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType); | |||
return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]); | |||
} catch (NotFoundException $e) { | |||
return new DataResponse([], Http::STATUS_NOT_FOUND); | |||
} catch (\Exception $e) { | |||
return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR); | |||
} | |||
} | |||
} |
@@ -462,7 +462,7 @@ class Storage { | |||
if (empty($userFullPath)) { | |||
$versions[$key]['preview'] = ''; | |||
} else { | |||
$versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $userFullPath, 'version' => $timestamp)); | |||
$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]); | |||
} | |||
$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename); | |||
$versions[$key]['name'] = $versionedFile; |
@@ -76,11 +76,15 @@ class Generator { | |||
* @param int $height | |||
* @param bool $crop | |||
* @param string $mode | |||
* @param string $mimeType | |||
* @return ISimpleFile | |||
* @throws NotFoundException | |||
*/ | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL) { | |||
if (!$this->previewManager->isMimeSupported($file->getMimeType())) { | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) { | |||
if ($mimeType === null) { | |||
$mimeType = $file->getMimeType(); | |||
} | |||
if (!$this->previewManager->isMimeSupported($mimeType)) { | |||
throw new NotFoundException(); | |||
} | |||
@@ -91,7 +95,7 @@ class Generator { | |||
$previewFolder = $this->getPreviewFolder($file); | |||
// Get the max preview and infer the max preview sizes from that | |||
$maxPreview = $this->getMaxPreview($previewFolder, $file); | |||
$maxPreview = $this->getMaxPreview($previewFolder, $file, $mimeType); | |||
list($maxWidth, $maxHeight) = $this->getPreviewSize($maxPreview); | |||
// Calculate the preview size | |||
@@ -110,10 +114,11 @@ class Generator { | |||
/** | |||
* @param ISimpleFolder $previewFolder | |||
* @param File $file | |||
* @param string $mimeType | |||
* @return ISimpleFile | |||
* @throws NotFoundException | |||
*/ | |||
private function getMaxPreview(ISimpleFolder $previewFolder, File $file) { | |||
private function getMaxPreview(ISimpleFolder $previewFolder, File $file, $mimeType) { | |||
$nodes = $previewFolder->getDirectoryListing(); | |||
foreach ($nodes as $node) { | |||
@@ -124,7 +129,7 @@ class Generator { | |||
$previewProviders = $this->previewManager->getProviders(); | |||
foreach ($previewProviders as $supportedMimeType => $providers) { | |||
if (!preg_match($supportedMimeType, $file->getMimeType())) { | |||
if (!preg_match($supportedMimeType, $mimeType)) { | |||
continue; | |||
} | |||
@@ -151,11 +151,12 @@ class PreviewManager implements IPreview { | |||
* @param int $height | |||
* @param bool $crop | |||
* @param string $mode | |||
* @param string $mimeType | |||
* @return ISimpleFile | |||
* @throws NotFoundException | |||
* @since 9.2.0 | |||
*/ | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL) { | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) { | |||
if ($this->generator === null) { | |||
$this->generator = new Generator( | |||
$this->rootFolder, | |||
@@ -165,7 +166,7 @@ class PreviewManager implements IPreview { | |||
); | |||
} | |||
return $this->generator->getPreview($file, $width, $height, $crop, $mode); | |||
return $this->generator->getPreview($file, $width, $height, $crop, $mode, $mimeType); | |||
} | |||
/** |
@@ -96,11 +96,12 @@ interface IPreview { | |||
* @param int $height | |||
* @param bool $crop | |||
* @param string $mode | |||
* @param string $mimeType To force a given mimetype for the file (files_versions needs this) | |||
* @return ISimpleFile | |||
* @throws NotFoundException | |||
* @since 9.2.0 | |||
*/ | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL); | |||
public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null); | |||
/** | |||
* Returns true if the passed mime type is supported |