Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-23 00:09:14 +01:00
Code Issues Releases Wiki Activity

Guess artist and title from filename (second attempt)

Browse Source
This commit is contained in:
dmdmdm 2020-05-21 21:36:40 -04:00 committed by John Maguire
parent 7378e5b141
commit ddbde91889
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ext/libclementine-tagreader/tagreader.cpp
View File

@ -130,6 +130,51 @@ const char* kASF_OriginalDate_ID = "WM/OriginalReleaseTime";
const char* kASF_OriginalYear_ID = "WM/OriginalReleaseYear"; const char* kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
} // namespace } // namespace
void TagReader::RemoveExtension(std::string* s) const {
if (s->empty()) return;
const int i = s->find_last_of('.');
if (i == std::string::npos) return;
s->assign(s->substr(0, i));
}
void TagReader::ChangeUnderscores(std::string* s) const {
for (int i = 0; i < s->size(); i++) {
if (s->at(i) == '_') s->at(i) = ' ';
}
}
std::string& TagReader::ltrim(std::string& str, const std::string& chars) const {
str.erase(0, str.find_first_not_of(chars));
return str;
}
std::string& TagReader::rtrim(std::string& str, const std::string& chars) const {
str.erase(str.find_last_not_of(chars) + 1);
return str;
}
std::string& TagReader::trim(std::string& str, const std::string& chars) const {
return ltrim(rtrim(str, chars), chars);
}
void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata *song) const {
const std::string bn = song->basefilename();
std::string *artist = song->mutable_artist();
std::string *title = song->mutable_title();
if (!artist->empty() || !title->empty()) return;
if (bn.empty()) return;
int i = bn.find(" - ");
if (i == std::string::npos) i = bn.find("_-_");
if (i == std::string::npos) return;
artist->assign(bn.substr(0, i));
title->assign(bn.substr(i + 3));
RemoveExtension(title);
ChangeUnderscores(artist);
ChangeUnderscores(title);
trim(*artist);
trim(*title);
}
TagReader::TagReader() TagReader::TagReader()
: factory_(new TagLibFileRefFactory), : factory_(new TagLibFileRefFactory),
kEmbeddedCover("(embedded)") {} kEmbeddedCover("(embedded)") {}
@ -177,6 +222,7 @@ void TagReader::ReadFile(const QString& filename,
// Try fallback -- GME filetypes // Try fallback -- GME filetypes
GME::ReadFile(info, song); GME::ReadFile(info, song);
GuessArtistAndTitle(song);
return; return;
} }
@ -190,6 +236,7 @@ void TagReader::ReadFile(const QString& filename,
song->set_track(tag->track()); song->set_track(tag->track());
song->set_valid(true); song->set_valid(true);
} }
GuessArtistAndTitle(song);
QString disc; QString disc;
QString compilation; QString compilation;

8
ext/libclementine-tagreader/tagreader.h
View File

@ -95,6 +95,14 @@ class TagReader {
TagLib::Ogg::XiphComment* vorbis_comments, TagLib::Ogg::XiphComment* vorbis_comments,
const pb::tagreader::SongMetadata& song) const; const pb::tagreader::SongMetadata& song) const;
// Helpers for GuessArtistAndTitle()
void RemoveExtension(std::string*) const;
void ChangeUnderscores(std::string*) const;
std::string& ltrim(std::string&, const std::string &chars = "\t\n\v\f\r ") const;
std::string& rtrim(std::string&, const std::string &chars = "\t\n\v\f\r ") const;
std::string& trim(std::string&, const std::string &chars = "\t\n\v\f\r ") const;
void GuessArtistAndTitle(pb::tagreader::SongMetadata* song) const;
pb::tagreader::SongMetadata_Type GuessFileType( pb::tagreader::SongMetadata_Type GuessFileType(
TagLib::FileRef* fileref) const; TagLib::FileRef* fileref) const;