Split bitmap providers into one per file

This commit is contained in:
Joas Schilling 2014-11-28 09:25:40 +01:00
parent 3ec42ad598
commit ec7b55f5be
7 changed files with 117 additions and 72 deletions

View File

@ -16,8 +16,6 @@ namespace OC;
use OC\Preview\Provider;
use OCP\Files\NotFoundException;
require_once 'preview/bitmap.php';
class Preview {
//the thumbnail folder
const THUMBNAILS_FOLDER = 'thumbnails';

View File

@ -5,81 +5,33 @@
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
use Imagick;
abstract class Bitmap extends Provider {
/**
* {@inheritDoc}
*/
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
$tmpPath = $fileview->toTmpFile($path);
class Bitmap extends Provider {
//create imagick object from bitmap or vector file
try {
// Layer 0 contains either the bitmap or
// a flat representation of all vector layers
$bp = new \Imagick($tmpPath . '[0]');
public function getMimeType() {
return null;
$bp->setImageFormat('png');
} catch (\Exception $e) {
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
return false;
}
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
$tmpPath = $fileview->toTmpFile($path);
unlink($tmpPath);
//create imagick object from bitmap or vector file
try {
// Layer 0 contains either the bitmap or
// a flat representation of all vector layers
$bp = new Imagick($tmpPath . '[0]');
$bp->setImageFormat('png');
} catch (\Exception $e) {
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
return false;
}
unlink($tmpPath);
//new bitmap image object
$image = new \OC_Image($bp);
//check if image object is valid
return $image->valid() ? $image : false;
}
//new bitmap image object
$image = new \OC_Image($bp);
//check if image object is valid
return $image->valid() ? $image : false;
}
//.pdf
class PDF extends Bitmap {
public function getMimeType() {
return '/application\/pdf/';
}
}
//.tiff
class TIFF extends Bitmap {
public function getMimeType() {
return '/image\/tiff/';
}
}
//.ai
class Illustrator extends Bitmap {
public function getMimeType() {
return '/application\/illustrator/';
}
}
//.eps
class Postscript extends Bitmap {
public function getMimeType() {
return '/application\/postscript/';
}
}
//.psd
class Photoshop extends Bitmap {
public function getMimeType() {
return '/application\/x-photoshop/';
}
}
}

View File

@ -0,0 +1,19 @@
<?php
/**
* Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
//.ai
class Illustrator extends Bitmap {
/**
* {@inheritDoc}
*/
public function getMimeType() {
return '/application\/illustrator/';
}
}

View File

@ -0,0 +1,19 @@
<?php
/**
* Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
//.pdf
class PDF extends Bitmap {
/**
* {@inheritDoc}
*/
public function getMimeType() {
return '/application\/pdf/';
}
}

View File

@ -0,0 +1,19 @@
<?php
/**
* Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
//.psd
class Photoshop extends Bitmap {
/**
* {@inheritDoc}
*/
public function getMimeType() {
return '/application\/x-photoshop/';
}
}

View File

@ -0,0 +1,19 @@
<?php
/**
* Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
//.eps
class Postscript extends Bitmap {
/**
* {@inheritDoc}
*/
public function getMimeType() {
return '/application\/postscript/';
}
}

View File

@ -0,0 +1,19 @@
<?php
/**
* Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\Preview;
//.tiff
class TIFF extends Bitmap {
/**
* {@inheritDoc}
*/
public function getMimeType() {
return '/image\/tiff/';
}
}