Skip to content
Snippets Groups Projects
Commit ca3038e9 authored by Alex Arnaud's avatar Alex Arnaud
Browse files

Hotline#14175 - Improve artist name matching in lastfm photos searches.

parent 5601916b
Branches
Tags
3 merge requests!318Master,!317Hotline 6.48,!309Hotline#14175 lastfm
Expand all Hide whitespace changes
Inline Side-by-side
library/Class/WebService/Lastfm.php
+ 11
− 2
View file @ ca3038e9
......@@ -145,11 +145,20 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
foreach($nodes as $node) {
$artist = $this->xml->get_child_value($node, "NAME");
if ($this->ix->compare_expression($auteur,$artist) == true)
if (strtoupper($artist) == strtoupper($auteur))
break;
$artist = '';
}
if (!$artist) {
foreach($nodes as $node) {
$artist = $this->xml->get_child_value($node, "NAME");
if ($this->ix->compare_expression($auteur,$artist) == true)
break;
$artist = '';
}
}
if(!$artist)
return false;
......@@ -261,4 +270,4 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
}
}
?>
\ No newline at end of file
?>
tests/fixtures/lastfm_artist_christophe.html 0 → 100644
+ 816
− 0
View file @ ca3038e9
This diff is collapsed.
tests/fixtures/lastfm_artist_christophe.xml 0 → 100644
+ 339
− 0
View file @ ca3038e9
This diff is collapsed.
tests/fixtures/lastfm_artist_rage_machine.html 0 → 100644
+ 829
− 0
View file @ ca3038e9
This diff is collapsed.
tests/fixtures/lastfm_artist_rage_machine.xml 0 → 100644
+ 339
− 0
View file @ ca3038e9
<?xml version="1.0" encoding="utf-8"?>
<lfm status="ok">
<results for="rage machine" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
<opensearch:Query role="request" searchTerms="rage machine" startPage="1" />
<opensearch:totalResults>808</opensearch:totalResults>
<opensearch:startIndex>0</opensearch:startIndex>
<opensearch:itemsPerPage>30</opensearch:itemsPerPage><artistmatches>
<artist>
<name>Rage Against the Machine</name>
<listeners>2593812</listeners>
<mbid>3798b104-01cb-484c-a3b0-56adc6399b80</mbid>
<url>http://www.last.fm/music/Rage+Against+the+Machine</url>
<streamable>0</streamable>
<image size="small">http://userserve-ak.last.fm/serve/34/380903.jpg</image>
<image size="medium">http://userserve-ak.last.fm/serve/64/380903.jpg</image>
<image size="large">http://userserve-ak.last.fm/serve/126/380903.jpg</image>
<image size="extralarge">http://userserve-ak.last.fm/serve/252/380903.jpg</image>
<image size="mega">http://userserve-ak.last.fm/serve/500/380903/Rage+Against+the+Machine.jpg</image>
</artist><artist>
<name>Rage Against the Machine &amp; Tool</name>
<listeners>2571</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+the+Machine+&amp;+Tool</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against The Machine &amp; Beastie Boys</name>
<listeners>2365</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+The+Machine+&amp;+Beastie+Boys</url>
<streamable>0</streamable>
<image size="small">http://userserve-ak.last.fm/serve/34/12483169.jpg</image>
<image size="medium">http://userserve-ak.last.fm/serve/64/12483169.jpg</image>
<image size="large">http://userserve-ak.last.fm/serve/126/12483169.jpg</image>
<image size="extralarge">http://userserve-ak.last.fm/serve/252/12483169.jpg</image>
<image size="mega">http://userserve-ak.last.fm/serve/500/12483169/Rage+Against+The+Machine++Beastie+Boys+jmjjjjjjjjjjjjjjjjjjjjj.jpg</image>
</artist><artist>
<name>Shaggy vs. Rage Against The Machine</name>
<listeners>1988</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Shaggy+vs.+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Queen vs. Red Hot Chili Peppers vs. Rage Against The Machine vs. ACDC vs. Joan Jett &amp; Friends</name>
<listeners>1472</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Queen+vs.+Red+Hot+Chili+Peppers+vs.+Rage+Against+The+Machine+vs.+ACDC+vs.+Joan+Jett+&amp;+Friends</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Limp Bizkit &amp; Rage Against The Machine &amp; POD &amp; Offspring &amp; Greenday &amp; Nirvana &amp; Pearl Jam</name>
<listeners>939</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Limp+Bizkit+&amp;+Rage+Against+The+Machine+&amp;+POD+&amp;+Offspring+&amp;+Greenday+&amp;+Nirvana+&amp;+Pearl+Jam</url>
<streamable>0</streamable>
<image size="small">http://userserve-ak.last.fm/serve/34/2322209.jpg</image>
<image size="medium">http://userserve-ak.last.fm/serve/64/2322209.jpg</image>
<image size="large">http://userserve-ak.last.fm/serve/126/2322209.jpg</image>
<image size="extralarge">http://userserve-ak.last.fm/serve/252/2322209.jpg</image>
<image size="mega">http://userserve-ak.last.fm/serve/_/2322209/Limp+Bizkit++Rage+Against+The+Machine++POD++Offspr+mercy_black.jpg</image>
</artist><artist>
<name>Tool &amp; Rage Against The Machine</name>
<listeners>761</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Tool+&amp;+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against The Machine vs. Beastie Boys</name>
<listeners>634</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+The+Machine+vs.+Beastie+Boys</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Tool and Rage Against The Machine</name>
<listeners>587</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Tool+and+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against The Machine vs. Blackstreet</name>
<listeners>532</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+The+Machine+vs.+Blackstreet</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>rage machine</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/rage+machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against the Machine/Mr Oizo</name>
<listeners>298</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+the+Machine%2FMr+Oizo</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Outkast vs. Rage Against the Machine</name>
<listeners>295</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Outkast+vs.+Rage+Against+the+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>The Beatles vs. Joan Jett &amp; The Blackhearts vs. Cypress Hill vs. House Of Pain vs. Rage Against The Machine</name>
<listeners>279</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/The+Beatles+vs.+Joan+Jett+&amp;+The+Blackhearts+vs.+Cypress+Hill+vs.+House+Of+Pain+vs.+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage aganst machine</name>
<listeners>9</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+aganst+machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>The Rage Against Machine</name>
<listeners>4</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/The+Rage+Against+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Aganist Machine</name>
<listeners>4</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Aganist+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage / Machine</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+%2F+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>rage-against-machine</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/rage-against-machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Againt Machine</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Againt+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Matrix - Rage Against Machine</name>
<listeners>5</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Matrix+-+Rage+Against+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against Machine and tool</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+Machine+and+tool</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Prodigy &amp; Rage Against Machine</name>
<listeners>3</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Prodigy+&amp;+Rage+Against+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Karaoke - Rage Against The Machine</name>
<listeners>189</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Karaoke+-+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rage Against Machine/Zack De La Rocha</name>
<listeners>11</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rage+Against+Machine%2FZack+De+La+Rocha</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Wu Tang w/ rage against machine</name>
<listeners>6</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Wu+Tang+w%2F+rage+against+machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Rihanna ft. Jay-Z and Rage Against the Machine</name>
<listeners>167</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Rihanna+ft.+Jay-Z+and+Rage+Against+the+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Glenn Miller &amp; His Orchestra vs. Rage Against The Machine</name>
<listeners>167</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Glenn+Miller+&amp;+His+Orchestra+vs.+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Матрица_Rage Against The Machine</name>
<listeners>146</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/%D0%9C%D0%B0%D1%82%D1%80%D0%B8%D1%86%D0%B0_Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small"></image>
<image size="medium"></image>
<image size="large"></image>
<image size="extralarge"></image>
<image size="mega"></image>
</artist><artist>
<name>Alice In Chains &amp; Rage Against The Machine</name>
<listeners>165</listeners>
<mbid></mbid>
<url>http://www.last.fm/music/Alice+In+Chains+&amp;+Rage+Against+The+Machine</url>
<streamable>0</streamable>
<image size="small">http://userserve-ak.last.fm/serve/34/60306439.jpg</image>
<image size="medium">http://userserve-ak.last.fm/serve/64/60306439.jpg</image>
<image size="large">http://userserve-ak.last.fm/serve/126/60306439.jpg</image>
<image size="extralarge">http://userserve-ak.last.fm/serve/252/60306439.jpg</image>
<image size="mega">http://userserve-ak.last.fm/serve/_/60306439/Alice+In+Chains++Rage+Against+The+Machine+Class+of+99.jpg</image>
</artist></artistmatches>
</results></lfm>
tests/library/Class/WebService/LastfmTest.php
+ 52
− 1
View file @ ca3038e9
......@@ -119,4 +119,55 @@ class LastfmParserTest extends LastfmParserTestCase {
}
?>
\ No newline at end of file
class LastfmGetPhotosRageAgainstTheMachineTest extends LastfmParserTestCase {
public function setUp() {
parent::setUp();
$this->_http_client
->whenCalled('open_url')
->with('http://ws.audioscrobbler.com/2.0/?api_key=76d470da0d3d5cb08a7025aae2c8686a&method=artist.search&artist=RAGE+AGAINST+THE+MACHINE')
->answers(file_get_contents(realpath(dirname(__FILE__)). '/../../../fixtures/lastfm_artist_rage_machine.xml'))
->whenCalled('open_url')
->with('http://www.last.fm/music/Rage+Against+the+Machine/+images')
->answers(file_get_contents(realpath(dirname(__FILE__)). '/../../../fixtures/lastfm_artist_rage_machine.html'))
->beStrict();
$this->_photo = $this->_last_fm->getPhotos('rage against the machine');
}
/** @test */
public function firstPhotoShouldBe380903dotjpg() {
$this->assertEquals('http://userserve-ak.last.fm/serve/126s/380903.jpg',
$this->_photo[0]);
}
}
class LastfmGetPhotosChristopheTest extends LastfmParserTestCase {
public function setUp() {
parent::setUp();
$this->_http_client
->whenCalled('open_url')
->with('http://ws.audioscrobbler.com/2.0/?api_key=76d470da0d3d5cb08a7025aae2c8686a&method=artist.search&artist=CHRISTOPHE')
->answers(file_get_contents(realpath(dirname(__FILE__)). '/../../../fixtures/lastfm_artist_christophe.xml'))
->whenCalled('open_url')
->with('http://www.last.fm/music/Christophe/+images')
->answers(file_get_contents(realpath(dirname(__FILE__)). '/../../../fixtures/lastfm_artist_christophe.html'))
->beStrict();
$this->_photo = $this->_last_fm->getPhotos('christophe');
}
/** @test */
public function firstPhotoShouldBe44611277dotjpg() {
$this->assertEquals('http://userserve-ak.last.fm/serve/126s/44611277.jpg',
$this->_photo[0]);
}
}
?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment