From 6973b82e207a4d233ddf5eb79ce84d58deae5f4e Mon Sep 17 00:00:00 2001 From: Sebastian Steinmetz <462714+steiny2k@users.noreply.github.com> Date: Fri, 3 Aug 2018 15:33:58 +0200 Subject: Develop HEIC/HEIF preview support #7406 Signed-off-by: Sebastian Steinmetz --- lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + lib/private/Preview/HEIC.php | 32 +++++++++++++++++++++++++++++ lib/private/PreviewManager.php | 3 +++ resources/config/mimetypemapping.dist.json | 2 ++ 5 files changed, 39 insertions(+) create mode 100644 lib/private/Preview/HEIC.php diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 44b7cd5244f..25b684471db 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -856,6 +856,7 @@ return array( 'OC\\Preview\\GIF' => $baseDir . '/lib/private/Preview/GIF.php', 'OC\\Preview\\Generator' => $baseDir . '/lib/private/Preview/Generator.php', 'OC\\Preview\\GeneratorHelper' => $baseDir . '/lib/private/Preview/GeneratorHelper.php', + 'OC\\Preview\\HEIC' => $baseDir . '/lib/private/Preview/HEIC.php', 'OC\\Preview\\Illustrator' => $baseDir . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => $baseDir . '/lib/private/Preview/Image.php', 'OC\\Preview\\JPEG' => $baseDir . '/lib/private/Preview/JPEG.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 815f94d5711..6d37fe708ea 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -886,6 +886,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Preview\\GIF' => __DIR__ . '/../../..' . '/lib/private/Preview/GIF.php', 'OC\\Preview\\Generator' => __DIR__ . '/../../..' . '/lib/private/Preview/Generator.php', 'OC\\Preview\\GeneratorHelper' => __DIR__ . '/../../..' . '/lib/private/Preview/GeneratorHelper.php', + 'OC\\Preview\\HEIC' => __DIR__ . '/../../..' . '/lib/private/Preview/HEIC.php', 'OC\\Preview\\Illustrator' => __DIR__ . '/../../..' . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => __DIR__ . '/../../..' . '/lib/private/Preview/Image.php', 'OC\\Preview\\JPEG' => __DIR__ . '/../../..' . '/lib/private/Preview/JPEG.php', diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php new file mode 100644 index 00000000000..9057596847c --- /dev/null +++ b/lib/private/Preview/HEIC.php @@ -0,0 +1,32 @@ + + * + * @copyright Copyright (c) 2018, ownCloud GmbH + * @copyright Copyright (c) 2018, Sebastian Steinmetz (me@sebastiansteinmetz.ch) + * @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 + * + */ + +namespace OC\Preview; + +class HEIC extends Bitmap { + /** + * {@inheritDoc} + */ + public function getMimeType() { + return '/image\/hei(f|c)/'; + } +} diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 979208d0aed..de03861badc 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -278,6 +278,7 @@ class PreviewManager implements IPreview { * - OC\Preview\JPEG * - OC\Preview\GIF * - OC\Preview\BMP + * - OC\Preview\HEIC * - OC\Preview\XBitmap * - OC\Preview\MarkDown * - OC\Preview\MP3 @@ -310,6 +311,7 @@ class PreviewManager implements IPreview { Preview\JPEG::class, Preview\GIF::class, Preview\BMP::class, + Preview\HEIC::class, Preview\XBitmap::class ]; @@ -370,6 +372,7 @@ class PreviewManager implements IPreview { 'PSD' => ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class], 'EPS' => ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class], 'TTF' => ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class], + 'HEIC' => ['mimetype' => '/image\/hei(f|c)/', 'class' => Preview\HEIC::class], ]; foreach ($imagickProviders as $queryFormat => $provider) { diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index e2771be6e89..614ac1a0ce7 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -62,6 +62,8 @@ "gz": ["application/x-gzip"], "gzip": ["application/x-gzip"], "h": ["text/x-h"], + "heic": ["image/heic"], + "heif": ["image/heif"], "hh": ["text/x-h"], "hpp": ["text/x-h"], "htaccess": ["text/plain"], -- cgit v1.2.3 From 8a7bc3fb039280a61b46af5795476be062e003fe Mon Sep 17 00:00:00 2001 From: Sebastian Steinmetz Date: Sat, 11 Aug 2018 01:22:57 +0200 Subject: Testcase for HEIC image (similar to the ImageTest) Signed-off-by: Sebastian Steinmetz --- tests/data/testimage.heic | Bin 0 -> 28370 bytes tests/lib/Preview/HEICTest.php | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/data/testimage.heic create mode 100644 tests/lib/Preview/HEICTest.php diff --git a/tests/data/testimage.heic b/tests/data/testimage.heic new file mode 100644 index 00000000000..56612f5a271 Binary files /dev/null and b/tests/data/testimage.heic differ diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php new file mode 100644 index 00000000000..324d0683953 --- /dev/null +++ b/tests/lib/Preview/HEICTest.php @@ -0,0 +1,42 @@ +. + * + */ + +namespace Test\Preview; + +/** + * Class BitmapTest + * + * @group DB + * + * @package Test\Preview + */ +class HEICTest extends Provider { + + public function setUp() { + parent::setUp(); + + $fileName = 'testimage.heic'; + $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName); + $this->width = 1680; + $this->height = 1050; + $this->provider = new \OC\Preview\HEIC; + } +} \ No newline at end of file -- cgit v1.2.3 From 5a996b5f879c83f0911ba33af542fdd844929b79 Mon Sep 17 00:00:00 2001 From: Sebastian Steinmetz Date: Fri, 17 Aug 2018 18:34:51 +0200 Subject: Address comments from @rullzer: - implement isAvailable - run tests only if ImageMagick with HEIC support is available in the environment Signed-off-by: Sebastian Steinmetz --- lib/private/Preview/HEIC.php | 8 ++++++++ tests/lib/Preview/HEICTest.php | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php index 9057596847c..151326129bc 100644 --- a/lib/private/Preview/HEIC.php +++ b/lib/private/Preview/HEIC.php @@ -29,4 +29,12 @@ class HEIC extends Bitmap { public function getMimeType() { return '/image\/hei(f|c)/'; } + + /** + * {@inheritDoc} + */ + public function isAvailable(\OCP\Files\FileInfo $file) { + return in_array("HEIC", \Imagick::queryFonts("HEI*") ); + } + } diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index 324d0683953..63b9038d35d 100644 --- a/tests/lib/Preview/HEICTest.php +++ b/tests/lib/Preview/HEICTest.php @@ -31,12 +31,18 @@ namespace Test\Preview; class HEICTest extends Provider { public function setUp() { - parent::setUp(); + if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) { + $this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests'); + } else { + parent::setUp(); + + $fileName = 'testimage.heic'; + $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName); + $this->width = 1680; + $this->height = 1050; + $this->provider = new \OC\Preview\HEIC; + } - $fileName = 'testimage.heic'; - $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName); - $this->width = 1680; - $this->height = 1050; - $this->provider = new \OC\Preview\HEIC; } + } \ No newline at end of file -- cgit v1.2.3