Allowed custom release types + handle more MusicBrainz secondary types in UI. fixes #373
This commit is contained in:
emeric
+143
-189
@@ -29,215 +29,169 @@
|
||||
#include "metadata/IParser.hpp"
|
||||
#include "utils/StreamLogger.hpp"
|
||||
|
||||
static
|
||||
std::ostream&
|
||||
operator<<(std::ostream& os, const MetaData::Artist& artist)
|
||||
namespace
|
||||
{
|
||||
os << artist.name;
|
||||
|
||||
if (artist.mbid)
|
||||
os << " (" << artist.mbid->getAsString() << ")";
|
||||
|
||||
if (artist.sortName)
|
||||
os << " '" << *artist.sortName << "'";
|
||||
|
||||
return os;
|
||||
}
|
||||
|
||||
static
|
||||
std::ostream&
|
||||
operator<<(std::ostream& os, MetaData::Release::PrimaryType type)
|
||||
{
|
||||
switch (type)
|
||||
std::ostream& operator<<(std::ostream& os, const MetaData::Artist& artist)
|
||||
{
|
||||
case MetaData::Release::PrimaryType::Album: os << "Album"; break;
|
||||
case MetaData::Release::PrimaryType::Single: os << "Single"; break;
|
||||
case MetaData::Release::PrimaryType::EP: os << "EP"; break;
|
||||
case MetaData::Release::PrimaryType::Broadcast: os << "Broadcast"; break;
|
||||
case MetaData::Release::PrimaryType::Other: os << "Other"; break;
|
||||
default:
|
||||
os << "??";
|
||||
}
|
||||
return os;
|
||||
}
|
||||
os << artist.name;
|
||||
|
||||
static
|
||||
std::ostream&
|
||||
operator<<(std::ostream& os, MetaData::Release::SecondaryType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case MetaData::Release::SecondaryType::Compilation: os << "Compilation"; break;
|
||||
case MetaData::Release::SecondaryType::Soundtrack: os << "Soundtrack"; break;
|
||||
case MetaData::Release::SecondaryType::Spokenword: os << "Spokenword"; break;
|
||||
case MetaData::Release::SecondaryType::Interview: os << "Interview"; break;
|
||||
case MetaData::Release::SecondaryType::Audiobook: os << "Audiobook"; break;
|
||||
case MetaData::Release::SecondaryType::AudioDrama: os << "Audio drama"; break;
|
||||
case MetaData::Release::SecondaryType::Live: os << "Live"; break;
|
||||
case MetaData::Release::SecondaryType::Remix: os << "Remix"; break;
|
||||
case MetaData::Release::SecondaryType::DJMix: os << "DJ-mix"; break;
|
||||
case MetaData::Release::SecondaryType::Mixtape_Street: os << "Mixtape/Street"; break;
|
||||
case MetaData::Release::SecondaryType::Demo: os << "Mixtape/Demo"; break;
|
||||
default:
|
||||
os << "??";
|
||||
}
|
||||
return os;
|
||||
}
|
||||
if (artist.mbid)
|
||||
os << " (" << artist.mbid->getAsString() << ")";
|
||||
|
||||
static
|
||||
std::ostream&
|
||||
operator<<(std::ostream& os, const MetaData::Release& release)
|
||||
{
|
||||
os << release.name;
|
||||
if (artist.sortName)
|
||||
os << " '" << *artist.sortName << "'";
|
||||
|
||||
if (release.mbid)
|
||||
os << " (" << release.mbid->getAsString() << ")" << std::endl;
|
||||
|
||||
if (release.mediumCount)
|
||||
std::cout << "\tMediumCount: " << *release.mediumCount << std::endl;
|
||||
|
||||
if (!release.artistDisplayName.empty())
|
||||
std::cout << "\tDisplay artist: " << release.artistDisplayName << std::endl;
|
||||
|
||||
for (const MetaData::Artist& artist : release.artists)
|
||||
std::cout << "\tRelease artist: " << artist << std::endl;
|
||||
|
||||
if (release.primaryType)
|
||||
{
|
||||
std::cout << "\tPrimary type: " << *release.primaryType << std::endl;
|
||||
for (MetaData::Release::SecondaryType type : release.secondaryTypes)
|
||||
std::cout << "\tSecondary type:" << type << std::endl;
|
||||
return os;
|
||||
}
|
||||
|
||||
return os;
|
||||
}
|
||||
|
||||
static
|
||||
std::ostream&
|
||||
operator<<(std::ostream& os, const MetaData::Medium& medium)
|
||||
{
|
||||
if (!medium.name.empty())
|
||||
os << medium.name;
|
||||
os << std::endl;
|
||||
|
||||
if (medium.position)
|
||||
os << "\tPosition: " << *medium.position << std::endl;
|
||||
|
||||
if (!medium.type.empty())
|
||||
os << "\tType: " << medium.type << std::endl;
|
||||
|
||||
if (medium.trackCount)
|
||||
std::cout << "\tTrackCount: " << *medium.trackCount << std::endl;
|
||||
|
||||
if (medium.replayGain)
|
||||
std::cout << "\tReplay gain: " << *medium.replayGain << std::endl;
|
||||
|
||||
if (medium.release)
|
||||
std::cout << "Release: " << *medium.release << std::endl;
|
||||
|
||||
return os;
|
||||
}
|
||||
|
||||
void parse(MetaData::IParser& parser, const std::filesystem::path& file)
|
||||
{
|
||||
using namespace MetaData;
|
||||
|
||||
parser.setExtraTags({ "MOOD", "ALBUMGROUPING", "GENRE", "LANGUAGE" });
|
||||
|
||||
const auto start{ std::chrono::steady_clock::now() };
|
||||
std::optional<Track> track{ parser.parse(file, true) };
|
||||
if (!track)
|
||||
std::ostream& operator<<(std::ostream& os, const MetaData::Release& release)
|
||||
{
|
||||
std::cerr << "Parsing failed" << std::endl;
|
||||
return;
|
||||
}
|
||||
const auto end{ std::chrono::steady_clock::now() };
|
||||
os << release.name;
|
||||
|
||||
std::cout << "Parsing time: " << std::fixed << std::setprecision(2) << std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() / 1000. << "ms" << std::endl;
|
||||
if (release.mbid)
|
||||
os << " (" << release.mbid->getAsString() << ")" << std::endl;
|
||||
|
||||
std::cout << "Parsed metadata:" << std::endl;
|
||||
if (release.mediumCount)
|
||||
std::cout << "\tMediumCount: " << *release.mediumCount << std::endl;
|
||||
|
||||
if (!track->artistDisplayName.empty())
|
||||
std::cout << "Display artist: " << track->artistDisplayName << std::endl;
|
||||
if (!release.artistDisplayName.empty())
|
||||
std::cout << "\tDisplay artist: " << release.artistDisplayName << std::endl;
|
||||
|
||||
for (const Artist& artist : track->artists)
|
||||
std::cout << "Artist: " << artist << std::endl;
|
||||
for (const MetaData::Artist& artist : release.artists)
|
||||
std::cout << "\tRelease artist: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->conductorArtists)
|
||||
std::cout << "Conductor: " << artist << std::endl;
|
||||
std::cout << "Release types:" << std::endl;
|
||||
for (std::string_view releaseType : release.releaseTypes)
|
||||
std::cout << "\t" << releaseType << std::endl;
|
||||
|
||||
for (const Artist& artist : track->composerArtists)
|
||||
std::cout << "Composer: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->lyricistArtists)
|
||||
std::cout << "Lyricist: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->mixerArtists)
|
||||
std::cout << "Mixer: " << artist << std::endl;
|
||||
|
||||
for (const auto& [role, artists] : track->performerArtists)
|
||||
{
|
||||
std::cout << "Performer";
|
||||
if (!role.empty())
|
||||
std::cout << " (" << role << ")";
|
||||
std::cout << ":" << std::endl;
|
||||
for (const Artist& artist : artists)
|
||||
std::cout << "\t" << artist << std::endl;
|
||||
return os;
|
||||
}
|
||||
|
||||
for (const Artist& artist : track->producerArtists)
|
||||
std::cout << "Producer: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->remixerArtists)
|
||||
std::cout << "Remixer: " << artist << std::endl;
|
||||
|
||||
if (track->medium)
|
||||
std::cout << "Medium: " << *track->medium;
|
||||
|
||||
std::cout << "Title: " << track->title << std::endl;
|
||||
|
||||
if (track->mbid)
|
||||
std::cout << "Track MBID = " << track->mbid->getAsString() << std::endl;
|
||||
|
||||
if (track->recordingMBID)
|
||||
std::cout << "Recording MBID = " << track->recordingMBID->getAsString() << std::endl;
|
||||
|
||||
for (const auto& [tag, values] : track->tags)
|
||||
std::ostream& operator<<(std::ostream& os, const MetaData::Medium& medium)
|
||||
{
|
||||
std::cout << "Tag: " << tag << std::endl;
|
||||
for (const auto& value : values)
|
||||
if (!medium.name.empty())
|
||||
os << medium.name;
|
||||
os << std::endl;
|
||||
|
||||
if (medium.position)
|
||||
os << "\tPosition: " << *medium.position << std::endl;
|
||||
|
||||
if (!medium.type.empty())
|
||||
os << "\tType: " << medium.type << std::endl;
|
||||
|
||||
if (medium.trackCount)
|
||||
std::cout << "\tTrackCount: " << *medium.trackCount << std::endl;
|
||||
|
||||
if (medium.replayGain)
|
||||
std::cout << "\tReplay gain: " << *medium.replayGain << std::endl;
|
||||
|
||||
if (medium.release)
|
||||
std::cout << "Release: " << *medium.release << std::endl;
|
||||
|
||||
return os;
|
||||
}
|
||||
|
||||
void parse(MetaData::IParser& parser, const std::filesystem::path& file)
|
||||
{
|
||||
using namespace MetaData;
|
||||
|
||||
parser.setUserExtraTags({ "MOOD", "ALBUMGROUPING", "GENRE", "LANGUAGE" });
|
||||
|
||||
const auto start{ std::chrono::steady_clock::now() };
|
||||
std::optional<Track> track{ parser.parse(file, true) };
|
||||
if (!track)
|
||||
{
|
||||
std::cout << "\t" << value << std::endl;
|
||||
std::cerr << "Parsing failed" << std::endl;
|
||||
return;
|
||||
}
|
||||
const auto end{ std::chrono::steady_clock::now() };
|
||||
|
||||
std::cout << "Parsing time: " << std::fixed << std::setprecision(2) << std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() / 1000. << "ms" << std::endl;
|
||||
|
||||
std::cout << "Parsed metadata:" << std::endl;
|
||||
|
||||
if (!track->artistDisplayName.empty())
|
||||
std::cout << "Display artist: " << track->artistDisplayName << std::endl;
|
||||
|
||||
for (const Artist& artist : track->artists)
|
||||
std::cout << "Artist: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->conductorArtists)
|
||||
std::cout << "Conductor: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->composerArtists)
|
||||
std::cout << "Composer: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->lyricistArtists)
|
||||
std::cout << "Lyricist: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->mixerArtists)
|
||||
std::cout << "Mixer: " << artist << std::endl;
|
||||
|
||||
for (const auto& [role, artists] : track->performerArtists)
|
||||
{
|
||||
std::cout << "Performer";
|
||||
if (!role.empty())
|
||||
std::cout << " (" << role << ")";
|
||||
std::cout << ":" << std::endl;
|
||||
for (const Artist& artist : artists)
|
||||
std::cout << "\t" << artist << std::endl;
|
||||
}
|
||||
|
||||
for (const Artist& artist : track->producerArtists)
|
||||
std::cout << "Producer: " << artist << std::endl;
|
||||
|
||||
for (const Artist& artist : track->remixerArtists)
|
||||
std::cout << "Remixer: " << artist << std::endl;
|
||||
|
||||
if (track->medium)
|
||||
std::cout << "Medium: " << *track->medium;
|
||||
|
||||
std::cout << "Title: " << track->title << std::endl;
|
||||
|
||||
if (track->mbid)
|
||||
std::cout << "Track MBID = " << track->mbid->getAsString() << std::endl;
|
||||
|
||||
if (track->recordingMBID)
|
||||
std::cout << "Recording MBID = " << track->recordingMBID->getAsString() << std::endl;
|
||||
|
||||
for (const auto& [tag, values] : track->userExtraTags)
|
||||
{
|
||||
std::cout << "Tag: " << tag << std::endl;
|
||||
for (const auto& value : values)
|
||||
{
|
||||
std::cout << "\t" << value << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
std::cout << "Duration: " << std::fixed << std::setprecision(2) << track->duration.count() / 1000. << "s" << std::endl;
|
||||
std::cout << "Bitrate: " << track->bitrate << " bps" << std::endl;
|
||||
|
||||
if (track->position)
|
||||
std::cout << "Position: " << *track->position << std::endl;
|
||||
|
||||
if (track->date.isValid())
|
||||
std::cout << "Date: " << track->date.toString("yyyy-MM-dd") << std::endl;
|
||||
|
||||
if (track->originalDate.isValid())
|
||||
std::cout << "Original date: " << track->originalDate.toString("yyyy-MM-dd") << std::endl;
|
||||
|
||||
std::cout << "HasCover = " << std::boolalpha << track->hasCover << std::endl;
|
||||
|
||||
if (track->replayGain)
|
||||
std::cout << "Track replay gain: " << *track->replayGain << std::endl;
|
||||
|
||||
if (track->acoustID)
|
||||
std::cout << "AcoustID: " << track->acoustID->getAsString() << std::endl;
|
||||
|
||||
if (!track->copyright.empty())
|
||||
std::cout << "Copyright: " << track->copyright << std::endl;
|
||||
|
||||
if (!track->copyrightURL.empty())
|
||||
std::cout << "CopyrightURL: " << track->copyrightURL << std::endl;
|
||||
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
std::cout << "Duration: " << std::fixed << std::setprecision(2) << track->duration.count() / 1000. << "s" << std::endl;
|
||||
std::cout << "Bitrate: " << track->bitrate << " bps" << std::endl;
|
||||
|
||||
if (track->position)
|
||||
std::cout << "Position: " << *track->position << std::endl;
|
||||
|
||||
if (track->date.isValid())
|
||||
std::cout << "Date: " << track->date.toString("yyyy-MM-dd") << std::endl;
|
||||
|
||||
if (track->originalDate.isValid())
|
||||
std::cout << "Original date: " << track->originalDate.toString("yyyy-MM-dd") << std::endl;
|
||||
|
||||
std::cout << "HasCover = " << std::boolalpha << track->hasCover << std::endl;
|
||||
|
||||
if (track->replayGain)
|
||||
std::cout << "Track replay gain: " << *track->replayGain << std::endl;
|
||||
|
||||
if (track->acoustID)
|
||||
std::cout << "AcoustID: " << track->acoustID->getAsString() << std::endl;
|
||||
|
||||
if (!track->copyright.empty())
|
||||
std::cout << "Copyright: " << track->copyright << std::endl;
|
||||
|
||||
if (!track->copyrightURL.empty())
|
||||
std::cout << "CopyrightURL: " << track->copyrightURL << std::endl;
|
||||
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
|
||||
Reference in New Issue
Block a user