Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Guess artist and title from filename (third attempt)

This commit is contained in:
dmdmdm 2020-05-22 07:48:19 -04:00 committed by John Maguire
parent ddbde91889
commit 9b580e4a5c
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
#include "tagreader.h"
#include <memory>
#include <algorithm>
#include <QCoreApplication>
#include <QDateTime>
@ -130,49 +131,50 @@ const char* kASF_OriginalDate_ID = "WM/OriginalReleaseTime";
const char* kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
} // namespace
void TagReader::RemoveExtension(std::string* s) const {
if (s->empty()) return;
const int i = s->find_last_of('.');
// Helper for GuessArtistAndTitle()
static void removeExtension(std::string& s) {
if (s.empty()) return;
const int i = s.find_last_of('.');
if (i == std::string::npos) return;
s->assign(s->substr(0, i));
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) = ' ';
}
static void changeUnderscores(std::string& s) {
std::replace(s.begin(), s.end(), '_', ' ');
}
std::string& TagReader::ltrim(std::string& str, const std::string& chars) const {
str.erase(0, str.find_first_not_of(chars));
return str;
static std::string& ltrim(std::string& str, const std::string& chars = "\t\n\v\f\r ") {
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;
static std::string& rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ") {
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);
static std::string& trim(std::string& str, const std::string& chars = "\t\n\v\f\r ") {
return ltrim(rtrim(str, chars), chars);
}
void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata *song) const {
std::string artist = song->artist();
std::string title = song->title();
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 (!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);
artist.assign(bn.substr(0, i));
title.assign(bn.substr(i + 3));
removeExtension(title);
changeUnderscores(artist);
changeUnderscores(title);
trim(artist);
trim(title);
if (!artist.empty()) { song->mutable_artist()->assign(artist); }
if (!title.empty()) { song->mutable_title()->assign(title); }
}
TagReader::TagReader()

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

@ -95,12 +95,6 @@ class TagReader {
TagLib::Ogg::XiphComment* vorbis_comments,
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(