Merge pull request #11009 from owncloud/tobiasKaminsky-route

REST API for thumbnails
This commit is contained in:
Lukas Reschke 2014-09-16 19:31:51 +02:00
commit 368391e401
4 changed files with 99 additions and 2 deletions

View File

@ -0,0 +1,31 @@
<?php
/**
* Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OCA\Files\Appinfo;
use OC\AppFramework\Utility\SimpleContainer;
use OCA\Files\Controller\ApiController;
use OCP\AppFramework\App;
class Application extends App {
public function __construct(array $urlParams=array()) {
parent::__construct('files', $urlParams);
$container = $this->getContainer();
/**
* Controllers
*/
$container->registerService('APIController', function (SimpleContainer $c) {
return new ApiController(
$c->query('AppName'),
$c->query('Request')
);
});
}
}

View File

@ -6,7 +6,15 @@
* See the COPYING-README file.
*/
/** @var $this OC\Route\Router */
namespace OCA\Files\Appinfo;
$application = new Application();
$application->registerRoutes($this, array('routes' => array(
array('name' => 'API#getThumbnail', 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', 'verb' => 'GET'),
)));
/** @var $this \OC\Route\Router */
$this->create('files_index', '/')
->actionInclude('files/index.php');
@ -38,4 +46,4 @@ $this->create('download', 'download{file}')
->actionInclude('files/download.php');
// Register with the capabilities API
OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
\OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', \OC_API::USER_AUTH);

View File

@ -0,0 +1,52 @@
<?php
/**
* Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OCA\Files\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Controller;
use OCP\IRequest;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\DownloadResponse;
use OC\Preview;
class ApiController extends Controller {
public function __construct($appName, IRequest $request){
parent::__construct($appName, $request);
}
/**
* Gets a thumbnail of the specified file
*
* @since API version 1.0
*
* @NoAdminRequired
* @NoCSRFRequired
*
* @param int $x
* @param int $y
* @param string $file
* @return JSONResponse|DownloadResponse
*/
public function getThumbnail($x, $y, $file) {
if($x < 1 || $y < 1) {
return new JSONResponse('Requested size must be numeric and a positive value.', Http::STATUS_BAD_REQUEST);
}
try {
$preview = new Preview('', 'files', $file, $x, $y, true);
echo($preview->showPreview('image/png'));
return new DownloadResponse($file.'.png', 'image/png');
} catch (\Exception $e) {
return new JSONResponse('File not found.', Http::STATUS_NOT_FOUND);
}
}
}

View File

@ -15,6 +15,7 @@ namespace OC;
use OC\Files\Filesystem;
use OC\Preview\Provider;
use OCP\Files\NotFoundException;
require_once 'preview/image.php';
require_once 'preview/movies.php';
@ -110,6 +111,11 @@ class Preview {
\OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR);
throw new \Exception('No preview providers');
}
// Check if file is valid
if($this->isFileValid() === false) {
throw new NotFoundException('File not found.');
}
}
/**