Merge pull request #38 from mhor/fix_36

Dedup attributes with different case
mhor · Dec 4, 2015 · 2e82291 · 2e82291
2 parents cb8a619 + 188772c
commit 2e82291
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/src/Builder/MediaInfoContainerBuilder.php b/src/Builder/MediaInfoContainerBuilder.php
@@ -61,20 +61,46 @@ public function addTrackType($typeName, array $attributes)
      */
     private function addAttributes(AbstractType $trackType, $attributes)
     {
-        $this->mediaInfoContainer;
-        foreach ($attributes as $attribute => $value) {
+        foreach ($this->sanitizeAttributes($attributes) as $attribute => $value) {
             if ($attribute[0] === '@') {
                 continue;
             }
 
-            $attribute = $this->formatAttribute($attribute);
             $trackType->set(
                 $attribute,
                 AttributeFactory::create($attribute, $value)
             );
         }
     }
 
+    /**
+     * @param array $attributes
+     *
+     * @return array
+     */
+    private function sanitizeAttributes(array $attributes)
+    {
+        $sanitizeAttributes = array();
+        foreach ($attributes as $key => $value) {
+            $key = $this->formatAttribute($key);
+            if (isset($sanitizeAttributes[$key])) {
+                if (!is_array($sanitizeAttributes[$key])) {
+                    $sanitizeAttributes[$key] = array($sanitizeAttributes[$key]);
+                }
+
+                if (!is_array($value)) {
+                    $value = array($value);
+                }
+
+                $value = $sanitizeAttributes[$key] + $value;
+            }
+
+            $sanitizeAttributes[$key] = $value;
+        }
+
+        return $sanitizeAttributes;
+    }
+
     /**
      * @param string $attribute
      *

diff --git a/src/Parser/MediaInfoOutputParser.php b/src/Parser/MediaInfoOutputParser.php
@@ -25,8 +25,6 @@ public function parse($output)
      * @param bool $ignoreUnknownTrackTypes Optional parameter used to skip unknown track types by passing true. The
      *                                      default behavior (false) is throw an exception on unknown track types.
      *
-     * @throws Mhor\MediaInfo\Exception\UnknownTrackTypeException
-     *
      * @return MediaInfoContainer
      */
     public function getMediaInfoContainer($ignoreUnknownTrackTypes = false)

diff --git a/test/Builder/MediaInfoContainerBuilderTest.php b/test/Builder/MediaInfoContainerBuilderTest.php
@@ -2,6 +2,7 @@
 
 namespace Mhor\MediaInfo\Test\Builder;
 
+use Mhor\MediaInfo\Attribute\Duration;
 use Mhor\MediaInfo\Builder\MediaInfoContainerBuilder;
 use Mhor\MediaInfo\Factory\TypeFactory;
 use Mhor\MediaInfo\Test\Stub\TrackTestType;
@@ -73,4 +74,24 @@ public function testAddInvalidTypeOnMediaInfoContainer()
         $mediaInfoContainer = $mediaInfoContainerBuilder->build();
         $mediaInfoContainer->add(new TrackTestType());
     }
+
+    public function testSanitizeAttributes()
+    {
+        $mediaInfoContainerBuilder = new MediaInfoContainerBuilder();
+        $mediaInfoContainerBuilder->addTrackType(TypeFactory::AUDIO, array(
+            'Duration' => '10',
+            'DuRatioN' => '20',
+            'DURATION' => '4000',
+
+        ));
+
+        $mediaContainer = $mediaInfoContainerBuilder->build();
+        $audios = $mediaContainer->getAudios();
+
+        $this->assertEquals('Mhor\MediaInfo\Attribute\Duration', get_class($audios[0]->get('duration')));
+
+        /** @var Duration $duration */
+        $duration = $audios[0]->get('duration');
+        $this->assertEquals('10', $duration->getMilliseconds());
+    }
 }
diff --git a/test/fixtures/mediainfo-output.xml b/test/fixtures/mediainfo-output.xml
@@ -33,6 +33,7 @@
             <Duration>7mn 55s 193ms</Duration>
             <Duration>7mn 55s</Duration>
             <Duration>00:07:55.193</Duration>
+            <DURATION>test_field</DURATION>
             <Overall_bit_rate_mode>CBR</Overall_bit_rate_mode>
             <Overall_bit_rate_mode>Constant</Overall_bit_rate_mode>
             <Overall_bit_rate>320000</Overall_bit_rate>