Refactorisation de la factory de spotify

src/Muzich/CoreBundle/Factory/Elements/Spotifycom.php

@@ -4,6 +4,9 @@ namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
 use Muzich\CoreBundle\Entity\Element;
+use Muzich\CoreBundle\Factory\UrlMatchs;
+use Symfony\Component\DependencyInjection\Container;
+use Doctrine\ORM\EntityManager;
 
 /**
  * 
@@ -13,6 +16,18 @@ use Muzich\CoreBundle\Entity\Element;
 class Spotifycom extends ElementFactory
 {
   
+  public function __construct(Element $element, Container $container, EntityManager $entity_manager)
+  {
+    $this->url_matchs = UrlMatchs::$spotify;
+    parent::__construct($element, $container, $entity_manager);
+  }
+  
+  public function proceedDatas()
+  {
+    $this->setElementDatasWithApi();
+    $this->proceedEmbedCode();
+  }
+  
   /**
    * 
     track http url: http://open.spotify.com/track/7ylMdCOkqumPAwIMb6j2D5
@@ -59,67 +74,105 @@ class Spotifycom extends ElementFactory
     }
   }
   
-  protected function getDataFromApi($ref_id)
+  protected function setElementDatasWithApi()
   {
-    if ($this->element->getData(Element::DATA_TYPE) == 'track')
+    if ($this->url_analyzer->getType() == Element::TYPE_TRACK)
     {
-      $data = $this->getJsonDataFromApiWithUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:track:'.$ref_id);
+      $response = $this->getApiConnector()->getResponseForUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:track:'
+        .$this->url_analyzer->getRefId()
+      );
+      $this->getApiConnector()->setElementDatasWithResponse($response, array(
+        Element::DATA_ARTIST   => array('track' => 'artist'),
+        Element::DATA_TITLE    => array('track' => 'name')
+      ));
       
-      if (array_key_exists('track', $data))
+      if (!$this->element->getData(Element::DATA_ARTIST))
       {
-        if (array_key_exists('available', $data['track']))
-        {
-          if ($data['track']['available'])
-          {
-            if (array_key_exists('artist', $data['track']))
-            {
-              $this->element->setData(Element::DATA_ARTIST, $data['track']['artist']);
-            }
-            if (array_key_exists('artists', $data['track']))
-            {
-              if (count($data['track']['artists']))
-              {
-                if (array_key_exists('name', $data['track']['artists'][0]))
-                {
-                  $this->element->setData(Element::DATA_ARTIST, $data['track']['artists'][0]['name']);
-                }
-              }
-            }
-            if (array_key_exists('name', $data['track']))
-            {
-              $this->element->setData(Element::DATA_TITLE, $data['track']['name']);
-            }
-          }
-        }
+        $this->getApiConnector()->setElementDatasWithResponse($response, array(
+          Element::DATA_ARTIST         => array('track' => array('artists' => array(0 => 'name'))),
+        ));
       }
     }
-    if ($this->element->getData(Element::DATA_TYPE) == 'album')
+    if ($this->url_analyzer->getType() == Element::TYPE_ALBUM)
     {
-      $data = $this->getJsonDataFromApiWithUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:album:'.$ref_id);
+      $response = $this->getApiConnector()->getResponseForUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:album:'
+        .$this->url_analyzer->getRefId()
+      );
+      $this->getApiConnector()->setElementDatasWithResponse($response, array(
+        Element::DATA_ARTIST   => array('album' => 'artist'),
+        Element::DATA_TITLE    => array('album' => 'name')
+      ));
       
-      if (array_key_exists('album', $data))
+      if (!$this->element->getData(Element::DATA_ARTIST))
       {
-        if (array_key_exists('artist', $data['album']))
-        {
-          $this->element->setData(Element::DATA_ARTIST, $data['album']['artist']);
-        }
-        if (array_key_exists('artists', $data['album']))
-        {
-          if (count($data['album']['artists']))
-          {
-            if (array_key_exists('name', $data['album']['artists'][0]))
-            {
-              $this->element->setData(Element::DATA_ARTIST, $data['album']['artists'][0]['name']);
-            }
-          }
-        }
-        if (array_key_exists('name', $data['album']))
-        {
-          $this->element->setData(Element::DATA_TITLE, $data['album']['name']);
-        }
+        $this->getApiConnector()->setElementDatasWithResponse($response, array(
+          Element::DATA_ARTIST         => array('album' => array('artists' => array(0 => 'name'))),
+        ));
       }
     }
     
+    
+    
+    
+    //if ($this->element->getData(Element::DATA_TYPE) == 'track')
+    //{
+    //  $data = $this->getJsonDataFromApiWithUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:track:'.$ref_id);
+    //  
+    //  if (array_key_exists('track', $data))
+    //  {
+    //    if (array_key_exists('available', $data['track']))
+    //    {
+    //      if ($data['track']['available'])
+    //      {
+    //        if (array_key_exists('artist', $data['track']))
+    //        {
+    //          $this->element->setData(Element::DATA_ARTIST, $data['track']['artist']);
+    //        }
+    //        if (array_key_exists('artists', $data['track']))
+    //        {
+    //          if (count($data['track']['artists']))
+    //          {
+    //            if (array_key_exists('name', $data['track']['artists'][0]))
+    //            {
+    //              $this->element->setData(Element::DATA_ARTIST, $data['track']['artists'][0]['name']);
+    //            }
+    //          }
+    //        }
+    //        if (array_key_exists('name', $data['track']))
+    //        {
+    //          $this->element->setData(Element::DATA_TITLE, $data['track']['name']);
+    //        }
+    //      }
+    //    }
+    //  }
+    //}
+    //if ($this->element->getData(Element::DATA_TYPE) == 'album')
+    //{
+    //  $data = $this->getJsonDataFromApiWithUrl('http://ws.spotify.com/lookup/1/.json?uri=spotify:album:'.$ref_id);
+    //  
+    //  if (array_key_exists('album', $data))
+    //  {
+    //    if (array_key_exists('artist', $data['album']))
+    //    {
+    //      $this->element->setData(Element::DATA_ARTIST, $data['album']['artist']);
+    //    }
+    //    if (array_key_exists('artists', $data['album']))
+    //    {
+    //      if (count($data['album']['artists']))
+    //      {
+    //        if (array_key_exists('name', $data['album']['artists'][0]))
+    //        {
+    //          $this->element->setData(Element::DATA_ARTIST, $data['album']['artists'][0]['name']);
+    //        }
+    //      }
+    //    }
+    //    if (array_key_exists('name', $data['album']))
+    //    {
+    //      $this->element->setData(Element::DATA_TITLE, $data['album']['name']);
+    //    }
+    //  }
+    //}
+    
   }
   
   public function proceedEmbedCode()

src/Muzich/CoreBundle/Factory/UrlMatchs.php

@@ -61,4 +61,19 @@ class UrlMatchs
       "#^\/track\/([0-9]+)#" => 1
     )
   );
+  
+  public static $spotify = array(
+    Element::TYPE_TRACK => array(
+      // http://open.spotify.com/track/7ylMdCOkqumPAwIMb6j2D5
+      "#^\/track\/([a-zA-Z0-9]+)#" => 1
+    ),
+    Element::TYPE_ALBUM => array(
+      // http://open.spotify.com/album/1VAB3Xn92dPKPWzocgQqkh
+      "#^\/album\/([a-zA-Z0-9]+)#" => 1
+    ),
+    Element::TYPE_PLAYLIST => array(
+      // http://open.spotify.com/user/bux/playlist/2kNeCiQaATbUi3lixhNwco
+      "#^\/user\/([a-zA-Z0-9_-]+)\/playlist\/([a-zA-Z0-9]+)#" => 2
+    )
+  );
 }

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -573,6 +573,31 @@ class ElementFactoryTest extends UnitTest
     //  $bux, 
     //  'http://vimeo.com/43258820'
     //));
+    //
+    ///*
+    // * Spotify
+    // *
+    // */
+    //
+    //$this->assertEquals(array(
+    //  'data_ref_id' => '1Uz3BDNxgLI0S6ACV7yXlT',
+    //  'data_title'  => 'Narkotek Old School Tracks',
+    //  'data_artist' => 'Guigoo Narkotek',
+    //  'data_type'   => 'album'
+    //),$this->proceed_element_datas_api(
+    //  $bux, 
+    //  'http://open.spotify.com/album/1Uz3BDNxgLI0S6ACV7yXlT'
+    //));
+    //
+    //$this->assertEquals(array(
+    //  'data_ref_id' => '3d5FWJe19DkUJaO2wDEQHY',
+    //  'data_title'  => 'Outta space',
+    //  'data_artist' => 'Guigoo Narkotek',
+    //  'data_type'   => 'track'
+    //),$this->proceed_element_datas_api(
+    //  $bux, 
+    //  'http://open.spotify.com/track/3d5FWJe19DkUJaO2wDEQHY'
+    //));
     
   }