Merge pull request #1747 from bburnichon/feature/backport-PNG-subdefs-into-4.0-PHRAS-987

backport png subdefs into 4.0
2025-10-17 06:53:15 +00:00 · 2016-03-08 12:52:50 +01:00
parent 0109c6c0d2 197071f060
commit b8096e0c00
5 changed files with 89 additions and 106 deletions
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
        "justinrainbow/json-schema": "~1.3",
        "league/flysystem": "^1.0",
        "league/flysystem-aws-s3-v2": "^1.0",
-        "media-alchemyst/media-alchemyst": "~0.4",
+        "media-alchemyst/media-alchemyst": "^0.5",
        "monolog/monolog": "~1.3",
        "mrclay/minify": "~2.1.6",
        "neutron/process-manager": "2.0.x-dev@dev",
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "02cbfee2e7384dfed43ce4c8e8a64c5d",
-    "content-hash": "db0a3515fad6442e50e3a64478365383",
+    "hash": "455f2f5469072352ed9a240d8c170956",
+    "content-hash": "bb783826a1ca0339baf5bff696d69a73",
    "packages": [
        {
            "name": "alchemy-fr/tcpdf-clone",
@@ -15,6 +15,12 @@
                "url": "https://github.com/alchemy-fr/tcpdf-clone.git",
                "reference": "2ba0248a7187f1626df6c128750650416267f0e7"
            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7",
+                "reference": "2ba0248a7187f1626df6c128750650416267f0e7",
+                "shasum": ""
+            },
            "require": {
                "php": ">=5.3.0"
            },
@@ -61,6 +67,10 @@
                "qrcode",
                "tcpdf"
            ],
+            "support": {
+                "source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039",
+                "issues": "https://github.com/alchemy-fr/tcpdf-clone/issues"
+            },
            "time": "2013-10-13 16:11:17"
        },
        {
@@ -103,14 +113,14 @@
                    "email": "imprec@gmail.com",
                    "homepage": "http://www.lickmychip.com/"
                },
-                {
-                    "name": "Nicolas Le Goff",
-                    "email": "legoff.n@gmail.com"
-                },
                {
                    "name": "Phraseanet Team",
                    "email": "info@alchemy.fr",
                    "homepage": "http://www.phraseanet.com/"
+                },
+                {
+                    "name": "Nicolas Le Goff",
+                    "email": "legoff.n@gmail.com"
                }
            ],
            "description": "A set of tools to build binary drivers",
@@ -483,12 +493,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/rest-bundle.git",
-                "reference": "7b1c88c02ab8c0d4e997fd61c13c8fd4c3ce5216"
+                "reference": "9048a99dd328cd2d01efaad16e6af648d11ad2b4"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/alchemy-fr/rest-bundle/zipball/9048a99dd328cd2d01efaad16e6af648d11ad2b4",
-                "reference": "7b1c88c02ab8c0d4e997fd61c13c8fd4c3ce5216",
+                "reference": "9048a99dd328cd2d01efaad16e6af648d11ad2b4",
                "shasum": ""
            },
            "require": {
@@ -526,7 +536,7 @@
                }
            ],
            "description": "Simple REST utility bundle",
-            "time": "2015-09-22 06:58:52"
+            "time": "2016-02-20 22:35:16"
        },
        {
            "name": "alchemy/symfony-cors",
@@ -536,6 +546,12 @@
                "url": "https://github.com/alchemy-fr/symfony-cors.git",
                "reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375"
            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/symfony-cors/zipball/dbf7fcff1ce9fc1265db12955476ff169eab7375",
+                "reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375",
+                "shasum": ""
+            },
            "require": {
                "symfony/http-kernel": "^2.3.0|^3.0.0"
            },
@@ -556,11 +572,7 @@
                    "Alchemy\\CorsBundle\\": "src/Bundle/"
                }
            },
-            "autoload-dev": {
-                "psr-4": {
-                    "Alchemy\\Cors\\Tests\\": "tests/unit/Component/"
-                }
-            },
+            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
@@ -1723,12 +1735,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/igorw/evenement.git",
-                "reference": "v1.0.0"
+                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
-                "reference": "v1.0.0",
+                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
                "shasum": ""
            },
            "require": {
@@ -1755,7 +1767,7 @@
            "keywords": [
                "event-dispatcher"
            ],
-            "time": "2012-05-30 08:01:08"
+            "time": "2012-05-30 15:01:08"
        },
        {
            "name": "facebook/php-sdk",
@@ -1801,6 +1813,7 @@
                "facebook",
                "sdk"
            ],
+            "abandoned": "facebook/php-sdk-v4",
            "time": "2013-11-19 23:11:14"
        },
        {
@@ -2642,12 +2655,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/hoaproject/Stream.git",
-                "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3"
+                "reference": "3bc446bc00849bf51166adc415d77aa375d48d8c"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3bc446bc00849bf51166adc415d77aa375d48d8c",
-                "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3",
+                "reference": "3bc446bc00849bf51166adc415d77aa375d48d8c",
                "shasum": ""
            },
            "require": {
@@ -2692,7 +2705,7 @@
                "stream",
                "wrapper"
            ],
-            "time": "2015-10-22 06:30:43"
+            "time": "2015-10-26 12:21:43"
        },
        {
            "name": "hoa/ustring",
@@ -3544,37 +3557,38 @@
        },
        {
            "name": "media-alchemyst/media-alchemyst",
-            "version": "0.4.8",
+            "version": "0.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
-                "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8"
+                "reference": "cc279e0dcf22e47322028084dd1145a44a219c1a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
-                "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
+                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/cc279e0dcf22e47322028084dd1145a44a219c1a",
+                "reference": "cc279e0dcf22e47322028084dd1145a44a219c1a",
                "shasum": ""
            },
            "require": {
                "alchemy/ghostscript": "~0.4.0",
+                "alchemy/mediavorus": "^0.4.4",
                "imagine/imagine": "0.6.x@dev",
-                "mediavorus/mediavorus": ">=0.4.2,<0.5",
                "monolog/monolog": "~1.0",
-                "neutron/temporary-filesystem": "~2.1",
+                "neutron/temporary-filesystem": "^2.1.1",
                "php": ">=5.3.3",
                "php-ffmpeg/php-ffmpeg": ">=0.4.2,<0.6",
                "php-mp4box/php-mp4box": "~0.3.0",
                "php-unoconv/php-unoconv": "~0.3.0",
                "pimple/pimple": "~1.0",
                "swftools/swftools": "~0.3.0",
-                "symfony/console": "~2.0",
-                "symfony/filesystem": "~2.0"
+                "symfony/console": "^2.1|^3.0",
+                "symfony/filesystem": "^2.1|^3.0",
+                "symfony/process": "^2.1.1|^3.0"
            },
            "require-dev": {
+                "alchemy/phpexiftool": "^0.4.0|^0.5.0",
                "neutron/silex-imagine-provider": "~0.1",
-                "phpexiftool/phpexiftool": "~0.1",
-                "phpunit/phpunit": "~3.7",
+                "phpunit/phpunit": "^4.1|^5.0",
                "silex/silex": "~1.0"
            },
            "type": "library",
@@ -3613,63 +3627,7 @@
                "video",
                "video processing"
            ],
-            "time": "2015-02-03 16:25:38"
-        },
-        {
-            "name": "mediavorus/mediavorus",
-            "version": "0.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/romainneutron/MediaVorus.git",
-                "reference": "2df98b5b180c50b1bc7be838e36bc6ecc573e646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/2df98b5b180c50b1bc7be838e36bc6ecc573e646",
-                "reference": "2df98b5b180c50b1bc7be838e36bc6ecc573e646",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/collections": "~1.0",
-                "monolog/monolog": "~1.0",
-                "php": ">=5.3.0",
-                "php-ffmpeg/php-ffmpeg": "~0.3",
-                "phpexiftool/phpexiftool": "~0.1",
-                "symfony/console": "~2.0",
-                "symfony/http-foundation": "~2.0"
-            },
-            "require-dev": {
-                "jms/serializer": "~0.12.0",
-                "phpunit/phpunit": "~3.7",
-                "silex/silex": "~1.0",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "jms/serializer": "To serialize Medias",
-                "symfony/yaml": "To serialize Medias in Yaml format"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "MediaVorus": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Romain Neutron",
-                    "email": "imprec@gmail.com",
-                    "homepage": "http://www.lickmychip.com/"
-                }
-            ],
-            "description": "MediaVorus",
-            "keywords": [
-                "metadata"
-            ],
-            "time": "2014-08-26 12:32:10"
+            "time": "2016-02-17 14:25:54"
        },
        {
            "name": "monolog/monolog",
@@ -3778,7 +3736,7 @@
            ],
            "authors": [
                {
-                    "name": "Stephen Clay",
+                    "name": "Steve Clay",
                    "email": "steve@mrclay.org",
                    "homepage": "http://www.mrclay.org/",
                    "role": "Developer"
@@ -3964,21 +3922,21 @@
            "source": {
                "type": "git",
                "url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git",
-                "reference": "0.1.2"
+                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084",
-                "reference": "0.1.2",
+                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084",
                "shasum": ""
            },
            "require": {
                "imagine/imagine": "*",
                "php": ">=5.3.3",
-                "silex/silex": ">=1.0,<2.0"
+                "silex/silex": "~1.0"
            },
            "require-dev": {
-                "symfony/browser-kit": ">=2.0,<3.0"
+                "symfony/browser-kit": "~2.0"
            },
            "type": "library",
            "autoload": {
@@ -5325,7 +5283,7 @@
                },
                {
                    "name": "Phraseanet Team",
-                    "email": "support@alchemy.fr",
+                    "email": "info@alchemy.fr",
                    "homepage": "http://www.phraseanet.com/"
                }
            ],
--- a/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php
+++ b/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php
@@ -151,7 +151,7 @@ class FilesystemService
    {
        switch ($spec->getType()) {
            case SpecificationInterface::TYPE_IMAGE:
-                return 'jpg';
+                return $this->getExtensionFromImageCodec($spec->getImageCodec());
            case SpecificationInterface::TYPE_ANIMATION:
                return 'gif';
            case SpecificationInterface::TYPE_AUDIO:
@@ -186,6 +186,27 @@ class FilesystemService
        return null;
    }

+    /**
+     * Get the extension from imageCodec
+     *
+     * @param  string $imageCodec
+     *
+     * @return string
+     */
+    protected function getExtensionFromImageCodec($imageCodec)
+    {
+        switch ($imageCodec) {
+            case 'tiff':
+                return 'tif';
+            case 'jpeg':
+                return 'jpg';
+            case 'png':
+                return 'png';
+        }
+
+        return null;
+    }
+
    /**
     * Get the extension from videocodec
     *
--- a/lib/Alchemy/Phrasea/Media/Subdef/Image.php
+++ b/lib/Alchemy/Phrasea/Media/Subdef/Image.php
@@ -21,6 +21,7 @@ class Image extends Provider
    const OPTION_STRIP = 'strip';
    const OPTION_QUALITY = 'quality';
    const OPTION_FLATTEN = 'flatten';
+    const OPTION_ICODEC = 'icodec';

    protected $options = [];

@@ -33,6 +34,7 @@ class Image extends Provider
        $this->registerOption(new OptionType\Boolean($this->translator->trans('Remove ICC Profile'), self::OPTION_STRIP, false));
        $this->registerOption(new OptionType\Boolean($this->translator->trans('Flatten layers'), self::OPTION_FLATTEN, false));
        $this->registerOption(new OptionType\Range($this->translator->trans('Quality'), self::OPTION_QUALITY, 0, 100, 75));
+        $this->registerOption(new OptionType\Enum('Image Codec', self::OPTION_ICODEC, array('jpeg', 'png', 'tiff'), 'jpeg'));
    }

    public function getType()
@@ -42,7 +44,7 @@ class Image extends Provider

    public function getDescription()
    {
-        return $this->translator->trans('Generates a Jpeg image');
+        return $this->translator->trans('Generates an image');
    }

    public function getMediaAlchemystSpec()
@@ -54,6 +56,7 @@ class Image extends Provider
        $size = $this->getOption(self::OPTION_SIZE)->getValue();
        $resolution = $this->getOption(self::OPTION_RESOLUTION)->getValue();

+        $this->spec->setImageCodec($this->getOption(self::OPTION_ICODEC)->getValue());
        $this->spec->setResizeMode(ImageSpecification::RESIZE_MODE_INBOUND_FIXEDRATIO);
        $this->spec->setDimensions($size, $size);
        $this->spec->setQuality($this->getOption(self::OPTION_QUALITY)->getValue());
--- a/lib/classes/databox/subdef.php
+++ b/lib/classes/databox/subdef.php
@@ -107,8 +107,6 @@ class databox_subdef
                $this->subdef_type = $this->buildFlexPaperSubdef($sd);
                break;
        }
-
-        return $this;
    }

    /**
@@ -289,13 +287,16 @@ class databox_subdef
    /**
     * Build Image Subdef object depending the SimpleXMLElement
     *
-     * @param  SimpleXMLElement                    $sd
-     * @return \Alchemy\Phrasea\Media\Subdef\Video
+     * @param  SimpleXMLElement $sd
+     * @return Image
     */
    protected function buildImageSubdef(SimpleXMLElement $sd)
    {
        $image = new Image($this->translator);

+        if ($sd->icodec) {
+            $image->setOptionValue(Image::OPTION_ICODEC, (string) $sd->icodec);
+        }
        if ($sd->size) {
            $image->setOptionValue(Image::OPTION_SIZE, (int) $sd->size);
        }
@@ -318,8 +319,8 @@ class databox_subdef
    /**
     * Build Audio Subdef object depending the SimpleXMLElement
     *
-     * @param  SimpleXMLElement                    $sd
-     * @return \Alchemy\Phrasea\Media\Subdef\Video
+     * @param  SimpleXMLElement $sd
+     * @return Audio
     */
    protected function buildAudioSubdef(SimpleXMLElement $sd)
    {
@@ -352,8 +353,8 @@ class databox_subdef
    /**
     * Build GIF Subdef object depending the SimpleXMLElement
     *
-     * @param  SimpleXMLElement                    $sd
-     * @return \Alchemy\Phrasea\Media\Subdef\Video
+     * @param  SimpleXMLElement $sd
+     * @return Gif
     */
    protected function buildGifSubdef(SimpleXMLElement $sd)
    {
@@ -372,8 +373,8 @@ class databox_subdef
    /**
     * Build Video Subdef object depending the SimpleXMLElement
     *
-     * @param  SimpleXMLElement                    $sd
-     * @return \Alchemy\Phrasea\Media\Subdef\Video
+     * @param  SimpleXMLElement $sd
+     * @return Video
     */
    protected function buildVideoSubdef(SimpleXMLElement $sd)
    {