Skip to content

Commit

Permalink
APEtag : Smater detection of picture fields [#262]
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zeugma440
Zeugma440 committed Apr 11, 2024
1 parent 913f006 commit 69e9410
Showing 1 changed file with 37 additions and 49 deletions.
86 changes: 37 additions & 49 deletions ATL/AudioData/IO/APEtag.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class APEtag : MetaDataIO
* - Disc number : "disc", "discnumber" frames
* - Album Artist : "albumartist", "album artist" frames
*/
private static readonly IDictionary<string, Field> frameMapping = new Dictionary<string, Field>()
private static readonly IDictionary<string, Field> frameMapping = new Dictionary<string, Field>
{
{ "TITLE", Field.TITLE },
{ "ARTIST", Field.ARTIST },
Expand Down Expand Up @@ -76,6 +76,30 @@ public class APEtag : MetaDataIO
{ "LYRICIST", Field.LYRICIST }
};

private static readonly IDictionary<PictureInfo.PIC_TYPE, string> picMapping = new Dictionary<PictureInfo.PIC_TYPE, string>
{
{ PictureInfo.PIC_TYPE.Icon, "Cover Art (Icon)"},
{ PictureInfo.PIC_TYPE.Front, "Cover Art (Front)"},
{ PictureInfo.PIC_TYPE.Back, "Cover Art (Back)"},
{ PictureInfo.PIC_TYPE.Leaflet, "Cover Art (Leaflet)"},
{ PictureInfo.PIC_TYPE.CD, "Cover Art (Media)"},
{ PictureInfo.PIC_TYPE.LeadArtist, "Cover Art (Lead artist)"},
{ PictureInfo.PIC_TYPE.Artist, "Cover Art (Artist)"},
{ PictureInfo.PIC_TYPE.Conductor, "Cover Art (Conductor)"},
{ PictureInfo.PIC_TYPE.Band, "Cover Art (Band)"},
{ PictureInfo.PIC_TYPE.Composer, "Cover Art (Composer)"},
{ PictureInfo.PIC_TYPE.Lyricist, "Cover Art (Lyricist)"},
{ PictureInfo.PIC_TYPE.RecordingLocation, "Cover Art (Recording location)"},
{ PictureInfo.PIC_TYPE.DuringRecording, "Cover Art (During recording)"},
{ PictureInfo.PIC_TYPE.DuringPerformance, "Cover Art (During performance)"},
{ PictureInfo.PIC_TYPE.MovieCapture, "Cover Art (Movie capture)"},
{ PictureInfo.PIC_TYPE.Fishie, "Cover Art (A bright coloured fish)"},
{ PictureInfo.PIC_TYPE.Illustration, "Cover Art (Illustration)"},
{ PictureInfo.PIC_TYPE.BandLogo, "Cover Art (Band logotype)"},
{ PictureInfo.PIC_TYPE.PublisherLogo, "Cover Art (Publisher logotype)"},
{ PictureInfo.PIC_TYPE.Generic, "Cover Art (Other)"}
};


// APE tag data - for internal use
private sealed class TagInfo
Expand Down Expand Up @@ -191,6 +215,9 @@ private static bool readFooter(BufferedBinaryReader source, TagInfo Tag)
private bool readFrames(BufferedBinaryReader source, TagInfo Tag, ReadTagParams readTagParams)
{
source.Seek(Tag.FileSize - Tag.DataShift - Tag.Size, SeekOrigin.Begin);

var picValuesLower = picMapping.Values.Select(v => v.ToLower()).ToHashSet();

// Read all stored fields
for (int iterator = 0; iterator < Tag.FrameCount; iterator++)
{
Expand All @@ -208,7 +235,10 @@ private bool readFrames(BufferedBinaryReader source, TagInfo Tag, ReadTagParams

if (frameDataSize > 0)
{
if (frameDataSize <= 1000 || frameName.ToLower().Contains("lyrics"))
var frameNameLow = frameName.ToLower();
var isPicture = picValuesLower.Contains(frameNameLow) ||
(frameDataSize > 1000 && !frameNameLow.Contains("lyrics") && !frameNameLow.Equals("logfile"));
if (!isPicture)
{
/*
* According to spec : "Items are not zero-terminated like in C / C++.
Expand All @@ -223,7 +253,7 @@ private bool readFrames(BufferedBinaryReader source, TagInfo Tag, ReadTagParams
strValue = strValue.Replace('\0', Settings.InternalValueSeparator).Trim();
SetMetaField(frameName.Trim().ToUpper(), strValue, readTagParams.ReadAllMetaFrames);
}
else // Size > 1000; non-lyrics => Probably an embedded picture
else // Pictures
{
PictureInfo.PIC_TYPE picType = decodeAPEPictureType(frameName);

Expand Down Expand Up @@ -260,31 +290,11 @@ private bool readFrames(BufferedBinaryReader source, TagInfo Tag, ReadTagParams
/// <returns>ATL picture type corresponding to the given APE picture code; PIC_TYPE.Unsupported by default</returns>
private static PictureInfo.PIC_TYPE decodeAPEPictureType(string picCode)
{
switch (picCode.Trim().ToUpper())
foreach (var picTypePair in picMapping)
{
case "COVER ART":
case "COVER ART (OTHER)": return PictureInfo.PIC_TYPE.Generic;
case "COVER ART (ICON)": return PictureInfo.PIC_TYPE.Icon;
case "COVER ART (FRONT)": return PictureInfo.PIC_TYPE.Front;
case "COVER ART (BACK)": return PictureInfo.PIC_TYPE.Back;
case "COVER ART (LEAFLET)": return PictureInfo.PIC_TYPE.Leaflet;
case "COVER ART (MEDIA)": return PictureInfo.PIC_TYPE.CD;
case "COVER ART (LEAD ARTIST)": return PictureInfo.PIC_TYPE.LeadArtist;
case "COVER ART (ARTIST)": return PictureInfo.PIC_TYPE.Artist;
case "COVER ART (CONDUCTOR)": return PictureInfo.PIC_TYPE.Conductor;
case "COVER ART (BAND)": return PictureInfo.PIC_TYPE.Band;
case "COVER ART (COMPOSER)": return PictureInfo.PIC_TYPE.Composer;
case "COVER ART (LYRICIST)": return PictureInfo.PIC_TYPE.Lyricist;
case "COVER ART (RECORDING LOCATION)": return PictureInfo.PIC_TYPE.RecordingLocation;
case "COVER ART (DURING RECORDING)": return PictureInfo.PIC_TYPE.DuringRecording;
case "COVER ART (DURING PERFORMANCE)": return PictureInfo.PIC_TYPE.DuringPerformance;
case "COVER ART (MOVIE CAPTURE)": return PictureInfo.PIC_TYPE.MovieCapture;
case "COVER ART (A BRIGHT COLOURED FISH)": return PictureInfo.PIC_TYPE.Fishie;
case "COVER ART (ILLUSTRATION)": return PictureInfo.PIC_TYPE.Illustration;
case "COVER ART (BAND LOGOTYPE)": return PictureInfo.PIC_TYPE.BandLogo;
case "COVER ART (PUBLISHER LOGOTYPE)": return PictureInfo.PIC_TYPE.PublisherLogo;
default: return PictureInfo.PIC_TYPE.Unsupported;
if (picTypePair.Value.Equals(picCode, StringComparison.OrdinalIgnoreCase)) return picTypePair.Key;
}
return PictureInfo.PIC_TYPE.Unsupported;
}

/// <summary>
Expand All @@ -294,29 +304,7 @@ private static PictureInfo.PIC_TYPE decodeAPEPictureType(string picCode)
/// <returns>APE picture code corresponding to the given ATL picture type; "Cover Art (Other)" by default</returns>
private static string encodeAPEPictureType(PictureInfo.PIC_TYPE picType)
{
switch (picType)
{
case PictureInfo.PIC_TYPE.Icon: return "Cover Art (Icon)";
case PictureInfo.PIC_TYPE.Front: return "Cover Art (Front)";
case PictureInfo.PIC_TYPE.Back: return "Cover Art (Back)";
case PictureInfo.PIC_TYPE.Leaflet: return "Cover Art (Leaflet)";
case PictureInfo.PIC_TYPE.CD: return "Cover Art (Media)";
case PictureInfo.PIC_TYPE.LeadArtist: return "Cover Art (Lead artist)";
case PictureInfo.PIC_TYPE.Artist: return "Cover Art (Artist)";
case PictureInfo.PIC_TYPE.Conductor: return "Cover Art (Conductor)";
case PictureInfo.PIC_TYPE.Band: return "Cover Art (Band)";
case PictureInfo.PIC_TYPE.Composer: return "Cover Art (Composer)";
case PictureInfo.PIC_TYPE.Lyricist: return "Cover Art (Lyricist)";
case PictureInfo.PIC_TYPE.RecordingLocation: return "Cover Art (Recording location)";
case PictureInfo.PIC_TYPE.DuringRecording: return "Cover Art (During recording)";
case PictureInfo.PIC_TYPE.DuringPerformance: return "Cover Art (During performance)";
case PictureInfo.PIC_TYPE.MovieCapture: return "Cover Art (Movie capture)";
case PictureInfo.PIC_TYPE.Fishie: return "Cover Art (A bright coloured fish)";
case PictureInfo.PIC_TYPE.Illustration: return "Cover Art (Illustration)";
case PictureInfo.PIC_TYPE.BandLogo: return "Cover Art (Band logotype)";
case PictureInfo.PIC_TYPE.PublisherLogo: return "Cover Art (Publisher logotype)";
default: return "Cover Art (Other)";
}
return picMapping.TryGetValue(picType, out var type) ? type : "Cover Art (Other)";
}

/// <inheritdoc/>
Expand Down

0 comments on commit 69e9410

Please sign in to comment.