Evolution #677: Soundcloud: tags proposés

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -933,7 +933,7 @@ class ElementController extends Controller
   
   protected function findTagsWithProposeds($tags)
   {
-    $tag_like = new TagLike($this->getDoctrine());
+    $tag_like = new TagLike($this->getDoctrine()->getEntityManager());
     $tags_with_likes = array();
     foreach ($tags as $tag_name)
     {

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -258,7 +258,7 @@ class SearchController extends Controller
       if (strlen(trim($string_search)) > 1)
       {
         // On utilise l'objet TagLike
-        $TagLike = new TagLike($this->getDoctrine());
+        $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
         // Pour trier nos tags d'une manière plus humaine
         $sort_response = $TagLike->getSimilarTags($string_search, $this->getUserId());
       

src/Muzich/CoreBundle/Factory/ElementFactory.php

@@ -5,6 +5,7 @@ namespace Muzich\CoreBundle\Factory;
 use Muzich\CoreBundle\Entity\Element;
 use Symfony\Component\DependencyInjection\Container;
 use \Exception;
+use Doctrine\ORM\EntityManager;
 
 /**
  *
@@ -19,16 +20,18 @@ abstract class ElementFactory
    */
   protected $element;
   protected $container;
+  protected $entity_manager;
   
   /**
    *
    * @param Element $element
    * @param Container $container 
    */
-  public function __construct(Element $element, Container $container)
+  public function __construct(Element $element, Container $container, EntityManager $entity_manager)
   {
     $this->element   = $element;
     $this->container = $container;
+    $this->entity_manager = $entity_manager;
   }
   
   /**

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

@@ -4,6 +4,7 @@ namespace Muzich\CoreBundle\Factory\Elements;
 
 use Muzich\CoreBundle\Factory\ElementFactory;
 use Muzich\CoreBundle\Entity\Element;
+use Muzich\CoreBundle\Util\TagLike;
 
 /**
  * 
@@ -186,16 +187,49 @@ class Soundcloudcom extends ElementFactory
         {
           $this->element->setData(Element::DATA_ARTIST, $result['user']['username']);
         }
-
+        
+        $genres = '';
         if (array_key_exists('genre', $result) )
         {
           if (strlen($result['genre']))
           {
-            $this->element->setData(Element::DATA_TAGS, array($result['genre']));
+            $genres = $result['genre'];
+          }
+        }
+        
+        $tags_list = '';
+        if (array_key_exists('tag_list', $result) )
+        {
+          if (strlen($result['tag_list']))
+          {
+            $tags_list = $result['tag_list'];
           }
         }
+        
+        $tags_string = $genres.' '.$tags_list.' '.str_replace(' ', '-', $genres);
+        $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()->getId());
+            if (count($similar_tags))
+            {
+              if ($similar_tags['same_found'])
+              {
+                $tags_like[] = $similar_tags['tags'][0]['name'];
+              }
+            }
+          }
+          $tags_like[] = $genres;
+          if (count($tags_like))
+          {
+            $this->element->setData(Element::DATA_TAGS, array_unique($tags_like));
+          }
+        }
+        
       }
-            
     }
   }
   

src/Muzich/CoreBundle/Managers/ElementManager.php

@@ -152,28 +152,28 @@ class ElementManager
     switch ($this->element->getType())
     {
       case 'youtube.com':
-        return new Youtubecom($this->element, $this->container);
+        return new Youtubecom($this->element, $this->container, $this->em);
       break;
       case 'youtu.be':
-        return new Youtube($this->element, $this->container);
+        return new Youtube($this->element, $this->container, $this->em);
       break;
       case 'soundcloud.com':
-        return new Soundcloudcom($this->element, $this->container);
+        return new Soundcloudcom($this->element, $this->container, $this->em);
       break;
       case 'jamendo.com':
-        return new Jamendocom($this->element, $this->container);
+        return new Jamendocom($this->element, $this->container, $this->em);
       break;
       case 'dailymotion.com':
-        return new Dailymotioncom($this->element, $this->container);
+        return new Dailymotioncom($this->element, $this->container, $this->em);
       break;
       case 'deezer.com':
-        return new Deezercom($this->element, $this->container);
+        return new Deezercom($this->element, $this->container, $this->em);
       break;
       case 'vimeo.com':
-        return new Vimeocom($this->element, $this->container);
+        return new Vimeocom($this->element, $this->container, $this->em);
       break;
       case 'spotify.com':
-        return new Spotifycom($this->element, $this->container);
+        return new Spotifycom($this->element, $this->container, $this->em);
       break;
       default:
         throw new \Exception("La Factory n'est pas prise en charge pour ce type.");

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

@@ -373,9 +373,35 @@ class ElementFactoryTest extends UnitTest
       'data_download' => null,
       'data_download_url' => 'http://soundcloud.com/matas/sets/library-project/download',
       'data_artist' => 'matas',
-      'data_normalized_url' => 'http://api.soundcloud.com/playlists/3770'
+      'data_normalized_url' => 'http://api.soundcloud.com/playlists/3770',
+      'data_tags' => array(0 => '')
     ),$datas);
     
+    // Test des tags récupérés
+    $datas = $this->proceed_element_datas_api(
+      $bux, 
+      'https://soundcloud.com/mixessss3/white-stripes-vs-led-zeppelin-icky-kinky-love-rock-mashup-dj-zebra'
+    );
+    
+    $this->assertTrue(array_key_exists('data_thumb_url', $datas));
+    if (array_key_exists('data_thumb_url', $datas))
+    {
+      unset($datas['data_thumb_url']);
+    }
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 2215186,
+      'data_title' => 'White Stripes Vs Led Zeppelin - Icky Kinky Love (Rock Mashup) DJ Zebra',
+      //'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000000514203-fsvbcj-large.jpg?51826bf',
+      'data_type' => 'track',
+      'data_download' => false,
+      'data_download_url' => 'https://soundcloud.com/mixessss3/white-stripes-vs-led-zeppelin-icky-kinky-love-rock-mashup-dj-zebra/download',
+      'data_artist' => 'Mixes and Mashups #3',
+      'data_normalized_url' => 'http://api.soundcloud.com/tracks/2215186',
+      'data_tags' => array(0 => 'Rock', 1 => 'rock  ')
+    ),$datas);
+    
+    
     // 'http://soundcloud.com/matas/above-hyperion-redux'
     $datas = $this->proceed_element_datas_api(
       $bux, 

src/Muzich/CoreBundle/Tests/Tag/TagReadTest.php

@@ -49,7 +49,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $response = $TagLike->getSimilarTags('punk', $bux->getId());
     
     $this->assertEquals(count($cresults), count($response['tags']));
@@ -73,7 +73,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -85,7 +85,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('anarcho punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -97,7 +97,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk anarcho', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -109,7 +109,7 @@ class TagReadTest extends UnitTest
         'Punk rock', 'Ska-punk', 'Skate punk', 'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('punk anar', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -121,7 +121,7 @@ class TagReadTest extends UnitTest
         'Pop-punk', 'Post-Punk', 'Punk rock', 'Ska-jazz', 'Skacore',  'Synthpunk' 
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('ska punk', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);
@@ -132,7 +132,7 @@ class TagReadTest extends UnitTest
       'Horror punk'
     );
     
-    $TagLike = new TagLike($this->getDoctrine());
+    $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
     $tags = $this->getTagsNames($result = $TagLike->getSimilarTags('horror', $bux->getId()));
     
     $this->assertEquals($cresults, $tags);

src/Muzich/CoreBundle/Tests/User/UserTest.php

@@ -41,7 +41,7 @@ class UserTest extends UnitTest
         $jungle->getId() => 'Jungle',
         $hardtek->getId()  => 'Hardtek',
         array_search('Nouveau 1', $bux->getTagsFavoritesQuick())  => 'Nouveau 1'
-      ), $bux->getTagsFavoritesQuick());
+      ), array_unique($bux->getTagsFavoritesQuick()));
     }
     else
     {

src/Muzich/CoreBundle/Util/TagLike.php

@@ -2,8 +2,8 @@
 
 namespace Muzich\CoreBundle\Util;
 
-use Doctrine\Bundle\DoctrineBundle\Registry;
 use Muzich\CoreBundle\Util\StrictCanonicalizer;
+use Doctrine\ORM\EntityManager;
 
 /**
  * Cette classe permet d'aider a la recherche de mot similaires a un mot
@@ -13,11 +13,11 @@ use Muzich\CoreBundle\Util\StrictCanonicalizer;
 class TagLike
 {
   
-  protected $registry;
+  protected $entity_manager;
   
-  public function __construct(Registry $registry)
+  public function __construct(EntityManager $entity_manager)
   {
-    $this->registry = $registry;
+    $this->entity_manager = $entity_manager;
   }
   
   /**
@@ -168,7 +168,7 @@ class TagLike
     }
 
     $params['uid'] = '%"'.$user_id.'"%';
-    $tags_query = $this->registry->getEntityManager()->createQuery("
+    $tags_query = $this->entity_manager->createQuery("
       SELECT t.name, t.slug, t.id FROM MuzichCoreBundle:Tag t
       $where