Merge "bug 44136: Don't rollback after successful commit"

[lhc/web/wiklou.git] / includes / media / PNG.php

diff --git a/includes/media/PNG.php b/includes/media/PNG.php
index 9e4a403..a23821f 100644 (file)
--- a/includes/media/PNG.php
+++ b/includes/media/PNG.php
@@ -2,6 +2,21 @@
 /**
  * Handler for PNG images.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Media
  */
@@ -12,24 +27,45 @@
  * @ingroup Media
  */
 class PNGHandler extends BitmapHandler {
-       
+
+       const BROKEN_FILE = '0';
+
+       /**
+        * @param File $image
+        * @param string $filename
+        * @return string
+        */
        function getMetadata( $image, $filename ) {
-               if ( !isset($image->parsedPNGMetadata) ) {
-                       try {
-                               $image->parsedPNGMetadata = PNGMetadataExtractor::getMetadata( $filename );
-                       } catch( Exception $e ) {
-                               // Broken file?
-                               wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
-                               return '0';
-                       }
+               try {
+                       $metadata = BitmapMetadataHandler::PNG( $filename );
+               } catch( Exception $e ) {
+                       // Broken file?
+                       wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
+                       return self::BROKEN_FILE;
                }
 
-               return serialize($image->parsedPNGMetadata);
-
+               return serialize($metadata);
        }
-       
+
+       /**
+        * @param $image File
+        * @return array|bool
+        */
        function formatMetadata( $image ) {
-               return false;
+               $meta = $image->getMetadata();
+
+               if ( !$meta ) {
+                       return false;
+               }
+               $meta = unserialize( $meta );
+               if ( !isset( $meta['metadata'] ) || count( $meta['metadata'] ) <= 1 ) {
+                       return false;
+               }
+
+               if ( isset( $meta['metadata']['_MW_PNG_VERSION'] ) ) {
+                       unset( $meta['metadata']['_MW_PNG_VERSION'] );
+               }
+               return $this->formatMetadataHelper( $meta['metadata'] );
        }
 
        /**
@@ -44,16 +80,41 @@ class PNGHandler extends BitmapHandler {
                }
                return false;
        }
-       
+       /**
+        * We do not support making APNG thumbnails, so always false
+        * @param $image File
+        * @return bool false
+        */
+       function canAnimateThumbnail( $image ) {
+               return false;
+       }
+
        function getMetadataType( $image ) {
                return 'parsed-png';
        }
-       
+
        function isMetadataValid( $image, $metadata ) {
+
+               if ( $metadata === self::BROKEN_FILE ) {
+                       // Do not repetitivly regenerate metadata on broken file.
+                       return self::METADATA_GOOD;
+               }
+
                wfSuppressWarnings();
                $data = unserialize( $metadata );
                wfRestoreWarnings();
-               return (boolean) $data;
+
+               if ( !$data || !is_array( $data ) ) {
+                       wfDebug(__METHOD__ . ' invalid png metadata' );
+                       return self::METADATA_BAD;
+               }
+
+               if ( !isset( $data['metadata']['_MW_PNG_VERSION'] )
+                       || $data['metadata']['_MW_PNG_VERSION'] != PNGMetadataExtractor::VERSION ) {
+                       wfDebug(__METHOD__ . ' old but compatible png metadata' );
+                       return self::METADATA_COMPATIBLE;
+               }
+               return self::METADATA_GOOD;
        }
 
        /**
@@ -73,18 +134,21 @@ class PNGHandler extends BitmapHandler {
 
                $info = array();
                $info[] = $original;
-               
-               if ($metadata['loopCount'] == 0)
-                       $info[] = wfMsgExt( 'file-info-png-looped', 'parseinline' );
-               elseif ($metadata['loopCount'] > 1)
-                       $info[] = wfMsgExt( 'file-info-png-repeat', 'parseinline', $metadata['loopCount'] );
-               
-               if ($metadata['frameCount'] > 0)
-                       $info[] = wfMsgExt( 'file-info-png-frames', 'parseinline', $metadata['frameCount'] );
-               
-               if ($metadata['duration'])
+
+               if ( $metadata['loopCount'] == 0 ) {
+                       $info[] = wfMessage( 'file-info-png-looped' )->parse();
+               } elseif ( $metadata['loopCount'] > 1 ) {
+                       $info[] = wfMessage( 'file-info-png-repeat' )->numParams( $metadata['loopCount'] )->parse();
+               }
+
+               if ( $metadata['frameCount'] > 0 ) {
+                       $info[] = wfMessage( 'file-info-png-frames' )->numParams( $metadata['frameCount'] )->parse();
+               }
+
+               if ( $metadata['duration'] ) {
                        $info[] = $wgLang->formatTimePeriod( $metadata['duration'] );
-               
+               }
+
                return $wgLang->commaList( $info );
        }