Improve spam formatting string in two ways

For one thing, improve it so that if the tracknumber field is present,
but zero, it doesn't show the number sign in the spam. For the second,
only show the track artist field if it differs from the album artist.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
CQTexperiment
Christopher Snowhill 2022-02-26 01:10:27 -08:00
parent 2c0f04bbeb
commit 0f10543566
1 changed files with 3 additions and 2 deletions

View File

@ -198,8 +198,9 @@
BOOL hasBitrate = (self.bitrate != 0);
BOOL hasArtist = (self.artist != nil) && (![self.artist isEqualToString:@""]);
BOOL hasAlbumArtist = (self.albumartist != nil) && (![self.albumartist isEqualToString:@""]);
BOOL hasTrackArtist = (hasArtist && hasAlbumArtist) && (![self.albumartist isEqualToString:self.artist]);
BOOL hasAlbum = (self.album != nil) && (![self.album isEqualToString:@""]);
BOOL hasTrack = (self.track != 0);
BOOL hasTrack = (self.track != 0) && ([self.track intValue] != 0);
BOOL hasLength = (self.totalFrames != 0);
BOOL hasCurrentPosition = (self.currentPosition != 0) && (self.current);
BOOL hasExtension = NO;
@ -262,7 +263,7 @@
[elements addObject:filename];
}
if(hasAlbumArtist && hasArtist) {
if(hasTrackArtist) {
[elements addObject:@" // "];
[elements addObject:self.artist];
}