Finalisation de la refactorisation du code de soundcloude et jamendo

src/Muzich/CoreBundle/Entity/Element.php

@@ -86,6 +86,7 @@ class Element
   const TYPE_TRACK = 'track';
   const TYPE_ALBUM = 'album';
   const TYPE_PLAYLIST =  'playlist';
+  const TYPE_OTHER = 'other';
   
   
   /**

src/Muzich/CoreBundle/Factory/ElementFactory.php

@@ -108,11 +108,6 @@ abstract class ElementFactory
     return json_decode(curl_exec($api_url), true);
   }
   
-  protected function configureApiConnector()
-  {
-    
-  }
-  
 }
 
 ?>

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

@@ -6,11 +6,6 @@ use Muzich\CoreBundle\Factory\ElementFactory;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Factory\UrlMatchs;
 
-/**
- * 
- *
- * @author bux
- */
 class Jamendocom extends ElementFactory
 {
   
@@ -22,36 +17,13 @@ class Jamendocom extends ElementFactory
   
   public function getStreamData()
   {
-    // On determine le type et l'url
-    $this->proceedTypeAndId();
-    
-    $type = $this->element->getData(Element::DATA_TYPE);
     $ref_id = $this->element->getData(Element::DATA_REF_ID);
+    $api_url = "http://api.jamendo.com/get2/name+stream/track/json/?". $this->element->getData(Element::DATA_TYPE)."_id=".$ref_id;
     
-    // Récupération de données avec l'API
-    $api_url = null;
-    switch ($type)
-    {
-      case 'track':
-        $api_url = "http://api.jamendo.com/get2/name+stream/track/json/?track_id=".$ref_id;
-      break;
-    
-      case 'album':
-        $api_url = "http://api.jamendo.com/get2/name+stream/track/json/?album_id=".$ref_id;
-      break;
-    }
-    
-    if ($api_url)
+    if ($ref_id)
     {
-      $ch = curl_init($api_url);
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: text/plain')
-      );
-      curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch), true);
-      
-      if (count($result))
+      $response = $this->getApiConnector()->getResponseForUrl($api_url);
+      if (count($response->getContent()))
       {
         $data_return = array();
         foreach ($result as $song)
@@ -66,12 +38,6 @@ class Jamendocom extends ElementFactory
     }
   }
   
-  /**
-   *  ALBUM = http://www.jamendo.com/fr/album/30661
-   *  TRACK = http://www.jamendo.com/fr/track/207079
-   * 
-   * API: http://developer.jamendo.com/fr/wiki/Musiclist2ApiFields
-   */
   public function retrieveDatas()
   {
     $type = $this->element->getData(Element::DATA_TYPE);
@@ -81,13 +47,13 @@ class Jamendocom extends ElementFactory
     $api_url = null;
     switch ($type)
     {
-      case 'album':
+      case Element::TYPE_ALBUM:
         $api_url = "http://api.jamendo.com/get2/"
           ."id+name+url+image+artist_name+artist_url/album/json/?album_id=".$ref_id;
         $api_tag_url = "http://api.jamendo.com/get2/name+weight/tag/json/album_tag/?album_id=".$ref_id;
       break;
     
-      case 'track':
+      case Element::TYPE_TRACK:
         $api_url = "http://api.jamendo.com/get2/"
           ."id+name+url+image+artist_name+artist_url+track_name/album/json/?track_id=".$ref_id;
         $api_tag_url = "http://api.jamendo.com/get2/name+weight/tag/json/track_tag/?track_id=".$ref_id;
@@ -96,53 +62,28 @@ class Jamendocom extends ElementFactory
     
     if ($api_url)
     {
-      $ch = curl_init($api_url);
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: text/plain')
-      );
-      curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch), true);
-      
-      if (count($result))
+      if (($response = $this->getApiConnector()->getResponseForUrl($api_url)))
       {
-        // Thumb
-        if (array_key_exists('image', $result[0]))
-        {
-          $this->element->setData(Element::DATA_THUMB_URL, $result[0]['image']);
-        }
+        // Check si tout se passe bien si pas de retour de l'api
+        $this->getApiConnector()->setElementDatasWithResponse($response, array(
+          Element::DATA_THUMB_URL      => array(0 => 'image'),
+          Element::DATA_ARTIST         => array(0 => 'artist_name'),
+        ));
         
-        // Album name
-        if (array_key_exists('name', $result[0]) && $type == 'album')
+        if ($this->url_analyzer->getType() == Element::TYPE_ALBUM)
         {
-          $this->element->setData(Element::DATA_TITLE, $result[0]['name']);
+          $this->element->setData(Element::DATA_TITLE, $response->get(array(0 => 'name')));
         }
-        
-        // Artist name
-        if (array_key_exists('artist_name', $result[0]))
-        {
-          $this->element->setData(Element::DATA_ARTIST, $result[0]['artist_name']);
-        }
-        
-        // track name
-        if (array_key_exists('track_name', $result[0])  && $type == 'track')
+        if ($this->url_analyzer->getType() == Element::TYPE_TRACK)
         {
-          $this->element->setData(Element::DATA_TITLE, $result[0]['track_name']);
+          $this->element->setData(Element::DATA_TITLE, $response->get(array(0 => 'track_name')));
         }
         
-        // Maintenant au tour des tags (deuxième requete a l'api)
-        $ch = curl_init($api_tag_url);
-        $options = array(
-          CURLOPT_RETURNTRANSFER => true,
-          CURLOPT_HTTPHEADER => array('Content-type: text/plain')
-        );
-        curl_setopt_array( $ch, $options );
-        $result = json_decode(curl_exec($ch), true);
-      
-        if (count($result))
+        if (($response = $this->getApiConnector()->getResponseForUrl($api_url)))
         {
+          // TODO: Check si tout ce passe bien avec pas de tags en retour de l'api
           $tags = array();
-          foreach ($result as $tag)
+          foreach ($result->getContent() as $tag)
           {
             $tags[] = $tag['name'];
           }

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

@@ -6,47 +6,23 @@ use Muzich\CoreBundle\Factory\ElementFactory;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Util\TagLike;
 use Muzich\CoreBundle\lib\Api\Response as ApiResponse;
+use Muzich\CoreBundle\Factory\UrlMatchs;
 
-/**
- * 
- *
- * @author bux
- */
 class Soundcloudcom extends ElementFactory
-{  
-  /**
-   * ??SET = http://soundcloud.com/matas/sets/library-project
-   * ??    = http://soundcloud.com/matas/anadrakonic-waltz
-   */
+{
+  
+  public function __construct(Element $element, Container $container, EntityManager $entity_manager)
+  {
+    parent::__construct($element, $container, $entity_manager);
+    $this->url_matchs = UrlMatchs::$soundcloud;
+  }
+  
   public function retrieveDatas()
   {
-    $url_clean = $this->getCleanedUrl();
-    
-    $match = false;
-    //
-    if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
-    {
-      $match = true;
-    }
-    // /noisia/black-sun-empire-noisia-feed
-    // /user4818423/mechanika-crew-andrew-dj-set
-    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
-    {
-      $match = true;
-    }
-    
-    // On en gère pas encore les recherches
-    if (preg_match("#\/search\?q#", $url_clean, $chaines))
-    {
-      $match = false;
-    }
-    
-    /////////////
-    if ($match)
+    if ($this->url_analyzer->haveMatch())
     {
       $this->setElementDatasWithApi();
     }
-    
   }
   
   protected function setElementDatasWithApi()
@@ -158,12 +134,6 @@ class Soundcloudcom extends ElementFactory
           .'width="100%" name="embed_'.$embed_id.'"></embed>
         </object>'
       );
-//      $this->element->setEmbed(
-//        '<iframe id="sc-widget_'.$this->element->getData(Element::DATA_REF_ID).
-//          '" src="http://w.soundcloud.com/player/?url='.
-//          $ref_id.'" width="100%" '.
-//          'height="'.$height.'" scrolling="no" frameborder="no"></iframe>'
-//      );
     }
   }
   

src/Muzich/CoreBundle/Factory/UrlMatchs.php

@@ -20,4 +20,14 @@ class UrlMatchs
       "#^\/[a-zA-Z0-9_-]+\/list\/a([0-9]+)\/.#" => 1
     )
   );
+  
+  public static $soundcloud = array(
+    Element::TYPE_OTHER => array(
+      // http://soundcloud.com/matas/sets/library-project
+      "#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#" => null,
+      // http://soundcloud.com/noisia/black-sun-empire-noisia-feed
+      // http://soundcloud.com/user4818423/mechanika-crew-andrew-dj-set
+      "#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#" => null
+    )
+  );
 }

src/Muzich/CoreBundle/lib/Api/Response.php

@@ -82,4 +82,9 @@ class Response
     return null;
   }
   
+  public function getContent()
+  {
+    return $this->content;
+  }
+  
 }

src/Muzich/CoreBundle/lib/Element/UrlAnalyzer.php

@@ -32,6 +32,13 @@ class UrlAnalyzer
               Element::DATA_REF_ID => $preg_result[$ref_id_position]
             );
           }
+          elseif ($ref_id_position === null)
+          {
+            return array(
+              Element::DATA_TYPE => $type,
+              Element::DATA_REF_ID => null
+            );
+          }
         }
       }
     }