wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1338 from nextcloud/fix-trashbin-errors

Browse source 
Opening the trashbin causes errors in log for files without preview
This commit is contained in:
Roeland Jago Douma 2016-09-13 19:23:51 +02:00 committed by GitHub
commit b6439da128
5 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_trashbin/ajax/preview.php
View file

@ -72,6 +72,8 @@ try{
$preview->setScalingUp($scalingUp); $preview->setScalingUp($scalingUp);
$preview->showPreview(); $preview->showPreview();
} catch (\OC\PreviewNotAvailableException $e) {
\OC_Response::setStatus(404);
}catch(\Exception $e) { }catch(\Exception $e) {
\OC_Response::setStatus(500); \OC_Response::setStatus(500);
\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG); \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);

1
lib/composer/composer/autoload_classmap.php
View file

@ -598,6 +598,7 @@ return array(
'OC\\OCS\\Result' => $baseDir . '/lib/private/OCS/Result.php', 'OC\\OCS\\Result' => $baseDir . '/lib/private/OCS/Result.php',
'OC\\Preview' => $baseDir . '/lib/private/Preview.php', 'OC\\Preview' => $baseDir . '/lib/private/Preview.php',
'OC\\PreviewManager' => $baseDir . '/lib/private/PreviewManager.php', 'OC\\PreviewManager' => $baseDir . '/lib/private/PreviewManager.php',
'OC\\PreviewNotAvailableException' => $baseDir . '/lib/private/PreviewNotAvailableException.php',
'OC\\Preview\\BMP' => $baseDir . '/lib/private/Preview/BMP.php', 'OC\\Preview\\BMP' => $baseDir . '/lib/private/Preview/BMP.php',
'OC\\Preview\\Bitmap' => $baseDir . '/lib/private/Preview/Bitmap.php', 'OC\\Preview\\Bitmap' => $baseDir . '/lib/private/Preview/Bitmap.php',
'OC\\Preview\\Font' => $baseDir . '/lib/private/Preview/Font.php', 'OC\\Preview\\Font' => $baseDir . '/lib/private/Preview/Font.php',

1
lib/composer/composer/autoload_static.php
View file

@ -628,6 +628,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\OCS\\Result' => __DIR__ . '/../../..' . '/lib/private/OCS/Result.php', 'OC\\OCS\\Result' => __DIR__ . '/../../..' . '/lib/private/OCS/Result.php',
'OC\\Preview' => __DIR__ . '/../../..' . '/lib/private/Preview.php', 'OC\\Preview' => __DIR__ . '/../../..' . '/lib/private/Preview.php',
'OC\\PreviewManager' => __DIR__ . '/../../..' . '/lib/private/PreviewManager.php', 'OC\\PreviewManager' => __DIR__ . '/../../..' . '/lib/private/PreviewManager.php',
'OC\\PreviewNotAvailableException' => __DIR__ . '/../../..' . '/lib/private/PreviewNotAvailableException.php',
'OC\\Preview\\BMP' => __DIR__ . '/../../..' . '/lib/private/Preview/BMP.php', 'OC\\Preview\\BMP' => __DIR__ . '/../../..' . '/lib/private/Preview/BMP.php',
'OC\\Preview\\Bitmap' => __DIR__ . '/../../..' . '/lib/private/Preview/Bitmap.php', 'OC\\Preview\\Bitmap' => __DIR__ . '/../../..' . '/lib/private/Preview/Bitmap.php',
'OC\\Preview\\Font' => __DIR__ . '/../../..' . '/lib/private/Preview/Font.php', 'OC\\Preview\\Font' => __DIR__ . '/../../..' . '/lib/private/Preview/Font.php',

6
lib/private/Preview.php
View file

@ -791,6 +791,7 @@ class Preview {
* @param null|string $mimeTypeForHeaders the media type to use when sending back the reply * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply
* *
* @throws NotFoundException * @throws NotFoundException
* @throws PreviewNotAvailableException
*/ */
public function showPreview($mimeTypeForHeaders = null) { public function showPreview($mimeTypeForHeaders = null) {
// Check if file is valid // Check if file is valid
@ -1172,6 +1173,7 @@ class Preview {
/** /**
* Defines the media icon, for the media type of the original file, as the preview * Defines the media icon, for the media type of the original file, as the preview
* @throws PreviewNotAvailableException
*/ */
private function getMimeIcon() { private function getMimeIcon() {
$image = new \OC_Image(); $image = new \OC_Image();
@ -1181,6 +1183,10 @@ class Preview {
} else { } else {
$mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath); $mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath);
} }
// we can't load SVGs into an image
if (substr($mimeIconWebPath, -4) === '.svg') {
throw new PreviewNotAvailableException('SVG mimetype cannot be rendered');
}
$image->loadFromFile($mimeIconServerPath); $image->loadFromFile($mimeIconServerPath);
$this->preview = $image; $this->preview = $image;

27
lib/private/PreviewNotAvailableException.php Normal file
View file

@ -0,0 +1,27 @@
<?php
/**
* @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
*
* @author Morris Jobke <hey@morrisjobke.de>
*
* @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 OC;
class PreviewNotAvailableException extends \Exception {
}