Anomalie #80: liens Soundcloud marchent pas

src/Muzich/CoreBundle/ElementFactory/Site/DailymotioncomFactory.php

@@ -14,6 +14,7 @@ class DailymotioncomFactory extends BaseFactory
   public function getEmbedCode()
   {
     $url = $this->getCleanedUrl();
+    $embed_url = null;
     
     // /video/xnqcwx_le-nazisme-dans-le-couple_fun#hp-v-v2
     if (preg_match("#(video\/)([a-zA-Z0-9]+)([a-zA-Z0-9_-]*)#", $url, $chaines))

src/Muzich/CoreBundle/ElementFactory/Site/SoundcloudcomFactory.php

@@ -17,20 +17,37 @@ class SoundcloudcomFactory extends BaseFactory
   {
     $url = str_replace('www.', '', $this->element->getUrl());
     $data = str_replace('http://soundcloud.com', '', $url);
+    $embed_url = null;
     
     // http://soundcloud.com/matas/sets/library-project
-    if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $data)
+    if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $data, $chaines))
+    {
+      $embed_url = $url;
+    }
     // http://soundcloud.com/matas/anadrakonic-waltz
-         || preg_match("#^\/[a-zA-Z0-9_]+\/[a-zA-Z0-9_]+#", $data))
+    else if (preg_match("#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#", $data, $chaines))
+    {
+      $embed_url = $url;
+    }
+        
+    // Si c'est une recherche, on gère pas !
+    // /search?q[fulltext]=tatou
+    // /tracks/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D=
+    if (preg_match("#\/search\?q#", $data, $chaines))
+    {
+      $embed_url = null;
+    }
+    
+    if ($embed_url)
     {
       // l'url est valide pour l'api javascript que l'on utilise
       
       $height = $this->container->getParameter('soundcloud_player_height');
       $embed = 
         '<object height="'.$height.'" width="100%" id="embed_'.$this->element->getId().'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$url.'&amp;enable_api=true&amp;object_id=embed_'.$this->element->getId().'"></param>
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$embed_url.'&amp;enable_api=true&amp;object_id=embed_'.$this->element->getId().'"></param>
           <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$height.'" src="http://player.soundcloud.com/player.swf?url='.$url.'&amp;enable_api=true&amp;object_id=embed_'.$this->element->getId().'" type="application/x-shockwave-flash" width="100%" name="embed_'.$this->element->getId().'"></embed>
+          <embed allowscriptaccess="always" height="'.$height.'" src="http://player.soundcloud.com/player.swf?url='.$embed_url.'&amp;enable_api=true&amp;object_id=embed_'.$this->element->getId().'" type="application/x-shockwave-flash" width="100%" name="embed_'.$this->element->getId().'"></embed>
         </object>
         ';
       

src/Muzich/CoreBundle/ElementFactory/Site/YoutubeFactory.php

@@ -14,6 +14,7 @@ class YoutubeFactory extends BaseFactory
   public function getEmbedCode()
   {
     $url = $this->getCleanedUrl();
+    $embed_url = null;
     
     // http://youtu.be/9hQVA2sloGc
     if (preg_match("#\/([a-zA-Z0-9]+)#", $url, $chaines))

src/Muzich/CoreBundle/ElementFactory/Site/YoutubecomFactory.php

@@ -14,6 +14,7 @@ class YoutubecomFactory extends BaseFactory
   public function getEmbedCode()
   {
     $url = $this->getCleanedUrl();
+    $embed_url = null;
     
     // '/watch?v=kOLQIV22JAs&feature=feedrec_grec_index'
     if (preg_match("#(v\/|watch\?v=)([\w\-]+)#", $url, $chaines))