X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=95cfb5765c23e41df83cb571924cdb0e6c6f6575;hb=d39dc09efbcde303e0ea8375d36d08f0e46bc865;hp=5c32b775feb9906c6317e44172db3cb9838655ea;hpb=d1650da737a01f0c480ffe8035fb56051e3cef1d;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 5c32b77..95cfb57 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2020 kaliko +# Copyright (c) 2009-2021 kaliko # # This file is part of sima # @@ -343,7 +343,7 @@ class MPD(MPDClient): tracks = set() if artist.mbid: tracks |= set(self.find('musicbrainz_artistid', artist.mbid)) - for name in artist.names_sz: + for name in artist.names: tracks |= set(self.find('artist', name)) return list(tracks) @@ -482,8 +482,9 @@ class MPD(MPDClient): self.log.debug('Searching album for %s aliases: "%s"', artist, artist.aliases) for name_sz in artist.names_sz: - raw_albums = self.list('album', f"( albumartist == '{name_sz}')") - albums = [Album(a, albumartist=artist.name, artist=artist) for a in raw_albums if a] + mpd_filter = f"((albumartist == '{name_sz}') AND ( album != ''))" + raw_albums = self.list('album', mpd_filter) + albums = [Album(a, albumartist=artist.name, artist=artist) for a in raw_albums] candidates = [] for album in albums: album_trks = self.find_tracks(album)