From 1eb588f743084be92c9c63898c7ba2fcf20f1236 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Thu, 6 Jun 2013 10:35:29 -0700 Subject: [PATCH] use equality for media comparisons again --- beets/autotag/match.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/beets/autotag/match.py b/beets/autotag/match.py index 59f0d00f4..cc32d6e8f 100644 --- a/beets/autotag/match.py +++ b/beets/autotag/match.py @@ -419,14 +419,16 @@ def distance(items, album_info, mapping): # Album. dist.add_string('album', likelies['album'], album_info.album) - # Preferred media. - patterns = config['match']['preferred']['media'].as_str_seq() - options = [re.compile(r'(\d+x)?(%s)' % pat, re.I) for pat in patterns] - if album_info.media and options: - dist.add_priority('media', album_info.media, options) - # Media. - elif likelies['media'] and album_info.media: - dist.add_string('media', likelies['media'], album_info.media) + # Current or preferred media. + if album_info.media: + # Preferred media options. + patterns = config['match']['preferred']['media'].as_str_seq() + options = [re.compile(r'(\d+x)?(%s)' % pat, re.I) for pat in patterns] + if options: + dist.add_priority('media', album_info.media, options) + # Current media. + elif likelies['media']: + dist.add_equality('media', album_info.media, likelies['media']) # Mediums. if likelies['disctotal'] and album_info.mediums: