From b901071e2ca24b3e1b2408c74c7242d00b951c9f Mon Sep 17 00:00:00 2001 From: David Date: Sun, 16 Nov 2014 10:39:50 -0500 Subject: [PATCH 1/5] Implment -> Implement --- test/test_importer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_importer.py b/test/test_importer.py index 4058e3ef6..110c4a967 100644 --- a/test/test_importer.py +++ b/test/test_importer.py @@ -382,7 +382,7 @@ class ImportRarTest(ImportZipTest): return os.path.join(_common.RSRC, 'archive.rar') -@unittest.skip('Implment me!') +@unittest.skip('Implement me!') class ImportPasswordRarTest(ImportZipTest): def create_archive(self): From dc45f2813a3e9a331e72f50c87efa90816010280 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Sun, 16 Nov 2014 11:47:43 -0800 Subject: [PATCH 2/5] Bring some FAQ text up to date --- docs/faq.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index ed88963a9..447be45e1 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -250,11 +250,11 @@ to see which version added the plugin. (You can type ``beet version`` to check which version of beets you have installed.) If you want to live on the bleeding edge and use the latest source -version of beets, you can check out the source (see the next question). +version of beets, you can check out the source (see :ref:`the relevant +question `). To see the beets documentation for your version (and avoid confusion -with new features in trunk), select your version from the -left-hand sidebar (or the buttons at the bottom of the window). +with new features in trunk), select your version from the menu in the sidebar. .. _kill: From 590b106ed0f43e84533d5f40f16b2692b21ac74b Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Sun, 16 Nov 2014 12:08:07 -0800 Subject: [PATCH 3/5] echonest: Fix #1096: log error on repeated error --- beetsplug/echonest.py | 2 +- docs/changelog.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/beetsplug/echonest.py b/beetsplug/echonest.py index e31a8c425..0beeae791 100644 --- a/beetsplug/echonest.py +++ b/beetsplug/echonest.py @@ -177,7 +177,7 @@ class EchonestMetadataPlugin(plugins.BeetsPlugin): else: # If we exited the loop without breaking, then we used up all # our allotted retries. - raise ui.UserError(u'echonest request failed repeatedly') + log.error(u'echonest request failed repeatedly') return None return result diff --git a/docs/changelog.rst b/docs/changelog.rst index bfa902f90..52406583f 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -103,6 +103,8 @@ And countless little improvements and fixes: * Fix an issue where modifying an album's field without actually changing it would not update the corresponding tracks to bring differing tracks back in line with the album. :bug:`856` +* :doc:`/plugins/echonest`: When communicating with the Echo Nest servers + fails repeatedly, log an error instead of exiting. :bug:`1096` 1.3.8 (September 17, 2014) From 5883ee0b76b4d33c623caba915bf800b79bc3aeb Mon Sep 17 00:00:00 2001 From: Alberto Leal Date: Sun, 16 Nov 2014 16:11:25 -0500 Subject: [PATCH 4/5] Default value for link title for page searches. Google API may not return results with a title attribute. --- beetsplug/lyrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 5eb46f9a2..05fb341e9 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -393,7 +393,7 @@ def fetch_google(artist, title): if 'items' in data.keys(): for item in data['items']: urlLink = item['link'] - urlTitle = item['title'] + urlTitle = item.get('title', u'') if not is_page_candidate(urlLink, urlTitle, title, artist): continue From 46ddfbaa9b6371f7aa4978cb789556705f2cd4f8 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Sun, 16 Nov 2014 13:51:59 -0800 Subject: [PATCH 5/5] Changelog for #1097 --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 52406583f..78e674ef9 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -105,6 +105,8 @@ And countless little improvements and fixes: line with the album. :bug:`856` * :doc:`/plugins/echonest`: When communicating with the Echo Nest servers fails repeatedly, log an error instead of exiting. :bug:`1096` +* :doc:`/plugins/lyrics`: Avoid an error when the Google source returns a + result without a title. Thanks to Alberto Leal. :bug:`1097` 1.3.8 (September 17, 2014)