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

Minor fixes

This commit is contained in:
dmdmdm 2020-05-23 14:52:22 -04:00 committed by John Maguire
parent c8eaafb0a8
commit 86b48c22ae
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,20 +128,21 @@ namespace {
const char* kMP4_OriginalYear_ID = "----:com.apple.iTunes:ORIGINAL YEAR"; const char* kMP4_OriginalYear_ID = "----:com.apple.iTunes:ORIGINAL YEAR";
const char* kASF_OriginalDate_ID = "WM/OriginalReleaseTime"; const char* kASF_OriginalDate_ID = "WM/OriginalReleaseTime";
const char* kASF_OriginalYear_ID = "WM/OriginalReleaseYear"; const char* kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
} // namespace
// Helpers for GuessArtistAndTitle() // Helpers for GuessArtistAndTitle()
static QString withoutExtension(const QString s) { QString WithoutExtension(const QString& s) {
if (s.isEmpty()) return s; if (s.isEmpty()) return s;
const int i = s.lastIndexOf('.'); const int i = s.lastIndexOf('.');
if (i < 0) return s; if (i < 0) return s;
return s.left(i); return s.left(i);
} }
static inline void changeUnderscores(QString &s) { void ReplaceUnderscoresWithSpaces(QString &s) {
s.replace('_', ' '); s.replace('_', ' ');
} }
} // namespace
void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata *song) const { void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata *song) const {
QString artist = QString::fromStdString(song->artist()); QString artist = QString::fromStdString(song->artist());
QString title = QString::fromStdString(song->title()); QString title = QString::fromStdString(song->title());
@ -149,22 +150,21 @@ void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata *song) const {
if (!artist.isEmpty() || !title.isEmpty()) return; if (!artist.isEmpty() || !title.isEmpty()) return;
if (bn.isEmpty()) return; if (bn.isEmpty()) return;
static QRegExp rx("^(.*)[\\s_]\\-[\\s_](.*)\\.\\w*$"); QRegExp rx("^(.*)[\\s_]\\-[\\s_](.*)\\.\\w*$");
int pos = 0; if (rx.indexIn(bn) >= 0) {
if ((rx.indexIn(bn, pos)) >= 0) {
artist = rx.cap(1); artist = rx.cap(1);
title = rx.cap(2); title = rx.cap(2);
} }
else { else {
title = withoutExtension(bn); title = WithoutExtension(bn);
} }
changeUnderscores(artist); ReplaceUnderscoresWithSpaces(artist);
changeUnderscores(title); ReplaceUnderscoresWithSpaces(title);
artist = artist.trimmed(); artist = artist.trimmed();
title = title.trimmed(); title = title.trimmed();
if (!artist.isEmpty()) { song->mutable_artist()->assign(artist.toUtf8().data()); } if (!artist.isEmpty()) { song->set_artist(artist.toUtf8().data()); }
if (!title.isEmpty()) { song->mutable_title()->assign(title.toUtf8().data()); } if (!title.isEmpty()) { song->set_title(title.toUtf8().data()); }
} }
TagReader::TagReader() TagReader::TagReader()