Correction du code de soundcloud et jamendo factory. Mise en commentaire des tests pour les procédures attention.

src/Muzich/CoreBundle/Entity/Element.php

@@ -87,6 +87,7 @@ class Element
   const TYPE_ALBUM = 'album';
   const TYPE_PLAYLIST =  'playlist';
   const TYPE_OTHER = 'other';
+  const TYPE_NOTMATCH = 'not_match';
   
   
   /**

src/Muzich/CoreBundle/Factory/ElementFactory.php

@@ -21,7 +21,7 @@ abstract class ElementFactory
   protected $api_connector;
   protected $url_analyzer;
   
-  protected $url_matchs = array();
+  public $url_matchs = array();
   
   /**
    *
@@ -108,6 +108,11 @@ abstract class ElementFactory
     return json_decode(curl_exec($api_url), true);
   }
   
+  public function getUrlAnalyzer()
+  {
+    return $this->url_analyzer;
+  }
+  
 }
 
 ?>

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

@@ -5,14 +5,16 @@ 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;
 
 class Jamendocom extends ElementFactory
 {
   
   public function __construct(Element $element, Container $container, EntityManager $entity_manager)
   {
-    parent::__construct($element, $container, $entity_manager);
     $this->url_matchs = UrlMatchs::$jamendo;
+    parent::__construct($element, $container, $entity_manager);
   }
   
   public function getStreamData()
@@ -64,7 +66,7 @@ class Jamendocom extends ElementFactory
   
   protected function getApiTagUrl()
   {
-    return "http://api.jamendo.com/get2/name+weight/tag/json/album_tag/?".$this->url_analyzer->getType()."_id="
+    return "http://api.jamendo.com/get2/name+weight/tag/json/".$this->url_analyzer->getType()."_tag/?".$this->url_analyzer->getType()."_id="
       .$this->url_analyzer->getRefId();
   }
   
@@ -87,17 +89,16 @@ class Jamendocom extends ElementFactory
         $this->element->setData(Element::DATA_TITLE, $response->get(array(0 => 'track_name')));
       }
       
-      if (($response = $this->getApiConnector()->getResponseForUrl($this->getApiTagUrl())))
+      $tags = array();
+      $response = $this->getApiConnector()->getResponseForUrl($this->getApiTagUrl());
+      if (count($response->getContent()))
       {
-        // TODO: Check si tout ce passe bien avec pas de tags en retour de l'api
-        $tags = array();
-        foreach ($result->getContent() as $tag)
+        foreach ($response->getContent() as $tag)
         {
           $tags[] = $tag['name'];
         }
-        
-        $this->element->setData(Element::DATA_TAGS, $tags);
       }
+      $this->element->setData(Element::DATA_TAGS, $tags);
     }
     
     // Un contenu jamendo est toujours téléchargeable

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

@@ -7,14 +7,16 @@ 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;
+use Doctrine\ORM\EntityManager;
 
 class Soundcloudcom extends ElementFactory
 {
   
   public function __construct(Element $element, Container $container, EntityManager $entity_manager)
   {
-    parent::__construct($element, $container, $entity_manager);
     $this->url_matchs = UrlMatchs::$soundcloud;
+    parent::__construct($element, $container, $entity_manager);
   }
   
   public function proceedDatas()

src/Muzich/CoreBundle/Factory/UrlMatchs.php

@@ -6,6 +6,10 @@ use Muzich\CoreBundle\Entity\Element;
 
 class UrlMatchs
 {
+  /*
+   * Si il y a un Element::TYPE_NOTMATCH le placer en début de tableau !
+   */
+  
   public static $jamendo = array(
     Element::TYPE_TRACK => array(
       // http://www.jamendo.com/fr/track/894974
@@ -22,6 +26,9 @@ class UrlMatchs
   );
   
   public static $soundcloud = array(
+    Element::TYPE_NOTMATCH => array(
+      "#\/search\?q#" => null
+    ),
     Element::TYPE_OTHER => array(
       // http://soundcloud.com/matas/sets/library-project
       "#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#" => null,

src/Muzich/CoreBundle/Managers/ElementManager.php

@@ -137,7 +137,7 @@ class ElementManager
       $site_factory = $this->getFactory();
       // On récupères les datas de l'élément
       $site_factory->setUrlDatas();
-      if ($site_factory->url_analyzer->haveMatch())
+      if ($site_factory->getUrlAnalyzer()->haveMatch())
       {
         $site_factory->proceedDatas();
       }

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

@@ -46,4 +46,19 @@ class UrlAnalyzerTest extends \PHPUnit_Framework_TestCase
     $this->assertEquals(null, $url_analyzer->getRefId());
   }
   
+  public function testSoundCloud()
+  {
+    $url_analyzer = new UrlAnalyzer($this->getNewElement('soundcloud.com', 'http://soundcloud.com/matas/sets/library-project'), UrlMatchs::$soundcloud);
+    $this->assertTrue($url_analyzer->haveMatch());
+    
+    $url_analyzer = new UrlAnalyzer($this->getNewElement('soundcloud.com', 'http://soundcloud.com/noisia/black-sun-empire-noisia-feed'), UrlMatchs::$soundcloud);
+    $this->assertTrue($url_analyzer->haveMatch());
+    
+    $url_analyzer = new UrlAnalyzer($this->getNewElement('soundcloud.com', 'http://soundcloud.com/user4818423/mechanika-crew-andrew-dj-set'), UrlMatchs::$soundcloud);
+    $this->assertTrue($url_analyzer->haveMatch());
+    
+    $url_analyzer = new UrlAnalyzer($this->getNewElement('soundcloud.com', 'https://soundcloud.com/search?q=toto'), UrlMatchs::$soundcloud);
+    $this->assertFalse($url_analyzer->haveMatch());
+  }
+  
 }

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

@@ -25,6 +25,11 @@ class UrlAnalyzer
       {
         if (preg_match($expression, $this->url, $preg_result))
         {
+          if ($type == Element::TYPE_NOTMATCH)
+          {
+            return false;
+          }
+          
           if (array_key_exists($ref_id_position, $preg_result))
           {
             return array(