Refactorisation de la factory dailymotion + ajout de récupération title et tags

src/Muzich/CoreBundle/Factory/ElementFactory.php

@@ -7,6 +7,7 @@ use Symfony\Component\DependencyInjection\Container;
 use Doctrine\ORM\EntityManager;
 use Muzich\CoreBundle\lib\Api\Connector as ApiConnector;
 use Muzich\CoreBundle\lib\Element\UrlAnalyzer;
+use Muzich\CoreBundle\Util\TagLike;
 
 /**
  *
@@ -113,6 +114,32 @@ abstract class ElementFactory
     return $this->url_analyzer;
   }
   
+  protected function setDataTagsForElement($tags_string, $merge = array())
+  {
+    $tags_like = array();
+    if (strlen(trim($tags_string)))
+    {
+      $tag_like = new TagLike($this->entity_manager);
+      foreach (explode(' ', $tags_string) as $word)
+      {
+        $similar_tags = $tag_like->getSimilarTags($word, ($this->element->getOwner())?$this->element->getOwner()->getId():null);
+        if (count($similar_tags))
+        {
+          if ($similar_tags['same_found'])
+          {
+            $tags_like[] = $similar_tags['tags'][0]['name'];
+          }
+        }
+      }
+    }
+    
+    $tags_like = array_merge($tags_like, $merge);
+    if (count($tags_like))
+    {
+      $this->element->setData(Element::DATA_TAGS, array_unique($tags_like));
+    }
+  }
+  
 }
 
 ?>

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

@@ -4,6 +4,9 @@ namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
 use Muzich\CoreBundle\Entity\Element;
+use Symfony\Component\DependencyInjection\Container;
+use Doctrine\ORM\EntityManager;
+use Muzich\CoreBundle\Factory\UrlMatchs;
 
 /**
  * 
@@ -13,42 +16,38 @@ use Muzich\CoreBundle\Entity\Element;
 class Dailymotioncom extends ElementFactory
 {
   
+  public function __construct(Element $element, Container $container, EntityManager $entity_manager)
+  {
+    $this->url_matchs = UrlMatchs::$dailymotion;
+    parent::__construct($element, $container, $entity_manager);
+  }
+  
+  public function proceedDatas()
+  {
+    $this->setElementDatasWithApi();
+    $this->proceedEmbedCode();
+    $this->proceedThumbnailUrl();
+  }
+  
   /**
    * URL_API: http://www.dailymotion.com/doc/api/obj-video.html
-   * URL_TYPE: /video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2 (c'est quoi cette url ^^ ?) 
+   * URL_TYPE: /video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2 
    */
-  public function retrieveDatas()
+  public function setElementDatasWithApi()
   {
-    $url_clean = $this->getCleanedUrl();
-    $ref_id = null;
+    $response = $this->getApiConnector()->getResponseForUrl('https://api.dailymotion.com/video/'
+      .$this->url_analyzer->getRefId().'&fields=thumbnail_medium_url,title,tags');
     
-    // Récupération de l'id
-    if (preg_match("#\/(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url_clean, $preg_result))
-    {
-      $ref_id = $preg_result[2];
-      $this->element->setData(Element::DATA_REF_ID, $ref_id);
-    }
+    $this->getApiConnector()->setElementDatasWithResponse($response, array(
+      Element::DATA_THUMB_URL      => 'thumbnail_medium_url',
+      Element::DATA_TITLE          => 'title',
+    ));
     
-    // Récupération de données auprés de l'API
-    if ($ref_id)
+    if ($response->have('tags'))
     {
-      $api_url = curl_init('https://api.dailymotion.com/video/'.$ref_id
-        .'&fields=thumbnail_medium_url');
-      
-      $options = array(
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_HTTPHEADER => array('Content-type: application/json')
-      );
-      
-      curl_setopt_array($api_url, $options);
-      $api_result = json_decode(curl_exec($api_url));
-            
-      // On récupère l'url du thumbnail
-      if (isset($api_result->thumbnail_medium_url))
-      {
-        $this->element->setData(Element::DATA_THUMB_URL, $api_result->thumbnail_medium_url);
-      }
+      $this->setDataTagsForElement(implode(' ', $response->get('tags')));
     }
+    
   }
   
   public function proceedEmbedCode()

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

@@ -28,7 +28,7 @@ class Jamendocom extends ElementFactory
       if (count($response->getContent()))
       {
         $data_return = array();
-        foreach ($result as $song)
+        foreach ($response->getContent() as $song)
         {
           $data_return[] = array(
             'name' => $song['name'],
@@ -44,8 +44,6 @@ class Jamendocom extends ElementFactory
   public function proceedDatas()
   {
     $this->retrieveDatas();
-    // TODO: A t-on toujours besoin du code embed ou on génrère le player générique a la volée ?
-    $this->proceedEmbedCode();
     $this->proceedThumbnailUrl();
   }
   
@@ -105,33 +103,6 @@ class Jamendocom extends ElementFactory
     $this->element->setData(Element::DATA_DOWNLOAD, true);
   }
   
-  public function proceedEmbedCode()
-  {
-    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');
-      $embed_url = "http://widgets.jamendo.com/fr/$type/?".$type."_id=$ref_id&playertype=2008";
-      $this->element->setEmbed(
-        '<object width="'.$width.'" height="'.$height.'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
-            .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
-            <param name="allowScriptAccess" value="always" />
-            <param name="wmode" value="transparent" />
-            <param name="movie" value="'.$embed_url.'" />
-            <param name="quality" value="high" />
-            <param name="bgcolor" value="#FFFFFF" />
-            <embed src="'.$embed_url.'" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
-            .' width="'.$width.'" height="'.$height.'" align="middle" allowScriptAccess="always"'
-            .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
-              &nbsp;
-            </embed>
-            &nbsp;
-          </object>'  
-      );
-    }
-  }
-  
   public function proceedThumbnailUrl()
   {
     if (($thumb = $this->element->getData(Element::DATA_THUMB_URL)))

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

@@ -4,7 +4,6 @@ namespace Muzich\CoreBundle\Factory\Elements;
 
 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;
 use Symfony\Component\DependencyInjection\Container;
@@ -22,8 +21,6 @@ class Soundcloudcom extends ElementFactory
   public function proceedDatas()
   {
     $this->setElementDatasWithApi();
-    // TODO: Embed code ne devrais plus être necessaire (on créer les lecteurs avec JS)
-    $this->proceedEmbedCode();
     $this->proceedThumbnailUrl();
   }
   
@@ -86,27 +83,7 @@ class Soundcloudcom extends ElementFactory
   protected function setTagsData(ApiResponse $response)
   {
     $tags_string = $response->get('genre').' '.$response->get('tag_list').' '.str_replace(' ', '-', $response->get('genre'));
-    $tags_like = array();
-    if (strlen($tags_string))
-    {
-      $tag_like = new TagLike($this->entity_manager);
-      foreach (explode(' ', $tags_string) as $word)
-      {
-        $similar_tags = $tag_like->getSimilarTags($word, ($this->element->getOwner())?$this->element->getOwner()->getId():null);
-        if (count($similar_tags))
-        {
-          if ($similar_tags['same_found'])
-          {
-            $tags_like[] = $similar_tags['tags'][0]['name'];
-          }
-        }
-      }
-      $tags_like[] = $response->get('genre');
-      if (count($tags_like))
-      {
-        $this->element->setData(Element::DATA_TAGS, array_unique($tags_like));
-      }
-    }
+    $this->setDataTagsForElement($tags_string, array($response->get('genre')));
   }
   
   protected function setElementEmbeddableData($response)
@@ -116,29 +93,6 @@ class Soundcloudcom extends ElementFactory
     ));
   }
   
-  public function proceedEmbedCode()
-  {
-    if (($ref_id = $this->element->getData(Element::DATA_REF_ID)) 
-      && ($this->element->getData(Element::DATA_TYPE) == 'track' || $this->element->getData(Element::DATA_TYPE) == 'playlist' ))
-    {
-      $ref_id = $this->element->getUrl();
-      $embed_id = md5($ref_id);
-      $height = $this->container->getParameter('soundcloud_player_height');
-      $this->element->setEmbed(
-        '<object height="'.$height.'" width="100%" id="embed_'.$embed_id.'" '
-          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$ref_id.'&amp;'
-          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
-          <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$height.'" '
-          .'src="http://player.soundcloud.com/player.swf?url='.$ref_id.'&amp;enable_api=true'
-          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
-          .'width="100%" name="embed_'.$embed_id.'"></embed>
-        </object>'
-      );
-    }
-  }
-  
   public function proceedThumbnailUrl()
   {
     if (($thumb = $this->element->getData(Element::DATA_THUMB_URL)))

src/Muzich/CoreBundle/Factory/UrlMatchs.php

@@ -37,4 +37,11 @@ class UrlMatchs
       "#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#" => null
     )
   );
+  
+  public static $dailymotion = array(
+    Element::TYPE_OTHER => array(
+      // http://dailymotion.com/video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2
+      "#\/(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#" => 2
+    )
+  );
 }

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

@@ -329,21 +329,39 @@ class ElementFactoryTest extends UnitTest
 //    ));
 //    
 //    
-//    /*
-//     *   - dailymotion.com
-//     */
-//    
-//      // 'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music', 
-//    
-//      // TODO: l'url est pas toujours la même pour le thumb :/
-////    $this->assertEquals(array(
-////      'data_ref_id' => 'xafj1q',
-////      'data_thumb_url'  => 'http://static2.dmcdn.net/static/video/686/025/17520686:jpeg_preview_medium.jpg?20110820212502'
-////    ),$this->proceed_element_datas_api(
-////      $bux, 
-////      'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music'
-////    ));
-//    
+    ///*
+    // *   - dailymotion.com
+    // */
+    //
+    //  // 'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music'
+    //$this->assertEquals(array(
+    //  'data_ref_id' => 'xafj1q',
+    //  'data_thumb_url'  => 'http://s1.dmcdn.net/kcSK/160x120-si6.jpg',
+    //  'data_type' => 'other',
+    //  'data_title' => 'Black Bomb A - Tales From The Old School',
+    //  'data_tags' => array(
+    //    0 => 'Metal'
+    //  )
+    //),$this->proceed_element_datas_api(
+    //  $bux, 
+    //  'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music'
+    //));
+    //
+    //// http://www.dailymotion.com/video/x4om5b_punish-yourself-gimme-cocaine-live_music?search_algo=2
+    //$this->assertEquals(array(
+    //  'data_ref_id' => 'x4om5b',
+    //  'data_thumb_url'  => 'http://s1.dmcdn.net/sRiY/160x120-BYy.jpg',
+    //  'data_type' => 'other',
+    //  'data_title' => 'Punish yourself - gimme cocaine (live à nancy, azimut854)',
+    //  'data_tags' => array(
+    //    0 => 'Metal',
+    //    1 => 'Electro'
+    //  )
+    //),$this->proceed_element_datas_api(
+    //  $bux, 
+    //  'http://www.dailymotion.com/video/x4om5b_punish-yourself-gimme-cocaine-live_music?search_algo=2'
+    //));
+    //    
     ///*
     // * - soundcloud.com
     // */