Normalisation des données data dans Element, ractualisation de la récupération de données

src/Muzich/CoreBundle/Entity/Element.php

@@ -24,6 +24,57 @@ class Element
 {
   
   /**
+   * Identifiant de l'objet externe
+   * @var string 
+   */
+  const DATA_REF_ID         = "data_ref_id";
+  /**
+   * Adresse HTTP(S) de la jaquette
+   * @var string 
+   */
+  const DATA_THUMB_URL      = "data_thumb_url";
+  /**
+   * Titre de l'objet externe
+   * @var string 
+   */
+  const DATA_TITLE          = "data_title";
+  /**
+   * Nom de l'artiste
+   * @var string 
+   */
+  const DATA_ARTIST         = "data_artist";
+  /**
+   * Tags de l'objets externe array("tag1", "tag2", [...])
+   * @var string 
+   */
+  const DATA_TAGS           = "data_tags";
+  /**
+   * Type de l'objet track|album|
+   * @var string 
+   */
+  const DATA_TYPE           = "data_type";
+  /**
+   * Contenu téléchargeable ?
+   * @var string 
+   */
+  const DATA_DOWNLOAD       = "data_download";
+  /**
+   * Adresse du contenu téléchargeable
+   * @var string 
+   */
+  const DATA_DOWNLOAD_URL   = "data_download_url";
+  /**
+   * Don possible ?
+   * @var string 
+   */
+  const DATA_GIFT           = "data_gift";
+  /**
+   * Adresse pour effectuer un don
+   * @var string 
+   */
+  const DATA_GIFT_URL       = "data_gift_url";
+  
+  /**
    * @ORM\Id
    * @ORM\Column(type="integer")
    * @ORM\GeneratedValue(strategy="AUTO")

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -25,7 +26,7 @@ class Dailymotioncom extends ElementFactory
     if (preg_match("#(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url_clean, $preg_result))
     {
       $ref_id = $preg_result[2];
-      $this->element->setData('ref_id', $ref_id);
+      $this->element->setData(Element::DATA_REF_ID, $ref_id);
     }
     
     // Récupération de données auprés de l'API
@@ -45,14 +46,14 @@ class Dailymotioncom extends ElementFactory
       // On récupère l'url du thumbnail
       if (isset($api_result->thumbnail_medium_url))
       {
-        $this->element->setData('thumb_medium_url', $api_result->thumbnail_medium_url);
+        $this->element->setData(Element::DATA_THUMB_URL, $api_result->thumbnail_medium_url);
       }
     }
   }
   
   public function proceedEmbedCode()
   {
-    if (($ref_id = $this->element->getData('ref_id')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)))
     {
       $width = $this->container->getParameter('dailymotion_player_width');
       $height = $this->container->getParameter('dailymotion_player_height');
@@ -65,7 +66,7 @@ class Dailymotioncom extends ElementFactory
   
   public function proceedThumbnailUrl()
   {
-    if (($thumb = $this->element->getData('thumb_medium_url')))
+    if (($thumb = $this->element->getData(Element::DATA_THUMB_URL)))
     {
       $this->element->setThumbnailUrl($thumb);
     }

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -44,8 +45,8 @@ class Deezercom extends ElementFactory
       $ref_id = $chaines[1];
     }
     
-    $this->element->setData('type'  , $type);
-    $this->element->setData('ref_id', $ref_id);
+    $this->element->setData(Element::DATA_TYPE  , $type);
+    $this->element->setData(Element::DATA_REF_ID, $ref_id);
     
     if ($type && $ref_id)
     {
@@ -60,14 +61,15 @@ class Deezercom extends ElementFactory
 
       if (isset($result->cover))
       {
-        $this->element->setData('cover_url', $result->cover);
+        $this->element->setData(Element::DATA_THUMB_URL, $result->cover);
       }
     }
   }
   
   public function proceedEmbedCode()
   {
-    if (($ref_id = $this->element->getData('ref_id')) && ($type = $this->element->getData('type')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)) 
+      && ($type = $this->element->getData(Element::DATA_TYPE)))
     {
       $width = $this->container->getParameter('deezer_player_width');
       $heigth = $this->container->getParameter('deezer_player_height');
@@ -82,7 +84,7 @@ class Deezercom extends ElementFactory
   
   public function proceedThumbnailUrl()
   {
-    if (($thumb = $this->element->getData('cover_url')))
+    if (($thumb = $this->element->getData(Element::DATA_TYPE)))
     {
       $this->element->setThumbnailUrl($thumb);
     }

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -15,12 +16,15 @@ 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()
   {
     $url_clean = $this->getCleanedUrl();
-    
+        
     // album
+    // http://www.jamendo.com/fr/album/3409
     $type   = null;
     $ref_id = null;
     if (preg_match("#^\/[a-zA-Z0-9_-]+\/album\/([0-9]+)#", $url_clean, $chaines))
@@ -29,47 +33,44 @@ class Jamendocom extends ElementFactory
       $ref_id = $chaines[1];
     }
     // track
+    // http://www.jamendo.com/fr/track/894974
     else if (preg_match("#^\/[a-zA-Z0-9_-]+\/track\/([0-9]+)#", $url_clean, $chaines))
     {
       $type = 'track';
       $ref_id = $chaines[1];
     }
+    // album new ver
+    // http://www.jamendo.com/fr/list/a45666/proceed-positron...
+    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/list\/a([0-9]+)\/.#", $url_clean, $chaines))
+    {
+      $type   = 'album';
+      $ref_id = $chaines[1];
+    }
+    // track new ver
+    // http://www.jamendo.com/fr/track/347602/come-come
+    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/track\/([0-9]+)\/.#", $url_clean, $chaines))
+    {
+      $type = 'track';
+      $ref_id = $chaines[1];
+    }
     
-    $this->element->setData('type'  , $type);
-    $this->element->setData('ref_id', $ref_id);
+    $this->element->setData(Element::DATA_TYPE  , $type);
+    $this->element->setData(Element::DATA_REF_ID, $ref_id);
     
     // Récupération de données avec l'API
     $api_url = null;
     switch ($type)
     {
       case 'album':
-        $api_url = "http://api.jamendo.com/get2/image/album/json/?id=".$ref_id;
+        $api_url = "http://api.jamendo.com/get2/"
+          ."id+name+url+image+artist_name+artist_url/album/jsonpretty/?album_id=".$ref_id;
+        $api_tag_url = "http://api.jamendo.com/get2/name+weight/tag/json/album_tag/?album_id=".$ref_id;
       break;
     
-      /**
-       * Lorsque l'on a une track, il faut récupérer les infos sur l'album dans laquelle
-       * est la track
-       */
       case 'track':
-        $get_album_url = "http://www.jamendo.com/get/album/id/track/page/json/".$ref_id.'/';
-
-        $ch = curl_init($get_album_url);
-        curl_setopt_array($ch, array(
-          CURLOPT_RETURNTRANSFER => true,
-          CURLOPT_HTTPHEADER => array('Content-type: application/json')
-        ));
-        $result = json_decode(curl_exec($ch));
-        if (count($result))
-        {
-          $album_url = str_replace('http://www.jamendo.com', '', $result[0]);
-
-          $expl_alb = null;
-          if (preg_match("#^\/album\/([0-9]+)#", $album_url, $expl_alb))
-          {
-            $id_album = $expl_alb[1];
-            $api_url = "http://api.jamendo.com/get2/image/album/json/?id=".$id_album;
-          }
-        }
+        $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;
       break;
     }
     
@@ -81,18 +82,64 @@ class Jamendocom extends ElementFactory
         CURLOPT_HTTPHEADER => array('Content-type: text/plain')
       );
       curl_setopt_array( $ch, $options );
-      $result = json_decode(curl_exec($ch));
-      
+      $result = json_decode(curl_exec($ch), true);
+            
       if (count($result))
       {
-        $this->element->setData('thumb_url', $result[0]);
+        // Thumb
+        if (array_key_exists('image', $result[0]))
+        {
+          $this->element->setData(Element::DATA_THUMB_URL, $result[0]['image']);
+        }
+        
+        // Album name
+        if (array_key_exists('name', $result[0]) && $type == 'album')
+        {
+          $this->element->setData(Element::DATA_TITLE, $result[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')
+        {
+          $this->element->setData(Element::DATA_TITLE, $result[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))
+        {
+          $tags = array();
+          foreach ($result as $tag)
+          {
+            $tags[] = $tag['name'];
+          }
+          
+          $this->element->setData(Element::DATA_TAGS, $tags);
+        }
       }
     }
+    
+    // Un contenu jamendo est toujours téléchargeable
+    $this->element->setData(Element::DATA_DOWNLOAD, true);
   }
   
   public function proceedEmbedCode()
   {
-    if (($ref_id = $this->element->getData('ref_id')) && ($type = $this->element->getData('type')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)) 
+      && ($type = $this->element->getData(Element::DATA_TYPE)))
     {
       $height = $this->container->getParameter('jamendo_player_height');
       $width = $this->container->getParameter('jamendo_player_width');
@@ -118,7 +165,7 @@ class Jamendocom extends ElementFactory
   
   public function proceedThumbnailUrl()
   {
-    if (($thumb = $this->element->getData('thumb_url')))
+    if (($thumb = $this->element->getData(Element::DATA_THUMB_URL)))
     {
       $this->element->setThumbnailUrl($thumb);
     }

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -20,30 +21,33 @@ class Soundcloudcom extends ElementFactory
   {
     $url_clean = $this->getCleanedUrl();
     
-    $ref_id = null;
-    // ??SET
+    $match = false;
+    //
     if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
     {
-      $ref_id = $url_clean;
+      $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))
     {
-      $ref_id = $url_clean;
+      $match = true;
     }
     
     // On en gère pas encore les recherches
     if (preg_match("#\/search\?q#", $url_clean, $chaines))
     {
-      $ref_id = null;
+      $match = false;
     }
     
-    $this->element->setData('ref_id', $ref_id);
+    
+    //$this->element->setData(Element::DATA_REF_ID, $this->element->getUrl());
     
     // récupération de données avec l'API
-    if ($ref_id)
+    if ($match)
     {
-      $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$ref_id.'&client_id=39946ea18e3d78d64c0ac95a025794e1');
+      // La première étape consiste a résoudre l'url
+      $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$this->element->getUrl().'&client_id=39946ea18e3d78d64c0ac95a025794e1');
 
       $options = array(
         CURLOPT_RETURNTRANSFER => true,
@@ -62,22 +66,120 @@ class Soundcloudcom extends ElementFactory
       }
 
       $getjsonurl = $result->location;
+      // On a maintenant la bonne url pour demander les infos
       $ch = curl_init($getjsonurl);
       curl_setopt_array($ch, $options);
-      $result = json_decode(curl_exec($ch));
+      $result = json_decode(curl_exec($ch), true);
+
+      /*
+       * array
+          'kind' => string 'track' (length=5)
+          'id' => int 57452080
+          'created_at' => string '2012/08/24 20:39:44 +0000' (length=25)
+          'user_id' => int 11235441
+          'duration' => int 4206558
+          'commentable' => boolean true
+          'state' => string 'finished' (length=8)
+          'original_content_size' => int 168196212
+          'sharing' => string 'public' (length=6)
+          'tag_list' => string '' (length=0)
+          'permalink' => string 'mechanika-crew-andrew-dj-set' (length=28)
+          'streamable' => boolean true
+          'embeddable_by' => string 'all' (length=3)
+          'downloadable' => boolean true
+          'purchase_url' => null
+          'label_id' => null
+          'purchase_title' => null
+          'genre' => string '' (length=0)
+          'title' => string 'MECHANIKA CREW / ANDREW dj set 24.08.12' (length=39)
+          'description' => string '' (length=0)
+          'label_name' => string '' (length=0)
+          'release' => string '' (length=0)
+          'track_type' => string '' (length=0)
+          'key_signature' => string '' (length=0)
+          'isrc' => string '' (length=0)
+          'video_url' => null
+          'bpm' => null
+          'release_year' => null
+          'release_month' => null
+          'release_day' => null
+          'original_format' => string 'mp3' (length=3)
+          'license' => string 'all-rights-reserved' (length=19)
+          'uri' => string 'http://api.soundcloud.com/tracks/57452080' (length=41)
+          'user' => 
+            array
+              'id' => int 11235441
+              'kind' => string 'user' (length=4)
+              'permalink' => string 'user4818423' (length=11)
+              'username' => string 'Andrea Andrew mechanika' (length=23)
+              'uri' => string 'http://api.soundcloud.com/users/11235441' (length=40)
+              'permalink_url' => string 'http://soundcloud.com/user4818423' (length=33)
+              'avatar_url' => string 'http://i1.sndcdn.com/avatars-000023343399-cp1lvg-large.jpg?04ad178' (length=66)
+          'permalink_url' => string 'http://soundcloud.com/user4818423/mechanika-crew-andrew-dj-set' (length=62)
+          'artwork_url' => string 'http://i1.sndcdn.com/artworks-000029057120-6fz4k4-large.jpg?04ad178' (length=67)
+          'waveform_url' => string 'http://w1.sndcdn.com/udItSnzA5J22_m.png' (length=39)
+          'stream_url' => string 'http://api.soundcloud.com/tracks/57452080/stream' (length=48)
+          'download_url' => string 'http://api.soundcloud.com/tracks/57452080/download' (length=50)
+          'playback_count' => int 502
+          'download_count' => int 85
+          'favoritings_count' => int 12
+          'comment_count' => int 13
+          'attachments_uri' => string 'http://api.soundcloud.com/tracks/57452080/attachments' (length=53)
 
-      if (isset($result->artwork_url))
+       */
+      
+      if (array_key_exists('id', $result) )
+      {
+        $this->element->setData(Element::DATA_REF_ID, $result['id']);
+      }
+      
+      if (array_key_exists('artwork_url', $result) )
+      {
+        $this->element->setData(Element::DATA_THUMB_URL, $result['artwork_url']);
+      }
+      
+      if (array_key_exists('kind', $result) )
+      {
+        $this->element->setData(Element::DATA_TYPE, $result['kind']);
+      }
+      
+      if (array_key_exists('downloadable', $result) )
       {
-        $this->element->setData('artwork_url', $result->artwork_url);
+        $this->element->setData(Element::DATA_DOWNLOAD, $result['downloadable']);
+        // FIXME
+        $this->element->setData(Element::DATA_DOWNLOAD_URL, $this->element->getUrl().'/download');
+      }
+      
+      if (array_key_exists('title', $result) )
+      {
+        $this->element->setData(Element::DATA_TITLE, $result['title']);
+      }
+      
+      if (array_key_exists('user', $result) )
+      {
+        $this->element->setData(Element::DATA_ARTIST, $result['user']['username']);
+      }
+      
+      if (array_key_exists('genre', $result) )
+      {
+        if (strlen($result['genre']))
+        {
+          $this->element->setData(Element::DATA_TAGS, array($result['genre']));
+        }
       }
+      
+      /*
+       * TODO: Il y a un parametre share:public si a pas public pas de lecteur intégré ??
+       */
+      
     }
   }
   
   public function proceedEmbedCode()
   {
-    if (($ref_id = $this->element->getData('ref_id')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)) && $this->element->getData(Element::DATA_TYPE) == 'track')
     {
-      $ref_id = 'http://soundcloud.com'.$ref_id;
+      $ref_id = $this->element->getUrl();
       $embed_id = md5($ref_id);
       $height = $this->container->getParameter('soundcloud_player_height');
       $this->element->setEmbed(
@@ -97,7 +199,7 @@ class Soundcloudcom extends ElementFactory
   
   public function proceedThumbnailUrl()
   {
-    if (($thumb = $this->element->getData('artwork_url')))
+    if (($thumb = $this->element->getData(Element::DATA_THUMB_URL)))
     {
       $this->element->setThumbnailUrl($thumb);
     }

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\Elements\Youtubecom;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -22,7 +23,7 @@ class Youtube extends Youtubecom
       $ref_id = $chaines[1];
     }
     
-    $this->element->setData('ref_id', $ref_id);
+    $this->element->setData(Element::DATA_REF_ID, $ref_id);
     
     // Données API
     if ($ref_id)

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

@@ -3,6 +3,7 @@
 namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
+use Muzich\CoreBundle\Entity\Element;
 
 /**
  * 
@@ -12,6 +13,17 @@ use Muzich\CoreBundle\Factory\ElementFactory;
 class Youtubecom extends ElementFactory
 {
   
+  protected function proceedAPIDatas($ref_id)
+  {
+    $video_data_dom = new \DOMDocument;
+    $video_data_dom->load("http://gdata.youtube.com/feeds/api/videos/". $ref_id);
+    
+    if (($title = $video_data_dom->getElementsByTagName("title")->item(0)->nodeValue))
+    {
+      $this->element->setData(Element::DATA_TITLE, $title);
+    }
+  }
+  
   public function retrieveDatas()
   {
     $url_clean = $this->getCleanedUrl();
@@ -26,18 +38,18 @@ class Youtubecom extends ElementFactory
       $ref_id = $chaines[2];
     }
     
-    $this->element->setData('ref_id', $ref_id);
+    $this->element->setData(Element::DATA_REF_ID, $ref_id);
     
     // Données API TODO: REFACTORISER
     if ($ref_id)
     {
-      
+      $this->proceedAPIDatas($ref_id);
     }
   }
   
   public function proceedEmbedCode()
   {
-    if (($ref_id = $this->element->getData('ref_id')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)))
     {
       $width = $this->container->getParameter('youtube_player_width');
       $height = $this->container->getParameter('youtube_player_height');
@@ -51,7 +63,7 @@ class Youtubecom extends ElementFactory
   
   public function proceedThumbnailUrl()
   {
-    if (($ref_id = $this->element->getData('ref_id')))
+    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)))
     {
       $this->element->setThumbnailUrl(
         'http://img.youtube.com/vi/'.$ref_id.'/default.jpg'