Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-29 20:12:33 +01:00
Code Issues Projects Releases Wiki Activity

Revert "lastgenre: force real lookup during import only if no custom whitelist set."

Browse source 
This reverts commit 4be30fca2e.
This commit is contained in:
Fabrice Laporte 2013-04-21 10:35:08 +02:00
parent 4be30fca2e
commit 6fdfabe4b7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
beetsplug/lastgenre/__init__.py
View file

@ -39,7 +39,6 @@ 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,
@ -199,7 +198,7 @@ class LastGenrePlugin(plugins.BeetsPlugin):
super(LastGenrePlugin, self).__init__()
self.config.add({
'whitelist': WHITELIST,
'whitelist': os.path.join(os.path.dirname(__file__), 'genres.txt'),
'fallback': None,
'canonical': None,
'source': 'album',
@ -348,8 +347,8 @@ class LastGenrePlugin(plugins.BeetsPlugin):
def imported(self, session, task):
"""Event hook called when an import task finishes."""
# Force a "real" lookup during import if no custom whitelist set
if self.config['whitelist'].get() == WHITELIST:
# Always force a "real" lookup during import.
if not self.config['force']:
self.config['force'] = True
if task.is_album: