localhots
/
musicbrainz
1
0
Fork 0
Code Releases Activity

Merge pull request #6 from munkius/master 

Make use of MusicBrainz' scoring scheme
This commit is contained in:
Gregory Eremin 2012-09-05 23:49:04 -07:00
parent 12d31c63c2 0b68c0c570
commit b9e90da8a3
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/musicbrainz/artist.rb
View File

@ -46,19 +46,6 @@ module MusicBrainz
:query => CGI.escape(name).gsub(/\!/, '\!') + '~',
:limit => 50
})
artists.each { |artist|
if artist[:name].downcase == name.downcase
artist[:weight] += 80
elsif artist[:name].downcase.gsub(/\s/, "") == name.downcase.gsub(/\s/, "")
artist[:weight] += 25
elsif artist[:aliases].include? name
artist[:weight] += 20
elsif artist[:aliases].map { |item| item.downcase }.include?(name.downcase)
artist[:weight] += 10
elsif artist[:aliases].map { |item| item.downcase.gsub(/\s/, "") }.include?(name.downcase.gsub(/\s/, ""))
artist[:weight] += 5
end
}
artists.sort{ |a, b| b[:weight] <=> a[:weight] }.take(10)
end

2
lib/parsers/artist.rb
View File

@ -26,7 +26,7 @@ module MusicBrainz
artists << {
:name => a.first_element_child.text.gsub(/[`’]/, "'"),
:sort_name => safe_get_value(a, "sort-name").gsub(/[`’]/, "'"),
:weight => 0,
:score => (safe_get_attr(a, nil, "score") .to_i rescue 0),
:desc => safe_get_value(a, "disambiguation"),
:type => safe_get_attr(a, nil, "type"),
:mbid => safe_get_attr(a, nil, "id"),

15
spec/requests/artist_spec.rb
View File

@ -20,10 +20,23 @@ describe MusicBrainz::Artist do
matches.first[:name].should == "Kasabian"
end
it "should return search results in the right order and pass back the correct score" do
matches = MusicBrainz::Artist.search('Chris Martin')
matches.first[:score].should == 100
matches.first[:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
matches[1][:score].should == 100
matches[1][:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
matches[2][:score].should == 95
matches[2][:mbid].should == "444d1b63-534b-4ea6-89f0-0af6ab2e20c3"
matches[3][:score].should == 95
matches[3][:mbid].should == "90fff570-a4ef-4cd4-ba21-e00c7261b05a"
end
it "finds name first than alias" do
matches = MusicBrainz::Artist.search('Chris Martin')
matches.length.should be > 0
matches.first[:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
matches.first[:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
end
it "gets correct result by name" do