From e04cb6f5482dcecec4d51b029e52a8f4f39ce9bd Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 5 Jun 2013 20:06:49 -0700 Subject: [PATCH] media field distance: binary, not string diff --- beets/autotag/match.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/beets/autotag/match.py b/beets/autotag/match.py index 0e3d2ad13..707fa2f67 100644 --- a/beets/autotag/match.py +++ b/beets/autotag/match.py @@ -275,14 +275,10 @@ def distance(items, album_info, mapping): # Actual or preferred media. if album_info.media: - preferred_media = config['match']['preferred_media'].get() - if likelies['media']: - dist += string_dist(likelies['media'], album_info.media) * \ - weights['media'].as_number() - dist_max += weights['media'].as_number() - elif preferred_media: - dist += string_dist(album_info.media, preferred_media) * \ - weights['media'].as_number() + compare_media = likelies['media'] or \ + config['match']['preferred_media'].get() + if compare_media and compare_media != album_info.media: + dist += weights['media'].as_number() dist_max += weights['media'].as_number() # MusicBrainz album ID.