dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Tidal: Add explicit to album titles"

Browse Source 
This reverts commit b7d360d850.
This commit is contained in:
Jonas Kvinge
2019-11-21 22:55:39 +01:00
parent b7d360d850
commit 6b9ba96e77
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/song.cpp
View File

@@ -150,7 +150,7 @@ const QString Song::kManuallyUnsetCover = "(unset)";
const QString Song::kEmbeddedCover = "(embedded)"; const QString Song::kEmbeddedCover = "(embedded)";
const QRegExp Song::kAlbumRemoveDisc(" ?-? ((\\(|\\[)?)(Disc|CD) ?([0-9]{1,2})((\\)|\\])?)$"); const QRegExp Song::kAlbumRemoveDisc(" ?-? ((\\(|\\[)?)(Disc|CD) ?([0-9]{1,2})((\\)|\\])?)$");
const QRegExp Song::kAlbumRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|([0-9]{1,4}) *Remaster|Explicit) ?((\\)|\\])?)$"); const QRegExp Song::kAlbumRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|([0-9]{1,4}) *Remaster) ?((\\)|\\])?)$");
const QRegExp Song::kTitleRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|Live|Remastered Version|([0-9]{1,4}) *Remaster) ?((\\)|\\])?)$"); const QRegExp Song::kTitleRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|Live|Remastered Version|([0-9]{1,4}) *Remaster) ?((\\)|\\])?)$");
const QString Song::kVariousArtists("various artists"); const QString Song::kVariousArtists("various artists");

4
src/tidal/tidalrequest.cpp
View File

@@ -974,10 +974,6 @@ int TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const qint6
QString album = json_album["title"].toString(); QString album = json_album["title"].toString();
QString cover = json_album["cover"].toString(); QString cover = json_album["cover"].toString();
if (json_obj.contains("explicit") && json_obj["explicit"].toBool()) {
album = album + " (Explicit)";
}
if (!allow_streaming) { if (!allow_streaming) {
Warn(QString("Song %1 %2 %3 is not allowStreaming").arg(artist).arg(album).arg(title)); Warn(QString("Song %1 %2 %3 is not allowStreaming").arg(artist).arg(album).arg(title));
} }