diff --git a/.gitignore b/.gitignore index 230d50f2e..cde892b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ man htmlcov/* .noseids *.egg +test/rsrc/lyrics/* diff --git a/docs/changelog.rst b/docs/changelog.rst index 1f8d75b99..ac673d148 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,6 +10,8 @@ library by typing ``pip install requests`` or the equivalent for your OS. New: +* :doc:`/plugins/lyrics`: Add brazilian and hispanic sources to Google custom + search engine. * A new :doc:`/plugins/permissions` makes it easy to fix permissions on music files as they are imported. Thanks to :user:`xsteadfastx`. :bug:`1098` * A new :doc:`/plugins/plexupdate` lets you notify a `Plex`_ server when the diff --git a/test/rsrc/lyricstext.yaml b/test/rsrc/lyricstext.yaml index 6ff9af7be..0866b1f4f 100644 --- a/test/rsrc/lyricstext.yaml +++ b/test/rsrc/lyricstext.yaml @@ -15,12 +15,6 @@ Jazz_n_blues: - impatient - shoes -I_could_beat_myself: - - funny - - reputation - - destroy - - shiver - Hey_it_s_ok: - swear - forgive @@ -33,6 +27,12 @@ City_of_dreams: - twilight - freeways +Black_magic_woman: + - devil + - sticks + - spell + - heart + missing_texts: | Lyricsmania staff is working hard for you to add $TITLE lyrics as soon as they'll be released by $ARTIST, check back soon! diff --git a/test/test_lyrics.py b/test/test_lyrics.py index 59c0dcdba..ea1d1943e 100644 --- a/test/test_lyrics.py +++ b/test/test_lyrics.py @@ -207,7 +207,6 @@ DEFAULT_SOURCES = [ path=u'The_Beatles:Lady_Madonna'), dict(DEFAULT_SONG, url='http://www.lyrics.com/', path=u'lady-madonna-lyrics-the-beatles.html') - ] # Every source entered in default beets google custom search engine @@ -230,19 +229,26 @@ GOOGLE_SOURCES = [ dict(url=u'http://www.lacoccinelle.net', artist=u'Jacques Brel', title=u"Amsterdam", path=u'/paroles-officielles/275679.html'), + dict(DEFAULT_SONG, + url=u'http://letras.mus.br/', path=u'the-beatles/275/'), dict(DEFAULT_SONG, url='http://www.lyricsmania.com/', path='lady_madonna_lyrics_the_beatles.html'), dict(DEFAULT_SONG, - url=u'http://www.lyrics.net', - path=u'/lyric/17547916'), + url=u'http://www.lyrics.net', path=u'/lyric/17547916'), + dict(DEFAULT_SONG, + url=u'http://www.lyricsmode.com', + path=u'/lyrics/b/beatles/lady_madonna.html'), dict(url=u'http://www.lyricsontop.com', artist=u'Amy Winehouse', title=u"Jazz'n'blues", path=u'/amy-winehouse-songs/jazz-n-blues-lyrics.html'), dict(DEFAULT_SONG, url='http://www.metrolyrics.com/', path='lady-madonna-lyrics-beatles.html'), - dict(url=u'http://www.onelyrics.net/', + dict(url='http://www.musica.com/', path='letras.asp?letra=2738', + artist=u'Santana', title=u'Black magic woman'), + dict(DEFAULT_SONG, + url=u'http://www.onelyrics.net/', artist=u'Ben & Ellen Harper', title=u'City of dreams', path='ben-ellen-harper-city-of-dreams-lyrics'), dict(url=u'http://www.paroles.net/',