From 9d0ca15ace6ffd004c4f51857df4f670e562db03 Mon Sep 17 00:00:00 2001 From: Fabrice Laporte Date: Wed, 17 Dec 2014 01:05:58 +0100 Subject: [PATCH] lyrics: preserve default order of sources --- beetsplug/lyrics.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 7b12ce401..0567ae68a 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -430,6 +430,7 @@ def fetch_google(artist, title): # Plugin logic. +SOURCES_KEYS = ['google', 'lyricwiki', 'lyrics.com', 'musixmatch'] SOURCES_ALL = {'google': fetch_google, 'lyricwiki': fetch_lyricswiki, 'lyrics.com': fetch_lyricscom, @@ -445,13 +446,14 @@ class LyricsPlugin(BeetsPlugin): 'google_API_key': None, 'google_engine_ID': u'009217259823014548361:lndtuqkycfu', 'fallback': None, - 'sources': SOURCES_ALL + 'sources': SOURCES_KEYS }) - if not self.config['google_API_key'].get(): - SOURCES_ALL.pop('google', None) + if not self.config['google_API_key'].get() and \ + 'google' in SOURCES_KEYS: + SOURCES_KEYS.remove('google') self.config['sources'] = util.sanitize_choices( - self.config['sources'].as_str_seq(), SOURCES_ALL.keys()) + self.config['sources'].as_str_seq(), SOURCES_KEYS) self.backends = [] for key in self.config['sources'].as_str_seq(): self.backends.append(SOURCES_ALL[key])