Title::moveToInternal doesn't return anything, but it does throw an exception

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

diff --git a/includes/media/GIF.php b/includes/media/GIF.php
index 0d7529a..32618e9 100644 (file)
--- a/includes/media/GIF.php
+++ b/includes/media/GIF.php
@@ -13,37 +13,53 @@
  */
 class GIFHandler extends BitmapHandler {
 
+       const BROKEN_FILE = '0'; // value to store in img_metadata if error extracting metadata.
+       
        function getMetadata( $image, $filename ) {
-               if ( !isset( $image->parsedGIFMetadata ) ) {
-                       try {
-                               $image->parsedGIFMetadata = GIFMetadataExtractor::getMetadata( $filename );
-                       } catch( Exception $e ) {
-                               // Broken file?
-                               wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
-                               return '0';
-                       }
+               try {
+                       $parsedGIFMetadata = BitmapMetadataHandler::GIF( $filename );
+               } catch( Exception $e ) {
+                       // Broken file?
+                       wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
+                       return self::BROKEN_FILE;
                }
 
-               return serialize( $image->parsedGIFMetadata );
+               return serialize($parsedGIFMetadata);
        }
 
+       /**
+        * @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_GIF_VERSION'] ) ) {
+                       unset( $meta['metadata']['_MW_GIF_VERSION'] );
+               }
+               return $this->formatMetadataHelper( $meta['metadata'] );
        }
 
        /**
         * @param $image File
-        * @param  $width
-        * @param  $height
-        * @return
+        * @todo unittests
+        * @return bool
         */
-       function getImageArea( $image, $width, $height ) {
+       function getImageArea( $image ) {
                $ser = $image->getMetadata();
                if ( $ser ) {
                        $metadata = unserialize( $ser );
-                       return $width * $height * $metadata['frameCount'];
+                       return $image->getWidth() * $image->getHeight() * $metadata['frameCount'];
                } else {
-                       return $width * $height;
+                       return $image->getWidth() * $image->getHeight();
                }
        }
 
@@ -67,10 +83,26 @@ class GIFHandler extends BitmapHandler {
        }
 
        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 GIF metadata' );
+                       return self::METADATA_BAD;
+               }
+
+               if ( !isset( $data['metadata']['_MW_GIF_VERSION'] )
+                       || $data['metadata']['_MW_GIF_VERSION'] != GIFMetadataExtractor::VERSION ) {
+                       wfDebug(__METHOD__ . ' old but compatible GIF metadata' );
+                       return self::METADATA_COMPATIBLE;
+               }
+               return self::METADATA_GOOD;
        }
 
        /**