Commit ffd70ceb authored by Antoine Cellerier's avatar Antoine Cellerier

Try a second musicbrainz query if the first one failed. This allows for...

Try a second musicbrainz query if the first one failed. This allows for fuzzier matches (like not taking spaces into account in 1980 - 1990 for example) but still doesn't fix issues with minor spelling errors.
parent e10ba748
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Gets an artwork from amazon Gets an artwork from amazon
$Id$ $Id$
Copyright © 2007 the VideoLAN team Copyright © 2007-2010 the VideoLAN team
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -19,16 +19,7 @@ ...@@ -19,16 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
--]] --]]
-- Return the artwork function try_query(query)
function fetch_art()
local query
local meta = vlc.item:metas()
if meta["artist"] and meta["album"] then
query = "http://musicbrainz.org/ws/1/release/?type=xml&artist="..vlc.strings.encode_uri_component(meta["artist"]).."&title="..vlc.strings.encode_uri_component(meta["album"])
else
return nil
end
local l = vlc.object.libvlc() local l = vlc.object.libvlc()
local t = vlc.var.get( l, "musicbrainz-previousdate" ) local t = vlc.var.get( l, "musicbrainz-previousdate" )
if t ~= nil then if t ~= nil then
...@@ -53,3 +44,15 @@ function fetch_art() ...@@ -53,3 +44,15 @@ function fetch_art()
return nil return nil
end end
end end
-- Return the artwork
function fetch_art()
local meta = vlc.item:metas()
if not (meta["artist"] and meta["album"]) then
return nil
end
local query1 = "http://musicbrainz.org/ws/1/release/?type=xml&artist="..vlc.strings.encode_uri_component(meta["artist"]).."&title="..vlc.strings.encode_uri_component(meta["album"])
local query2 = "http://musicbrainz.org/ws/1/release/?type=xml&query=artist:"..vlc.strings.encode_uri_component(meta["artist"]).." AND "..vlc.strings.encode_uri_component(meta["album"])
return try_query(query1) or try_query(query2)
end
Markdown is supported
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