owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Opus file scan + fixed ogg tag parsing

Browse Source
This commit is contained in:
emeric
2019-05-06 13:51:17 +02:00
parent d19ed184b3
commit 397c6f4e9c
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/ScanSettings.hpp
+5 -5
View File
@@ -70,11 +70,11 @@ class ScanSettings : public Wt::Dbo::Dbo<ScanSettings>
private: private:
int _scanVersion = 0; int _scanVersion {};
std::string _mediaDirectory = ""; std::string _mediaDirectory;
Wt::WTime _startTime = Wt::WTime(0,0,0); Wt::WTime _startTime = Wt::WTime {0,0,0};
UpdatePeriod _updatePeriod = UpdatePeriod::Never; UpdatePeriod _updatePeriod {UpdatePeriod::Never};
std::string _audioFileExtensions = ".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn"; std::string _audioFileExtensions {".mp3 .ogg .oga .aac .m4a .flac .wav .wma .aif .aiff .ape .mpc .shn .opus"};
Wt::Dbo::collection<Wt::Dbo::ptr<ClusterType>> _clusterTypes; Wt::Dbo::collection<Wt::Dbo::ptr<ClusterType>> _clusterTypes;
}; };
src/metadata/TagLibParser.cpp
+28 -8
View File
@@ -32,18 +32,31 @@ namespace MetaData
{ {
std::vector<std::string> std::vector<std::string>
getPropertyValues(const TagLib::PropertyMap& properties, const std::string& key) getPropertyValuesFirstMatch(const TagLib::PropertyMap& properties, const std::set<std::string>& keys)
{ {
std::vector<std::string> res; std::vector<std::string> res;
const TagLib::StringList& values {properties[key]}; for (const std::string& key : keys)
{
const TagLib::StringList& values {properties[key]};
if (values.isEmpty())
continue;
res.reserve(values.size()); res.reserve(values.size());
std::transform(std::cbegin(values), std::cend(values), std::back_inserter(res), [](const auto& value) { return stringTrim(value.to8Bit(true)); }); std::transform(std::cbegin(values), std::cend(values), std::back_inserter(res), [](const auto& value) { return stringTrim(value.to8Bit(true)); });
break;
}
return res; return res;
} }
std::vector<std::string>
getPropertyValues(const TagLib::PropertyMap& properties, const std::string& key)
{
return getPropertyValuesFirstMatch(properties, {std::move(key)});
}
static static
std::vector<std::string> std::vector<std::string>
splitAndTrimString(const std::string& str, const std::string& delimiters) splitAndTrimString(const std::string& str, const std::string& delimiters)
@@ -70,7 +83,7 @@ getArtists(const TagLib::PropertyMap& properties)
if (artistNames.empty()) if (artistNames.empty())
return res; return res;
const std::vector<std::string> artistsMBID {getPropertyValues(properties, "MUSICBRAINZ_ARTISTID")}; const std::vector<std::string> artistsMBID {getPropertyValuesFirstMatch(properties, {"MUSICBRAINZ_ARTISTID", "MUSICBRAINZ ARTIST ID"})};
if (artistNames.size() == artistsMBID.size()) if (artistNames.size() == artistsMBID.size())
{ {
@@ -96,7 +109,7 @@ getAlbumArtists(const TagLib::PropertyMap& properties)
if (artistNames.empty()) if (artistNames.empty())
return res; return res;
const std::vector<std::string> artistsMBID {getPropertyValues(properties, "MUSICBRAINZ_ALBUMARTISTID")}; const std::vector<std::string> artistsMBID {getPropertyValuesFirstMatch(properties, {"MUSICBRAINZ_ALBUMARTISTID", "MUSICBRAINZ ALBUM ARTIST ID"})};
if (artistNames.size() == artistsMBID.size()) if (artistNames.size() == artistsMBID.size())
{ {
@@ -122,7 +135,7 @@ getAlbum(const TagLib::PropertyMap& properties)
if (albumName.empty()) if (albumName.empty())
return res; return res;
std::vector<std::string> albumMBID {getPropertyValues(properties, "MUSICBRAINZ_ALBUMID")}; std::vector<std::string> albumMBID {getPropertyValuesFirstMatch(properties, {"MUSICBRAINZ_ALBUMID", "MUSICBRAINZ ALBUM ID"})};
res = Album{std::move(albumName.front()), ""}; res = Album{std::move(albumName.front()), ""};
@@ -140,10 +153,16 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug)
TagLib::AudioProperties::Average}; TagLib::AudioProperties::Average};
if (f.isNull()) if (f.isNull())
{
LMS_LOG(METADATA, ERROR) << "File '" << p.string() << "': parsing failed";
return boost::none; return boost::none;
}
if (!f.audioProperties()) if (!f.audioProperties())
{
LMS_LOG(METADATA, INFO) << "File '" << p.string() << "': no audio properties";
return boost::none; return boost::none;
}
Track track; Track track;
@@ -199,7 +218,8 @@ TagLibParser::parse(const boost::filesystem::path& p, bool debug)
{ {
track.musicBrainzTrackID = value; track.musicBrainzTrackID = value;
} }
else if (tag == "MUSICBRAINZ_TRACKID") else if (tag == "MUSICBRAINZ_TRACKID"
|| tag == "MUSICBRAINZ TRACK ID")
track.musicBrainzRecordID = value; track.musicBrainzRecordID = value;
else if (tag == "ACOUSTID_ID") else if (tag == "ACOUSTID_ID")
track.acoustID = value; track.acoustID = value;