From 4be30fca2e08d63eb4bfc21f7704fb95e5ef4d26 Mon Sep 17 00:00:00 2001 From: Fabrice Laporte Date: Sat, 20 Apr 2013 14:28:20 +0200 Subject: [PATCH] lastgenre: force real lookup during import only if no custom whitelist set. --- beetsplug/lastgenre/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py index 9b793defe..d3e0e7b5f 100644 --- a/beetsplug/lastgenre/__init__.py +++ b/beetsplug/lastgenre/__init__.py @@ -39,6 +39,7 @@ log = logging.getLogger('beets') LASTFM = pylast.LastFMNetwork(api_key=plugins.LASTFM_KEY) C14N_TREE = os.path.join(os.path.dirname(__file__), 'genres-tree.yaml') +WHITELIST = os.path.join(os.path.dirname(__file__), 'genres.txt') PYLAST_EXCEPTIONS = ( pylast.WSError, @@ -198,7 +199,7 @@ class LastGenrePlugin(plugins.BeetsPlugin): super(LastGenrePlugin, self).__init__() self.config.add({ - 'whitelist': os.path.join(os.path.dirname(__file__), 'genres.txt'), + 'whitelist': WHITELIST, 'fallback': None, 'canonical': None, 'source': 'album', @@ -347,8 +348,8 @@ class LastGenrePlugin(plugins.BeetsPlugin): def imported(self, session, task): """Event hook called when an import task finishes.""" - # Always force a "real" lookup during import. - if not self.config['force']: + # Force a "real" lookup during import if no custom whitelist set + if self.config['whitelist'].get() == WHITELIST: self.config['force'] = True if task.is_album: