Image metadata is usually a serialized string representing an array. Passing the string around internally and having everything unserialize it is an awkward convention. Also, many image handlers were reading the file twice: once for getMetadata() and again for getImageSize(). Often getMetadata() would actually read the width and height and then throw it away. So, in filerepo: * Add File::getMetadataItem(), which promises to allow partial loading of metadata per my proposal on T275268 in a future commit. * Add File::getMetadataArray(), which returns the unserialized array. Some file handlers were returning non-serializable strings from getMetadata(), so I gave them a legacy array form ['_error' => ...] * Changed MWFileProps to return the array form of metadata. * Deprecate the weird File::getImageSize(). It was apparently not called by anything, but was overridden by UnregisteredLocalFile. * Wrap serialize/unserialize with File::getMetadataForDb() and File::loadMetadataFromDb() in preparation for T275268. In MediaHandler: * Merged MediaHandler::getImageSize() and MediaHandler::getMetadata() into getSizeAndMetadata(). Deprecated the old methods. * Instead of isMetadataValid() we now have isFileMetadataValid(), which only gets a File object, so it can decide what data it needs to load. * Simplified getPageDimensions() by having it return false for non-paged media. It was not called in that case, but was implemented anyway. In specific handlers: * Rename DjVuHandler::getUnserializedMetadata() and extractTreesFromMetadata() for clarity. "Metadata" in these function names meant an XML string. * Updated DjVuImage::getImageSize() to provide image sizes in the new style. * In ExifBitmapHandler, getRotationForExif() now takes just the Orientation tag, rather than a serialized string. Also renamed for clarity. * In GIFMetadataExtractor, return the width, height and bits per channel instead of throwing them away. There was some conflation in decodeBPP() which I picked apart. Refer to GIF89a section 18. * In JpegMetadataExtractor, process the SOF0/SOF2 segment to extract bits per channel, width, height and components (channel count). This is essentially a port of PHP's getimagesize(), so should be bugwards compatible. * In PNGMetadataExtractor, return the width and height, which were previously assigned to unused local variables. I verified the implementation by referring to the specification. * In SvgHandler, retain the version validation from unpackMetadata(), but rename the function since it now takes an array as input. In tests: * In ExifBitmapTest, refactored some tests by using a provider. * In GIFHandlerTest and PNGHandlerTest, I removed the tests in which getMetadata() returns null, since it doesn't make sense when ported to getMetadataArray(). I added tests for empty arrays instead. * In tests, I retained serialization of input data since I figure it's useful to confirm that existing database rows will continue to be read correctly. I removed serialization of expected values, replacing them with plain data. * In tests, I replaced access to private class constants like BROKEN_FILE with string literals, since stability is essential. If the class constant changes, the test should fail. Elsewhere: * In maintenance/refreshImageMetadata.php, I removed the check for shrinking image metadata, since it's not easy to implement and is not future compatible. Image metadata is expected to shrink in future. Bug: T275268 Change-Id: I039785d5b6439d71dcc21dcb972177dba5c3a67d
199 lines
5 KiB
PHP
199 lines
5 KiB
PHP
<?php
|
|
|
|
/**
|
|
* @group Media
|
|
*/
|
|
class PNGHandlerTest extends MediaWikiMediaTestCase {
|
|
|
|
/** @var PNGHandler */
|
|
protected $handler;
|
|
|
|
protected function setUp() : void {
|
|
parent::setUp();
|
|
$this->handler = new PNGHandler();
|
|
}
|
|
|
|
/**
|
|
* @return array Expected metadata for a broken file. This tests backwards
|
|
* compatibility with existing DB rows, so can't be changed.
|
|
*/
|
|
private function brokenFile() {
|
|
return [ '_error' => '0' ];
|
|
}
|
|
|
|
/**
|
|
* @covers PNGHandler::getSizeAndMetadata
|
|
*/
|
|
public function testInvalidFile() {
|
|
$res = $this->handler->getSizeAndMetadata( null, $this->filePath . '/README' );
|
|
$this->assertEquals(
|
|
[
|
|
'metadata' => $this->brokenFile()
|
|
],
|
|
$res );
|
|
}
|
|
|
|
/**
|
|
* @param string $filename Basename of the file to check
|
|
* @param bool $expected Expected result.
|
|
* @dataProvider provideIsAnimated
|
|
* @covers PNGHandler::isAnimatedImage
|
|
*/
|
|
public function testIsAnimanted( $filename, $expected ) {
|
|
$file = $this->dataFile( $filename, 'image/png' );
|
|
$actual = $this->handler->isAnimatedImage( $file );
|
|
$this->assertEquals( $expected, $actual );
|
|
}
|
|
|
|
public static function provideIsAnimated() {
|
|
return [
|
|
[ 'Animated_PNG_example_bouncing_beach_ball.png', true ],
|
|
[ '1bit-png.png', false ],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param string $filename
|
|
* @param int $expected Total image area
|
|
* @dataProvider provideGetImageArea
|
|
* @covers PNGHandler::getImageArea
|
|
*/
|
|
public function testGetImageArea( $filename, $expected ) {
|
|
$file = $this->dataFile( $filename, 'image/png' );
|
|
$actual = $this->handler->getImageArea( $file );
|
|
$this->assertEquals( $expected, $actual );
|
|
}
|
|
|
|
public static function provideGetImageArea() {
|
|
return [
|
|
[ '1bit-png.png', 2500 ],
|
|
[ 'greyscale-png.png', 2500 ],
|
|
[ 'Png-native-test.png', 126000 ],
|
|
[ 'Animated_PNG_example_bouncing_beach_ball.png', 10000 ],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param string $metadata Serialized metadata
|
|
* @param int $expected One of the class constants of PNGHandler
|
|
* @dataProvider provideIsMetadataValid
|
|
* @covers PNGHandler::isFileMetadataValid
|
|
*/
|
|
public function testIsFileMetadataValid( $metadata, $expected ) {
|
|
$actual = $this->handler->isFileMetadataValid( $this->getMockFileWithMetadata( $metadata ) );
|
|
$this->assertEquals( $expected, $actual );
|
|
}
|
|
|
|
public function provideIsMetadataValid() {
|
|
// phpcs:disable Generic.Files.LineLength
|
|
return [
|
|
[ '0', PNGHandler::METADATA_GOOD ],
|
|
[ '', PNGHandler::METADATA_BAD ],
|
|
[ 'a:0:{}', PNGHandler::METADATA_BAD ],
|
|
[ 'Something invalid!', PNGHandler::METADATA_BAD ],
|
|
[
|
|
'a:6:{s:10:"frameCount";i:0;s:9:"loopCount";i:1;s:8:"duration";d:0;s:8:"bitDepth";i:8;s:9:"colorType";s:10:"truecolour";s:8:"metadata";a:1:{s:15:"_MW_PNG_VERSION";i:1;}}',
|
|
PNGHandler::METADATA_GOOD
|
|
],
|
|
];
|
|
// phpcs:enable
|
|
}
|
|
|
|
/**
|
|
* @param string $filename
|
|
* @param string $expected Serialized array
|
|
* @dataProvider provideGetSizeAndMetadata
|
|
* @covers PNGHandler::getSizeAndMetadata
|
|
*/
|
|
public function testGetSizeAndMetadata( $filename, $expected ) {
|
|
$file = $this->dataFile( $filename, 'image/png' );
|
|
$actual = $this->handler->getSizeAndMetadata( $file, "$this->filePath/$filename" );
|
|
$this->assertEquals( $expected, $actual );
|
|
}
|
|
|
|
public static function provideGetSizeAndMetadata() {
|
|
return [
|
|
[
|
|
'rgb-na-png.png',
|
|
[
|
|
'width' => 50,
|
|
'height' => 50,
|
|
'bits' => 8,
|
|
'metadata' => [
|
|
'frameCount' => 0,
|
|
'loopCount' => 1,
|
|
'duration' => 0.0,
|
|
'bitDepth' => 8,
|
|
'colorType' => 'truecolour',
|
|
'metadata' => [
|
|
'_MW_PNG_VERSION' => 1,
|
|
],
|
|
],
|
|
],
|
|
],
|
|
[
|
|
'xmp.png',
|
|
[
|
|
'width' => 50,
|
|
'height' => 50,
|
|
'bits' => 1,
|
|
'metadata' => [
|
|
'frameCount' => 0,
|
|
'loopCount' => 1,
|
|
'duration' => 0.0,
|
|
'bitDepth' => 1,
|
|
'colorType' => 'index-coloured',
|
|
'metadata' => [
|
|
'SerialNumber' => '123456789',
|
|
'_MW_PNG_VERSION' => 1,
|
|
],
|
|
]
|
|
]
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param string $filename
|
|
* @param array $expected Expected standard metadata
|
|
* @dataProvider provideGetIndependentMetaArray
|
|
* @covers PNGHandler::getCommonMetaArray
|
|
*/
|
|
public function testGetIndependentMetaArray( $filename, $expected ) {
|
|
$file = $this->dataFile( $filename, 'image/png' );
|
|
$actual = $this->handler->getCommonMetaArray( $file );
|
|
$this->assertEquals( $expected, $actual );
|
|
}
|
|
|
|
public static function provideGetIndependentMetaArray() {
|
|
return [
|
|
[ 'rgb-na-png.png', [] ],
|
|
[ 'xmp.png',
|
|
[
|
|
'SerialNumber' => '123456789',
|
|
]
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param string $filename
|
|
* @param float $expectedLength
|
|
* @dataProvider provideGetLength
|
|
* @covers PNGHandler::getLength
|
|
*/
|
|
public function testGetLength( $filename, $expectedLength ) {
|
|
$file = $this->dataFile( $filename, 'image/png' );
|
|
$actualLength = $file->getLength();
|
|
$this->assertEqualsWithDelta( $expectedLength, $actualLength, 0.00001 );
|
|
}
|
|
|
|
public function provideGetLength() {
|
|
return [
|
|
[ 'Animated_PNG_example_bouncing_beach_ball.png', 1.5 ],
|
|
[ 'Png-native-test.png', 0.0 ],
|
|
[ 'greyscale-png.png', 0.0 ],
|
|
[ '1bit-png.png', 0.0 ],
|
|
];
|
|
}
|
|
}
|