Architecture enhancement

README.md

@@ -1,4 +1,4 @@
-#Php-MediaInfo
+#Php-MediaInfo [![Build Status](https://travis-ci.org/mhor/php-mediainfo.svg?branch=master)](https://travis-ci.org/mhor/php-mediainfo) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/mhor/php-mediainfo/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/mhor/php-mediainfo/?branch=master) [![Coverage Status](https://img.shields.io/coveralls/mhor/php-mediainfo.svg)](https://coveralls.io/r/mhor/php-mediainfo?branch=master)
 
 ## Introduction
 PHP library to run `mediainfo` command

src/Attribute/AbstractAttribute.php

@@ -2,6 +2,14 @@
 
 namespace Mhor\MediaInfo\Attribute;
 
-abstract class AbstractAttribute
+abstract class AbstractAttribute implements AttributeInterface
 {
+    /**
+     * @param $attribute
+     * @return bool
+     */
+    public function isMember($attribute)
+    {
+        return in_array($attribute, $this::getMembersFields());
+    }
 }

src/Attribute/AttributeInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Mhor\MediaInfo\Attribute;
+
+interface AttributeInterface
+{
+    public static function getMembersFields();
+
+    /**
+     * @param mixed $value
+     * @return mixed
+     */
+    public static function create($value);
+}

src/Attribute/Cover.php

@@ -11,8 +11,19 @@ class Cover extends AbstractAttribute
 
     /**
      * @param string $value
+     * @return Cover
      */
-    public function __construct($value)
+    public static function create($value)
+    {
+        $cover = new Cover();
+        $cover->setBinaryCover($value);
+        return $cover;
+    }
+
+    /**
+     * @param string $value
+     */
+    public function setBinaryCover($value)
     {
         $this->binaryCover = $value;
     }
@@ -24,4 +35,12 @@ public function getBinaryCover()
     {
         return $this->binaryCover;
     }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array('cover_data');
+    }
 }

src/Attribute/DateTime.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Mhor\MediaInfo\Attribute;
+
+class DateTime extends AbstractAttribute
+{
+
+    /**
+     * @param string $value
+     * @return \DateTime
+     */
+    public static function create($value)
+    {
+        return new \DateTime($value);
+    }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array(
+            'file_last_modification_date',
+            'file_last_modification_date__local_'
+        );
+    }
+}

src/Attribute/Duration.php

@@ -11,10 +11,21 @@ class Duration extends AbstractAttribute
 
     /**
      * @param array $durations
+     * @return Duration
      */
-    public function __construct(array $durations)
+    public static function create($durations)
     {
-        $this->milliseconds = $durations[0];
+        $duration = new Duration();
+        $duration->setMilliseconds($durations[0]);
+        return $duration;
+    }
+
+    /**
+     * @param int $milliseconds
+     */
+    public function setMilliseconds($milliseconds)
+    {
+        $this->milliseconds = $milliseconds;
     }
 
     /**
@@ -24,4 +35,12 @@ public function getMilliseconds()
     {
         return $this->milliseconds;
     }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array('duration');
+    }
 }

src/Attribute/Mode.php

@@ -14,10 +14,32 @@ class Mode extends AbstractAttribute
      */
     private $fullName;
 
-    public function __construct(array $rateMode)
+    /**
+     * @param mixed $rateMode
+     * @return Mode
+     */
+    public static function create($rateMode)
     {
-        $this->shortName = $rateMode[0];
-        $this->fullName = $rateMode[1];
+        $mode = new Mode();
+        $mode->setShortName($rateMode[0]);
+        $mode->setFullName($rateMode[1]);
+        return $mode;
+    }
+
+    /**
+     * @param string $fullName
+     */
+    public function setFullName($fullName)
+    {
+        $this->fullName = $fullName;
+    }
+
+    /**
+     * @param string $shortName
+     */
+    public function setShortName($shortName)
+    {
+        $this->shortName = $shortName;
     }
 
     /**
@@ -35,4 +57,21 @@ public function getShortName()
     {
         return $this->shortName;
     }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array(
+            'overall_bit_rate_mode',
+            'overall_bit_rate',
+            'bit_rate_mode',
+            'compression_mode',
+            'codec',
+            'format',
+            'kind_of_stream',
+            'writing_library',
+        );
+    }
 }

src/Attribute/Rate.php

@@ -16,10 +16,58 @@ class Rate extends AbstractAttribute
 
     /**
      * @param array $value
+     *
+     * @return Rate
      */
-    public function __construct(array $value)
+    public static function create($value)
     {
-        $this->absoluteValue = $value[0];
-        $this->textValue = $value[1];
+        $rate = new Rate();
+        $rate->setAbsoluteValue($value[0]);
+        $rate->setTextValue($value[1]);
+        return $rate;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAbsoluteValue()
+    {
+        return $this->absoluteValue;
+    }
+
+    /**
+     * @param int $absoluteValue
+     */
+    public function setAbsoluteValue($absoluteValue)
+    {
+        $this->absoluteValue = $absoluteValue;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTextValue()
+    {
+        return $this->textValue;
+    }
+
+    /**
+     * @param string $textValue
+     */
+    public function setTextValue($textValue)
+    {
+        $this->textValue = $textValue;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array(
+            'channel_s_',
+            'bit_rate',
+            'sampling_rate',
+        );
     }
 }

src/Attribute/Size.php

@@ -11,10 +11,22 @@ class Size extends AbstractAttribute
 
     /**
      * @param array $sizes
+     *
+     * @return Size
      */
-    public function __construct(array $sizes)
+    public static function create($sizes)
     {
-        $this->bit = $sizes[0];
+        $size = new Size();
+        $size->setBit($sizes[0]);
+        return $size;
+    }
+
+    /**
+     * @param int $bit
+     */
+    public function setBit($bit)
+    {
+        $this->bit = $bit;
     }
 
     /**
@@ -24,4 +36,15 @@ public function getBit()
     {
         return $this->bit;
     }
+
+    /**
+     * @return array
+     */
+    public static function getMembersFields()
+    {
+        return array(
+            'file_size',
+            'stream_size',
+        );
+    }
 }

src/Builder/MediaInfoContainerBuilder.php

@@ -68,7 +68,7 @@ private function addAttributes(AbstractType $trackType, $attributes)
             $attribute = $this->formatAttribute($attribute);
             $trackType->set(
                 $attribute,
-                AttributeFactory::create(get_class($trackType), $attribute, $value)
+                AttributeFactory::create($attribute, $value)
             );
         }
     }

src/Factory/AttributeFactory.php

@@ -3,30 +3,45 @@
 namespace Mhor\MediaInfo\Factory;
 
 use Mhor\MediaInfo\Attribute\AbstractAttribute;
+use Mhor\MediaInfo\Attribute\Cover;
+use Mhor\MediaInfo\Attribute\DateTime;
+use Mhor\MediaInfo\Attribute\Duration;
+use Mhor\MediaInfo\Attribute\Mode;
+use Mhor\MediaInfo\Attribute\Rate;
+use Mhor\MediaInfo\Attribute\Size;
 use Mhor\MediaInfo\Container\MediaInfoContainer;
 
 class AttributeFactory
 {
     /**
-     * @param  string                      $attributeTypeClass
-     * @param  string                      $attribute
+     * @param $attribute
      * @param $value
-     * @return \DateTime|AbstractAttribute
-     * @throws \Exception
+     * @return AbstractAttribute
      */
-    public static function create($attributeTypeClass, $attribute, $value)
+    public static function create($attribute, $value)
     {
-        switch ($attributeTypeClass) {
-            case MediaInfoContainer::VIDEO_CLASS:
-                return VideoAttributeFactory::create($attribute, $value);
-            case MediaInfoContainer::AUDIO_CLASS:
-                return AudioAttributeFactory::create($attribute, $value);
-            case MediaInfoContainer::IMAGE_CLASS:
-                return ImageAttributeFactory::create($attribute, $value);
-            case MediaInfoContainer::GENERAL_CLASS:
-                return GeneralAttributeFactory::create($attribute, $value);
-            default:
-                throw new \Exception('Type doesn\'t exist');
+        $attributesType = self::getAllAttributeType();
+        foreach($attributesType as $attributeType) {
+            if ($attributeType->isMember($attribute)) {
+                return $attributeType::create($value);
+            }
         }
+
+        return $value;
+    }
+
+    /**
+     * @return AbstractAttribute[]
+     */
+    private static function getAllAttributeType()
+    {
+        return array(
+            new Cover(),
+            new Duration(),
+            new Mode(),
+            new Rate(),
+            new Size(),
+            new DateTime(),
+        );
     }
 }