X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Fblcli.py;h=a306b2c7e6dae997c84d00155ddb43579919754a;hb=48e9d961a1dce5739ad59301b179a3bd0cc02754;hp=4522e06d736f0d07822e71c64c0879f110540d18;hpb=3636f8f37183e1b1f1c581b4edfff1b1abd70462;p=mpd-sima.git diff --git a/sima/utils/blcli.py b/sima/utils/blcli.py index 4522e06..a306b2c 100644 --- a/sima/utils/blcli.py +++ b/sima/utils/blcli.py @@ -45,15 +45,15 @@ class BLCli(MPD): blocklist = self.sdb.view_bl() for entry in ['artist', 'album', 'title']: header = False - for bl in blocklist: - art = bl.get(entry, '') - mbid = bl.get(f'musicbrainz_{entry}', '') - if art or mbid: + for blitem in blocklist: + val = blitem.get(entry, '') + mbid = blitem.get(f'musicbrainz_{entry}', '') + if val or mbid: if not header: header = True self.log.info(f'{entry.capitalize()}' '(id name musicbranzID):') - self.log.info(f'{bl["id"]} "{art}"\t\t{mbid}') + self.log.info(f'{blitem["id"]} "{val}"\t\t{mbid}') def bl_add_artist(self): artist = self.options.get('artist', None) @@ -112,9 +112,8 @@ class BLCli(MPD): return track = tracks[0] album = Album(name=track.album, mbid=track.musicbrainz_albumid) - artist = Artist(name=track.artist, mbid=track.musicbrainz_artistid) self.log.info('Found album in library: %s (by "%s")', - album, artist) + album, track.Artist.albumartist) if self.sdb.get_bl_album(album, add=False): self.log.info('Already in blocklist') return