From a50bfe911f007a7b69949c7cb00cfccf2b6b8dda Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Thu, 20 Oct 2022 23:26:46 -0400 Subject: [PATCH] ItemKey: Use spaces for alignment in `gen_map!` --- src/tag/item.rs | 458 ++++++++++++++++++++++++------------------------ 1 file changed, 229 insertions(+), 229 deletions(-) diff --git a/src/tag/item.rs b/src/tag/item.rs index 639dee00..7e68f4bf 100644 --- a/src/tag/item.rs +++ b/src/tag/item.rs @@ -66,9 +66,9 @@ gen_map!( #[cfg(feature = "aiff_text_chunks")] AIFF_TEXT_MAP; - "NAME" => TrackTitle, - "AUTH" => TrackArtist, - "(c) " => CopyrightMessage, + "NAME" => TrackTitle, + "AUTH" => TrackArtist, + "(c) " => CopyrightMessage, "COMM" | "AUTH" => Comment ); @@ -76,273 +76,273 @@ gen_map!( #[cfg(feature = "ape")] APE_MAP; - "Album" => AlbumTitle, - "DiscSubtitle" => SetSubtitle, - "Grouping" => ContentGroup, - "Title" => TrackTitle, - "Subtitle" => TrackSubtitle, - "ALBUMSORT" => AlbumTitleSortOrder, - "ALBUMARTISTSORT" => AlbumArtistSortOrder, - "TITLESORT" => TrackTitleSortOrder, - "ARTISTSORT" => TrackArtistSortOrder, + "Album" => AlbumTitle, + "DiscSubtitle" => SetSubtitle, + "Grouping" => ContentGroup, + "Title" => TrackTitle, + "Subtitle" => TrackSubtitle, + "ALBUMSORT" => AlbumTitleSortOrder, + "ALBUMARTISTSORT" => AlbumArtistSortOrder, + "TITLESORT" => TrackTitleSortOrder, + "ARTISTSORT" => TrackArtistSortOrder, "Album Artist" | "ALBUMARTIST" => AlbumArtist, - "Artist" => TrackArtist, - "Arranger" => Arranger, - "Writer" => Writer, - "Composer" => Composer, - "Conductor" => Conductor, - "Engineer" => Engineer, - "Lyricist" => Lyricist, - "DjMixer" => MixDj, - "Mixer" => MixEngineer, - "Performer" => Performer, - "Producer" => Producer, - "Label" => Label, - "MixArtist" => Remixer, - "Disc" => DiscNumber, - "Disc" => DiscTotal, - "Track" => TrackNumber, - "Track" => TrackTotal, - "Year" => Year, - "ISRC" => ISRC, - "Barcode" => Barcode, - "CatalogNumber" => CatalogNumber, - "Compilation" => FlagCompilation, - "Media" => OriginalMediaType, - "EncodedBy" => EncodedBy, + "Artist" => TrackArtist, + "Arranger" => Arranger, + "Writer" => Writer, + "Composer" => Composer, + "Conductor" => Conductor, + "Engineer" => Engineer, + "Lyricist" => Lyricist, + "DjMixer" => MixDj, + "Mixer" => MixEngineer, + "Performer" => Performer, + "Producer" => Producer, + "Label" => Label, + "MixArtist" => Remixer, + "Disc" => DiscNumber, + "Disc" => DiscTotal, + "Track" => TrackNumber, + "Track" => TrackTotal, + "Year" => Year, + "ISRC" => ISRC, + "Barcode" => Barcode, + "CatalogNumber" => CatalogNumber, + "Compilation" => FlagCompilation, + "Media" => OriginalMediaType, + "EncodedBy" => EncodedBy, "REPLAYGAIN_ALBUM_GAIN" => ReplayGainAlbumGain, "REPLAYGAIN_ALBUM_PEAK" => ReplayGainAlbumPeak, "REPLAYGAIN_TRACK_GAIN" => ReplayGainTrackGain, "REPLAYGAIN_TRACK_PEAK" => ReplayGainTrackPeak, - "Genre" => Genre, - "Mood" => Mood, - "Copyright" => CopyrightMessage, - "Comment" => Comment, - "language" => Language, - "Script" => Script, - "Lyrics" => Lyrics + "Genre" => Genre, + "Mood" => Mood, + "Copyright" => CopyrightMessage, + "Comment" => Comment, + "language" => Language, + "Script" => Script, + "Lyrics" => Lyrics ); gen_map! ( #[cfg(feature = "id3v2")] ID3V2_MAP; - "TALB" => AlbumTitle, - "TSST" => SetSubtitle, + "TALB" => AlbumTitle, + "TSST" => SetSubtitle, "TIT1" | "GRP1" => ContentGroup, - "TIT2" => TrackTitle, - "TIT3" => TrackSubtitle, - "TOAL" => OriginalAlbumTitle, - "TOPE" => OriginalArtist, - "TOLY" => OriginalLyricist, - "TSOA" => AlbumTitleSortOrder, - "TSO2" => AlbumArtistSortOrder, - "TSOT" => TrackTitleSortOrder, - "TSOP" => TrackArtistSortOrder, - "TSOC" => ComposerSortOrder, - "TPE2" => AlbumArtist, - "TPE1" => TrackArtist, - "TEXT" => Writer, - "TCOM" => Composer, - "TPE3" => Conductor, - "TIPL" => InvolvedPeople, - "TEXT" => Lyricist, - "TMCL" => MusicianCredits, - "IPRO" => Producer, - "TPUB" => Publisher, - "TPUB" => Label, - "TRSN" => InternetRadioStationName, - "TRSO" => InternetRadioStationOwner, - "TPE4" => Remixer, - "TPOS" => DiscNumber, - "TPOS" => DiscTotal, - "TRCK" => TrackNumber, - "TRCK" => TrackTotal, - "POPM" => Popularimeter, - "TDRC" => RecordingDate, - "TDOR" => OriginalReleaseDate, - "TSRC" => ISRC, - "MVNM" => Movement, - "MVIN" => MovementIndex, - "TCMP" => FlagCompilation, - "PCST" => FlagPodcast, - "TFLT" => FileType, - "TOWN" => FileOwner, - "TDTG" => TaggingTime, - "TLEN" => Length, - "TOFN" => OriginalFileName, - "TMED" => OriginalMediaType, - "TENC" => EncodedBy, - "TSSE" => EncoderSoftware, - "TSSE" => EncoderSettings, - "TDEN" => EncodingTime, + "TIT2" => TrackTitle, + "TIT3" => TrackSubtitle, + "TOAL" => OriginalAlbumTitle, + "TOPE" => OriginalArtist, + "TOLY" => OriginalLyricist, + "TSOA" => AlbumTitleSortOrder, + "TSO2" => AlbumArtistSortOrder, + "TSOT" => TrackTitleSortOrder, + "TSOP" => TrackArtistSortOrder, + "TSOC" => ComposerSortOrder, + "TPE2" => AlbumArtist, + "TPE1" => TrackArtist, + "TEXT" => Writer, + "TCOM" => Composer, + "TPE3" => Conductor, + "TIPL" => InvolvedPeople, + "TEXT" => Lyricist, + "TMCL" => MusicianCredits, + "IPRO" => Producer, + "TPUB" => Publisher, + "TPUB" => Label, + "TRSN" => InternetRadioStationName, + "TRSO" => InternetRadioStationOwner, + "TPE4" => Remixer, + "TPOS" => DiscNumber, + "TPOS" => DiscTotal, + "TRCK" => TrackNumber, + "TRCK" => TrackTotal, + "POPM" => Popularimeter, + "TDRC" => RecordingDate, + "TDOR" => OriginalReleaseDate, + "TSRC" => ISRC, + "MVNM" => Movement, + "MVIN" => MovementIndex, + "TCMP" => FlagCompilation, + "PCST" => FlagPodcast, + "TFLT" => FileType, + "TOWN" => FileOwner, + "TDTG" => TaggingTime, + "TLEN" => Length, + "TOFN" => OriginalFileName, + "TMED" => OriginalMediaType, + "TENC" => EncodedBy, + "TSSE" => EncoderSoftware, + "TSSE" => EncoderSettings, + "TDEN" => EncodingTime, "REPLAYGAIN_ALBUM_GAIN" => ReplayGainAlbumGain, "REPLAYGAIN_ALBUM_PEAK" => ReplayGainAlbumPeak, "REPLAYGAIN_TRACK_GAIN" => ReplayGainTrackGain, "REPLAYGAIN_TRACK_PEAK" => ReplayGainTrackPeak, - "WOAF" => AudioFileURL, - "WOAS" => AudioSourceURL, - "WCOM" => CommercialInformationURL, - "WCOP" => CopyrightURL, - "WOAR" => TrackArtistURL, - "WORS" => RadioStationURL, - "WPAY" => PaymentURL, - "WPUB" => PublisherURL, - "TCON" => Genre, - "TKEY" => InitialKey, - "TMOO" => Mood, - "TBPM" => BPM, - "TCOP" => CopyrightMessage, - "TDES" => PodcastDescription, - "TCAT" => PodcastSeriesCategory, - "WFED" => PodcastURL, - "TDRL" => PodcastReleaseDate, - "TGID" => PodcastGlobalUniqueID, - "TKWD" => PodcastKeywords, - "COMM" => Comment, - "TLAN" => Language, - "USLT" => Lyrics + "WOAF" => AudioFileURL, + "WOAS" => AudioSourceURL, + "WCOM" => CommercialInformationURL, + "WCOP" => CopyrightURL, + "WOAR" => TrackArtistURL, + "WORS" => RadioStationURL, + "WPAY" => PaymentURL, + "WPUB" => PublisherURL, + "TCON" => Genre, + "TKEY" => InitialKey, + "TMOO" => Mood, + "TBPM" => BPM, + "TCOP" => CopyrightMessage, + "TDES" => PodcastDescription, + "TCAT" => PodcastSeriesCategory, + "WFED" => PodcastURL, + "TDRL" => PodcastReleaseDate, + "TGID" => PodcastGlobalUniqueID, + "TKWD" => PodcastKeywords, + "COMM" => Comment, + "TLAN" => Language, + "USLT" => Lyrics ); gen_map! ( #[cfg(feature = "mp4_ilst")] ILST_MAP; - "\u{a9}alb" => AlbumTitle, - "----:com.apple.iTunes:DISCSUBTITLE" => SetSubtitle, - "tvsh" => ShowName, - "\u{a9}grp" => ContentGroup, - "\u{a9}nam" => TrackTitle, - "----:com.apple.iTunes:SUBTITLE" => TrackSubtitle, - "soal" => AlbumTitleSortOrder, - "soaa" => AlbumArtistSortOrder, - "sonm" => TrackTitleSortOrder, - "soar" => TrackArtistSortOrder, - "sosn" => ShowNameSortOrder, - "soco" => ComposerSortOrder, - "aART" => AlbumArtist, - "\u{a9}ART" => TrackArtist, - "\u{a9}wrt" => Composer, - "----:com.apple.iTunes:CONDUCTOR" => Conductor, - "----:com.apple.iTunes:ENGINEER" => Engineer, - "----:com.apple.iTunes:LYRICIST" => Lyricist, - "----:com.apple.iTunes:DJMIXER" => MixDj, - "----:com.apple.iTunes:MIXER" => MixEngineer, - "----:com.apple.iTunes:PRODUCER" => Producer, - "----:com.apple.iTunes:LABEL" => Label, - "----:com.apple.iTunes:REMIXER" => Remixer, - "disk" => DiscNumber, - "disk" => DiscTotal, - "trkn" => TrackNumber, - "trkn" => TrackTotal, - "rate" => Popularimeter, - "rtng" => ParentalAdvisory, - "\u{a9}day" => RecordingDate, - "----:com.apple.iTunes:ISRC" => ISRC, - "----:com.apple.iTunes:BARCODE" => Barcode, - "----:com.apple.iTunes:CATALOGNUMBER" => CatalogNumber, - "cpil" => FlagCompilation, - "pcst" => FlagPodcast, - "----:com.apple.iTunes:MEDIA" => OriginalMediaType, - "\u{a9}enc" => EncodedBy, - "\u{a9}too" => EncoderSoftware, - "\u{a9}gen" => Genre, - "----:com.apple.iTunes:MOOD" => Mood, - "tmpo" => BPM, - "cprt" => CopyrightMessage, - "----:com.apple.iTunes:LICENSE" => License, - "ldes" => PodcastDescription, - "catg" => PodcastSeriesCategory, - "purl" => PodcastURL, - "egid" => PodcastGlobalUniqueID, - "keyw" => PodcastKeywords, - "\u{a9}cmt" => Comment, - "desc" => Description, - "----:com.apple.iTunes:LANGUAGE" => Language, - "----:com.apple.iTunes:SCRIPT" => Script, - "\u{a9}lyr" => Lyrics + "\u{a9}alb" => AlbumTitle, + "----:com.apple.iTunes:DISCSUBTITLE" => SetSubtitle, + "tvsh" => ShowName, + "\u{a9}grp" => ContentGroup, + "\u{a9}nam" => TrackTitle, + "----:com.apple.iTunes:SUBTITLE" => TrackSubtitle, + "soal" => AlbumTitleSortOrder, + "soaa" => AlbumArtistSortOrder, + "sonm" => TrackTitleSortOrder, + "soar" => TrackArtistSortOrder, + "sosn" => ShowNameSortOrder, + "soco" => ComposerSortOrder, + "aART" => AlbumArtist, + "\u{a9}ART" => TrackArtist, + "\u{a9}wrt" => Composer, + "----:com.apple.iTunes:CONDUCTOR" => Conductor, + "----:com.apple.iTunes:ENGINEER" => Engineer, + "----:com.apple.iTunes:LYRICIST" => Lyricist, + "----:com.apple.iTunes:DJMIXER" => MixDj, + "----:com.apple.iTunes:MIXER" => MixEngineer, + "----:com.apple.iTunes:PRODUCER" => Producer, + "----:com.apple.iTunes:LABEL" => Label, + "----:com.apple.iTunes:REMIXER" => Remixer, + "disk" => DiscNumber, + "disk" => DiscTotal, + "trkn" => TrackNumber, + "trkn" => TrackTotal, + "rate" => Popularimeter, + "rtng" => ParentalAdvisory, + "\u{a9}day" => RecordingDate, + "----:com.apple.iTunes:ISRC" => ISRC, + "----:com.apple.iTunes:BARCODE" => Barcode, + "----:com.apple.iTunes:CATALOGNUMBER" => CatalogNumber, + "cpil" => FlagCompilation, + "pcst" => FlagPodcast, + "----:com.apple.iTunes:MEDIA" => OriginalMediaType, + "\u{a9}enc" => EncodedBy, + "\u{a9}too" => EncoderSoftware, + "\u{a9}gen" => Genre, + "----:com.apple.iTunes:MOOD" => Mood, + "tmpo" => BPM, + "cprt" => CopyrightMessage, + "----:com.apple.iTunes:LICENSE" => License, + "ldes" => PodcastDescription, + "catg" => PodcastSeriesCategory, + "purl" => PodcastURL, + "egid" => PodcastGlobalUniqueID, + "keyw" => PodcastKeywords, + "\u{a9}cmt" => Comment, + "desc" => Description, + "----:com.apple.iTunes:LANGUAGE" => Language, + "----:com.apple.iTunes:SCRIPT" => Script, + "\u{a9}lyr" => Lyrics ); gen_map! ( #[cfg(feature = "riff_info_list")] RIFF_INFO_MAP; - "IPRD" => AlbumTitle, - "INAM" => TrackTitle, - "IART" => TrackArtist, - "IWRI" => Writer, - "IMUS" => Composer, - "IPRO" => Producer, + "IPRD" => AlbumTitle, + "INAM" => TrackTitle, + "IART" => TrackArtist, + "IWRI" => Writer, + "IMUS" => Composer, + "IPRO" => Producer, "IPRT" | "ITRK" => TrackNumber, - "IFRM" => TrackTotal, - "IRTD" => Popularimeter, - "ICRD" => RecordingDate, - "TLEN" => Length, - "ISRF" => OriginalMediaType, - "ITCH" => EncodedBy, - "ISFT" => EncoderSoftware, - "IGNR" => Genre, - "ICOP" => CopyrightMessage, - "ICMT" => Comment, - "ILNG" => Language + "IFRM" => TrackTotal, + "IRTD" => Popularimeter, + "ICRD" => RecordingDate, + "TLEN" => Length, + "ISRF" => OriginalMediaType, + "ITCH" => EncodedBy, + "ISFT" => EncoderSoftware, + "IGNR" => Genre, + "ICOP" => CopyrightMessage, + "ICMT" => Comment, + "ILNG" => Language ); gen_map!( #[cfg(feature = "vorbis_comments")] VORBIS_MAP; - "ALBUM" => AlbumTitle, - "DISCSUBTITLE" => SetSubtitle, - "GROUPING" => ContentGroup, - "TITLE" => TrackTitle, - "SUBTITLE" => TrackSubtitle, - "ALBUMSORT" => AlbumTitleSortOrder, - "ALBUMARTISTSORT" => AlbumArtistSortOrder, - "TITLESORT" => TrackTitleSortOrder, - "ARTISTSORT" => TrackArtistSortOrder, - "ALBUMARTIST" => AlbumArtist, - "ARTIST" => TrackArtist, - "ARRANGER" => Arranger, - "AUTHOR" | "WRITER" => Writer, - "COMPOSER" => Composer, - "CONDUCTOR" => Conductor, - "ENGINEER" => Engineer, - "LYRICIST" => Lyricist, - "DJMIXER" => MixDj, - "MIXER" => MixEngineer, - "PERFORMER" => Performer, - "PRODUCER" => Producer, - "PUBLISHER" => Publisher, - "LABEL" => Label, - "REMIXER" => Remixer, - "DISCNUMBER" => DiscNumber, - "DISCTOTAL" | "TOTALDISCS" => DiscTotal, - "TRACKNUMBER" => TrackNumber, + "ALBUM" => AlbumTitle, + "DISCSUBTITLE" => SetSubtitle, + "GROUPING" => ContentGroup, + "TITLE" => TrackTitle, + "SUBTITLE" => TrackSubtitle, + "ALBUMSORT" => AlbumTitleSortOrder, + "ALBUMARTISTSORT" => AlbumArtistSortOrder, + "TITLESORT" => TrackTitleSortOrder, + "ARTISTSORT" => TrackArtistSortOrder, + "ALBUMARTIST" => AlbumArtist, + "ARTIST" => TrackArtist, + "ARRANGER" => Arranger, + "AUTHOR" | "WRITER" => Writer, + "COMPOSER" => Composer, + "CONDUCTOR" => Conductor, + "ENGINEER" => Engineer, + "LYRICIST" => Lyricist, + "DJMIXER" => MixDj, + "MIXER" => MixEngineer, + "PERFORMER" => Performer, + "PRODUCER" => Producer, + "PUBLISHER" => Publisher, + "LABEL" => Label, + "REMIXER" => Remixer, + "DISCNUMBER" => DiscNumber, + "DISCTOTAL" | "TOTALDISCS" => DiscTotal, + "TRACKNUMBER" => TrackNumber, "TRACKTOTAL" | "TOTALTRACKS" => TrackTotal, - "RATING" => Popularimeter, - "DATE" => RecordingDate, - "YEAR" => Year, - "ORIGINALDATE" => OriginalReleaseDate, - "ISRC" => ISRC, - "CATALOGNUMBER" => CatalogNumber, - "COMPILATION" => FlagCompilation, - "MEDIA" => OriginalMediaType, - "ENCODED-BY" => EncodedBy, - "ENCODER" => EncoderSoftware, + "RATING" => Popularimeter, + "DATE" => RecordingDate, + "YEAR" => Year, + "ORIGINALDATE" => OriginalReleaseDate, + "ISRC" => ISRC, + "CATALOGNUMBER" => CatalogNumber, + "COMPILATION" => FlagCompilation, + "MEDIA" => OriginalMediaType, + "ENCODED-BY" => EncodedBy, + "ENCODER" => EncoderSoftware, "ENCODING" | "ENCODERSETTINGS" => EncoderSettings, "REPLAYGAIN_ALBUM_GAIN" => ReplayGainAlbumGain, "REPLAYGAIN_ALBUM_PEAK" => ReplayGainAlbumPeak, "REPLAYGAIN_TRACK_GAIN" => ReplayGainTrackGain, "REPLAYGAIN_TRACK_PEAK" => ReplayGainTrackPeak, - "GENRE" => Genre, - "MOOD" => Mood, - "BPM" => BPM, - "COPYRIGHT" => CopyrightMessage, - "LICENSE" => License, - "COMMENT" => Comment, - "LANGUAGE" => Language, - "SCRIPT" => Script, - "LYRICS" => Lyrics + "GENRE" => Genre, + "MOOD" => Mood, + "BPM" => BPM, + "COPYRIGHT" => CopyrightMessage, + "LICENSE" => License, + "COMMENT" => Comment, + "LANGUAGE" => Language, + "SCRIPT" => Script, + "LYRICS" => Lyrics ); macro_rules! gen_item_keys {