Changeset 3968:075785b9d306

Timestamp:

05/17/19 12:20:13 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add WebP image format support to Dotclear (not yet fully tested)

Files:

• .hgsubstate (modified) (1 diff)
• admin/media_item.php (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (11 diffs)

.hgsubstate

@@ -1 @@
-c019de4d8ec41f12428c20bd19b2166548802c28 inc/libs/clearbricks
+d0492625e961be1bd1b5138de54ef04d68cad199 inc/libs/clearbricks

admin/media_item.php

@@ -702 +702 @@
 }
 
-if ($file->type == 'image/jpeg') {
+if ($file->type == 'image/jpeg' || $file->type == 'image/webp') {
     echo '<h3>' . __('Image details') . '</h3>';
 

inc/core/class.dc.media.php

@@ -25 +25 @@
     protected $file_handler = []; ///< <b>array</b> Array of callbacks
 
-    public $thumb_tp       = '%s/.%s_%s.jpg'; ///< <b>string</b> Thumbnail file pattern
-    public $thumb_tp_alpha = '%s/.%s_%s.png'; ///< <b>string</b> Thumbnail file pattern (with alpha layer)
-
+    public $thumb_tp       = '%s/.%s_%s.jpg';  ///< <b>string</b> Thumbnail file pattern
+    public $thumb_tp_alpha = '%s/.%s_%s.png';  ///< <b>string</b> Thumbnail file pattern (with alpha layer)
+    public $thumb_tp_webp  = '%s/.%s_%s.webp'; ///< <b>string</b> Thumbnail file pattern (webp)
     /**
     <b>array</b> Tubmnail sizes:
@@ -94 +94 @@
         $this->addFileHandler('image/png', 'create', [$this, 'imageThumbCreate']);
         $this->addFileHandler('image/gif', 'create', [$this, 'imageThumbCreate']);
+        $this->addFileHandler('image/webp', 'create', [$this, 'imageThumbCreate']);
 
         $this->addFileHandler('image/png', 'update', [$this, 'imageThumbUpdate']);
         $this->addFileHandler('image/jpeg', 'update', [$this, 'imageThumbUpdate']);
         $this->addFileHandler('image/gif', 'update', [$this, 'imageThumbUpdate']);
+        $this->addFileHandler('image/webp', 'update', [$this, 'imageThumbUpdate']);
 
         $this->addFileHandler('image/png', 'remove', [$this, 'imageThumbRemove']);
         $this->addFileHandler('image/jpeg', 'remove', [$this, 'imageThumbRemove']);
         $this->addFileHandler('image/gif', 'remove', [$this, 'imageThumbRemove']);
+        $this->addFileHandler('image/webp', 'remove', [$this, 'imageThumbRemove']);
 
         $this->addFileHandler('image/jpeg', 'create', [$this, 'imageMetaCreate']);
+        $this->addFileHandler('image/webp', 'create', [$this, 'imageMetaCreate']);
 
         $this->addFileHandler('image/jpeg', 'recreate', [$this, 'imageThumbCreate']);
         $this->addFileHandler('image/png', 'recreate', [$this, 'imageThumbCreate']);
         $this->addFileHandler('image/gif', 'recreate', [$this, 'imageThumbCreate']);
-
-        $this->addFileHandler('image/jpeg', 'recreate', [$this, 'imageThumbCreate']);
-        $this->addFileHandler('image/png', 'recreate', [$this, 'imageThumbCreate']);
-        $this->addFileHandler('image/gif', 'recreate', [$this, 'imageThumbCreate']);
+        $this->addFileHandler('image/webp', 'recreate', [$this, 'imageThumbCreate']);
 
         # Thumbnails sizes
@@ -294 +295 @@
             $p              = path::info($f->relname);
 
-            $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
-
-            $thumb     = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), $this->root . '/' . $p['dirname'], $p['base'], '%s');
-            $thumb_url = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), $this->root_url . $p['dirname'], $p['base'], '%s');
+            $alpha = strtolower($p['extension']) === 'png';
+            $webp  = strtolower($p['extension']) === 'webp';
+
+            $thumb = sprintf(
+                ($alpha ? $this->thumb_tp_alpha :
+                    ($webp ? $this->thumb_tp_webp : $this->thumb_tp)),
+                $this->root . '/' . $p['dirname'], $p['base'], '%s');
+            $thumb_url = sprintf(
+                ($alpha ? $this->thumb_tp_alpha :
+                    ($webp ? $this->thumb_tp_webp : $this->thumb_tp)),
+                $this->root_url . $p['dirname'], $p['base'], '%s');
 
             # Cleaner URLs
@@ -303 +311 @@
             $thumb_url = preg_replace('#(?<!:)/+#', '/', $thumb_url);
 
-            if ($alpha) {
+            if ($alpha || $webp) {
                 $thumb_alt     = sprintf($this->thumb_tp, $this->root . '/' . $p['dirname'], $p['base'], '%s');
                 $thumb_url_alt = sprintf($this->thumb_tp, $this->root_url . $p['dirname'], $p['base'], '%s');
@@ -314 +322 @@
                 if (file_exists(sprintf($thumb, $suffix))) {
                     $f->media_thumb[$suffix] = sprintf($thumb_url, $suffix);
-                } elseif ($alpha && file_exists(sprintf($thumb_alt, $suffix))) {
+                } elseif (($alpha || $webp) && file_exists(sprintf($thumb_alt, $suffix))) {
                     $f->media_thumb[$suffix] = sprintf($thumb_url_alt, $suffix);
                 }
@@ -913 +921 @@
         $zip = new fileUnzip($f->file);
         $zip->setExcludePattern($this->exclude_pattern);
-        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg|\.git|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
 
         if ($create_dir) {
@@ -965 +973 @@
     {
         $zip  = new fileUnzip($f->file);
-        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg|\.git|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
         $zip->close();
         return $list;
@@ -992 +1000 @@
 
         $p     = path::info($file);
-        $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
-        $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), $p['dirname'], $p['base'], '%s');
+        $alpha = strtolower($p['extension']) === 'png';
+        $webp  = strtolower($p['extension']) === 'webp';
+        $thumb = sprintf(($alpha ? $this->thumb_tp_alpha :
+            ($webp ? $this->thumb_tp_webp :
+                $this->thumb_tp)),
+            $p['dirname'], $p['base'], '%s');
 
         try
@@ -1013 +1025 @@
                     $rate = ($s[0] < 100 ? 95 : ($s[0] < 600 ? 90 : 85));
                     $img->resize($s[0], $s[0], $s[1]);
-                    $img->output(($alpha ? 'png' : 'jpeg'), $thumb_file, $rate);
+                    $img->output(($alpha || $webp ? strtolower($p['extension']) : 'jpeg'), $thumb_file, $rate);
                     $img->loadImage($file);
                 }
@@ -1030 +1042 @@
         if ($file->relname != $newFile->relname) {
             $p         = path::info($file->relname);
-            $alpha     = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
-            $thumb_old = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), $p['dirname'], $p['base'], '%s');
+            $alpha     = strtolower($p['extension']) === 'png';
+            $webp      = strtolower($p['extension']) === 'webp';
+            $thumb_old = sprintf(($alpha ? $this->thumb_tp_alpha :
+                ($webp ? $this->thumb_tp_webp :
+                    $this->thumb_tp)),
+                $p['dirname'], $p['base'], '%s');
 
             $p         = path::info($newFile->relname);
-            $alpha     = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
-            $thumb_new = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), $p['dirname'], $p['base'], '%s');
+            $alpha     = strtolower($p['extension']) === 'png';
+            $webp      = strtolower($p['extension']) === 'webp';
+            $thumb_new = sprintf(($alpha ? $this->thumb_tp_alpha :
+                ($webp ? $this->thumb_tp_webp :
+                    $this->thumb_tp)),
+                $p['dirname'], $p['base'], '%s');
 
             foreach ($this->thumb_sizes as $suffix => $s) {
@@ -1048 +1068 @@
     {
         $p     = path::info($f);
-        $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
-        $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp), '', $p['base'], '%s');
+        $alpha = strtolower($p['extension']) === 'png';
+        $webp  = strtolower($p['extension']) === 'webp';
+        $thumb = sprintf(($alpha ? $this->thumb_tp_alpha :
+            ($webp ? $this->thumb_tp_webp :
+                $this->thumb_tp)),
+            '', $p['base'], '%s');
 
         foreach ($this->thumb_sizes as $suffix => $s) {