From dc01a18b87309860380d05baeb66acb479707686 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 31 Aug 2023 23:22:22 +0200 Subject: [PATCH] Remove lyrics.com lyrics provider Does not provider full lyrics in API. The URL we used only points to a page with "Get the lyrics for at Lyrics.com" now. --- README.md | 2 +- debian/control.in | 2 +- ...rawberrymusicplayer.strawberry.appdata.xml | 2 +- dist/unix/strawberry.spec.in | 2 +- src/CMakeLists.txt | 2 - src/core/application.cpp | 2 - src/lyrics/lyricscomlyricsprovider.cpp | 285 ------------------ src/lyrics/lyricscomlyricsprovider.h | 67 ---- 8 files changed, 4 insertions(+), 360 deletions(-) delete mode 100644 src/lyrics/lyricscomlyricsprovider.cpp delete mode 100644 src/lyrics/lyricscomlyricsprovider.h diff --git a/README.md b/README.md index f02ce048..6e00704d 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Funding developers is a way to contribute to open source projects you appreciate * Edit tags on audio files * Fetch tags from MusicBrainz * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/) and [Spotify](https://www.spotify.com/) - * Song lyrics from [Lyrics.com](https://www.lyrics.com/), [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/) + * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/) and [lololyrics.com](https://www.lololyrics.com/) * Support for multiple backends * Audio analyzer * Audio equalizer diff --git a/debian/control.in b/debian/control.in index 1b9678a7..9c44ed10 100644 --- a/debian/control.in +++ b/debian/control.in @@ -52,7 +52,7 @@ Description: music player and music collection organizer - Edit tags on audio files - Automatically retrieve tags from MusicBrainz - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify - - Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com + - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com - Audio analyzer - Audio equalizer - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic diff --git a/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml b/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml index da3c3df1..ecf00b1b 100644 --- a/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml +++ b/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml @@ -29,7 +29,7 @@
  • Edit tags on audio files
  • Automatically retrieve tags from MusicBrainz
  • Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
    • -
  • Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
    • +
  • Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com
  • Support for multiple backends
  • Audio analyzer and equalizer
  • Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic
    • diff --git a/dist/unix/strawberry.spec.in b/dist/unix/strawberry.spec.in index bed5d59b..aa57460c 100644 --- a/dist/unix/strawberry.spec.in +++ b/dist/unix/strawberry.spec.in @@ -118,7 +118,7 @@ Features: - Edit tags on audio files - Automatically retrieve tags from MusicBrainz - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify - - Song lyrics from Lyrics.com, Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com + - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh and lololyrics.com - Support for multiple backends - Audio analyzer - Audio equalizer diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5c5a981..4497c61f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,7 +183,6 @@ set(SOURCES lyrics/geniuslyricsprovider.cpp lyrics/musixmatchlyricsprovider.cpp lyrics/chartlyricsprovider.cpp - lyrics/lyricscomlyricsprovider.cpp providers/musixmatchprovider.cpp @@ -421,7 +420,6 @@ set(HEADERS lyrics/geniuslyricsprovider.h lyrics/musixmatchlyricsprovider.h lyrics/chartlyricsprovider.h - lyrics/lyricscomlyricsprovider.h settings/settingsdialog.h settings/settingspage.h diff --git a/src/core/application.cpp b/src/core/application.cpp index a103d703..4168f3d8 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -64,7 +64,6 @@ #include "lyrics/lololyricsprovider.h" #include "lyrics/musixmatchlyricsprovider.h" #include "lyrics/chartlyricsprovider.h" -#include "lyrics/lyricscomlyricsprovider.h" #include "scrobbler/audioscrobbler.h" #include "scrobbler/lastfmscrobbler.h" @@ -163,7 +162,6 @@ class ApplicationImpl { lyrics_providers->AddProvider(new LoloLyricsProvider(app->network())); lyrics_providers->AddProvider(new MusixmatchLyricsProvider(app->network())); lyrics_providers->AddProvider(new ChartLyricsProvider(app->network())); - lyrics_providers->AddProvider(new LyricsComLyricsProvider(app->network())); lyrics_providers->ReloadSettings(); return lyrics_providers; }), diff --git a/src/lyrics/lyricscomlyricsprovider.cpp b/src/lyrics/lyricscomlyricsprovider.cpp deleted file mode 100644 index 8265db98..00000000 --- a/src/lyrics/lyricscomlyricsprovider.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Strawberry Music Player - * Copyright 2023, Jonas Kvinge - * - * Strawberry is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Strawberry is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Strawberry. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "core/logging.h" -#include "core/shared_ptr.h" -#include "core/networkaccessmanager.h" -#include "lyricssearchrequest.h" -#include "lyricssearchresult.h" -#include "lyricscomlyricsprovider.h" - -const char *LyricsComLyricsProvider::kApiUrl = "https://www.abbreviations.com/services/v2/lyrics.php"; -const char *LyricsComLyricsProvider::kLyricsUrl = "https://www.lyrics.com/lyrics/"; -const char *LyricsComLyricsProvider::kUID = "11363"; -const char *LyricsComLyricsProvider::kTokenB64 = "b3FOYmxhV1ZKRGxIMnV4OA=="; - -LyricsComLyricsProvider::LyricsComLyricsProvider(SharedPtr network, QObject *parent) : JsonLyricsProvider("Lyrics.com", true, false, network, parent), use_api_(true) {} - -LyricsComLyricsProvider::~LyricsComLyricsProvider() { - - while (!replies_.isEmpty()) { - QNetworkReply *reply = replies_.takeFirst(); - QObject::disconnect(reply, nullptr, this, nullptr); - reply->abort(); - reply->deleteLater(); - } - -} - -bool LyricsComLyricsProvider::StartSearch(const int id, const LyricsSearchRequest &request) { - - if (use_api_) { - SendSearchRequest(id, request); - } - else { - CreateLyricsRequest(id, request); - } - - return true; - -} - -void LyricsComLyricsProvider::SendSearchRequest(const int id, const LyricsSearchRequest &request) { - - QUrlQuery url_query; - url_query.addQueryItem(QUrl::toPercentEncoding("uid"), QUrl::toPercentEncoding(kUID)); - url_query.addQueryItem(QUrl::toPercentEncoding("tokenid"), QUrl::toPercentEncoding(QByteArray::fromBase64(kTokenB64))); - url_query.addQueryItem(QUrl::toPercentEncoding("format"), "json"); - url_query.addQueryItem(QUrl::toPercentEncoding("artist"), QUrl::toPercentEncoding(request.artist)); - url_query.addQueryItem(QUrl::toPercentEncoding("album"), QUrl::toPercentEncoding(request.album)); - url_query.addQueryItem(QUrl::toPercentEncoding("term"), QUrl::toPercentEncoding(request.title)); - QUrl url(kApiUrl); - url.setQuery(url_query); - QNetworkRequest req(url); - req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); - QNetworkReply *reply = network_->get(req); - replies_ << reply; - QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, id, request]() { HandleSearchReply(reply, id, request); }); - -} - -void LyricsComLyricsProvider::CancelSearch(const int id) { Q_UNUSED(id); } - -void LyricsComLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request) { - - if (!replies_.contains(reply)) return; - replies_.removeAll(reply); - QObject::disconnect(reply, nullptr, this, nullptr); - reply->deleteLater(); - - QByteArray data = ExtractData(reply); - if (data.isEmpty()) { - emit SearchFinished(id); - return; - } - - QJsonParseError json_error; - QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - - if (json_error.error != QJsonParseError::NoError) { - qLog(Error) << "Lyrics.com: Failed to parse json data" << json_error.errorString(); - emit SearchFinished(id); - return; - } - - if (json_doc.isEmpty()) { - qLog(Debug) << "Lyrics.com: No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); - return; - } - - if (!json_doc.isObject()) { - qLog(Error) << "Lyrics.com: Json document is not an object."; - emit SearchFinished(id); - return; - } - - QJsonObject json_obj = json_doc.object(); - if (json_obj.isEmpty()) { - qLog(Debug) << "Lyrics.com: No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); - return; - } - - if (json_obj.contains("error")) { - const QString error = json_obj["error"].toString(); - qLog(Error) << "Lyrics.com: Received error:" << error << "switching to URL based lookup."; - use_api_ = false; - CreateLyricsRequest(id, request); - return; - } - - if (!json_obj.contains("result") || !json_obj["result"].isArray()) { - qLog(Error) << "Lyrics.com: Json reply is missing result."; - emit SearchFinished(id); - return; - } - - QJsonArray json_result = json_obj["result"].toArray(); - if (json_result.isEmpty()) { - qLog(Debug) << "Lyrics.com: No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); - return; - } - - for (const QJsonValueRef value : json_result) { - if (!value.isObject()) { - qLog(Error) << "Lyrics.com: Invalid Json reply, result is not an object."; - continue; - } - QJsonObject obj = value.toObject(); - if ( - !obj.contains("song") || - !obj.contains("artist") || - !obj.contains("album") || - !obj.contains("song-link") - ) { - qLog(Error) << "Lyrics.com: Invalid Json reply, result is missing data."; - qLog(Debug) << value; - continue; - } - QString result_artist = obj["artist"].toString(); - QString result_album = obj["album"].toString(); - QString result_title = obj["song"].toString(); - QString song_link = obj["song-link"].toString(); - - if (result_artist.compare(request.albumartist, Qt::CaseInsensitive) != 0 && - result_artist.compare(request.artist, Qt::CaseInsensitive) != 0 && - result_album.compare(request.album, Qt::CaseInsensitive) != 0 && - result_title.compare(request.title, Qt::CaseInsensitive) != 0) { - continue; - } - - if (!song_link.isEmpty() && QRegularExpression("^https:\\/\\/.*\\/lyric\\/\\d+\\/.*\\/.*$").match(song_link).hasMatch()) { - song_link = song_link.replace(QRegularExpression("\\/lyric\\/\\d+\\/"), "/lyrics/") + ".html"; - if (QRegularExpression("^https:\\/\\/.*\\/lyrics\\/.*\\/.*\\.html$").match(song_link).hasMatch()) { - QUrl url(song_link); - if (url.isValid()) { - SendLyricsRequest(id, request, result_artist, result_album, result_title, url); - return; - } - } - } - - SendLyricsRequest(id, request, result_artist, result_album, result_title); - - return; - - } - - qLog(Debug) << "Lyrics.com: No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); - -} - -void LyricsComLyricsProvider::CreateLyricsRequest(const int id, const LyricsSearchRequest &request) { - - SendLyricsRequest(id, request, request.artist, request.album, request.title); - -} - -void LyricsComLyricsProvider::SendLyricsRequest(const int id, const LyricsSearchRequest &request, const QString &result_artist, const QString &result_album, const QString &result_title, QUrl url) { - - if (url.isEmpty() || !url.isValid()) { - url.setUrl(kLyricsUrl + StringFixup(result_artist) + "/" + StringFixup(result_title) + ".html"); - } - - QNetworkRequest req(url); - req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); - QNetworkReply *reply = network_->get(req); - replies_ << reply; - QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, id, request, result_artist, result_album, result_title]() { HandleLyricsReply(reply, id, request, result_artist, result_album, result_title); }); - -} - -void LyricsComLyricsProvider::HandleLyricsReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request, const QString &result_artist, const QString &result_album, const QString &result_title) { - - if (!replies_.contains(reply)) return; - replies_.removeAll(reply); - QObject::disconnect(reply, nullptr, this, nullptr); - reply->deleteLater(); - - if (reply->error() != QNetworkReply::NoError) { - qLog(Error) << reply->errorString() << reply->error(); - emit SearchFinished(id); - return; - } - else if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { - qLog(Error) << "Received HTTP code" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - emit SearchFinished(id); - return; - } - - const QByteArray data = reply->readAll(); - if (data.isEmpty()) { - qLog(Error) << "Lyrics.com: Empty reply received from server."; - emit SearchFinished(id); - return; - } - - const QString lyrics = ParseLyricsFromHTML(QString::fromUtf8(data), QRegularExpression("]*>"), QRegularExpression("<\\/div>"), QRegularExpression("
    ]+>"), false); - if (lyrics.isEmpty() || lyrics.contains("Click to search for the Lyrics on Lyrics.com", Qt::CaseInsensitive)) { - qLog(Debug) << "Lyrics.com: No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); - return; - } - - qLog(Debug) << "Lyrics.com: Got lyrics for" << request.artist << request.album << request.title; - - LyricsSearchResult result(lyrics); - result.artist = result_artist; - result.album = result_album; - result.title = result_title; - emit SearchFinished(id, LyricsSearchResults() << result); - -} - -QString LyricsComLyricsProvider::StringFixup(QString string) { - - return string.replace('/', '-') - .replace('\'', '-') - .remove(QRegularExpression("[^\\w0-9\\- ]", QRegularExpression::UseUnicodePropertiesOption)) - .simplified() - .replace(' ', '-') - .replace(QRegularExpression("(-)\\1+"), "-") - .toLower(); - -} - -void LyricsComLyricsProvider::Error(const QString &error, const QVariant &debug) { - - qLog(Error) << "Lyrics.com:" << error; - if (debug.isValid()) qLog(Debug) << debug; - -} diff --git a/src/lyrics/lyricscomlyricsprovider.h b/src/lyrics/lyricscomlyricsprovider.h deleted file mode 100644 index 8b1601af..00000000 --- a/src/lyrics/lyricscomlyricsprovider.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Strawberry Music Player - * Copyright 2023, Jonas Kvinge - * - * Strawberry is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Strawberry is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Strawberry. If not, see . - * - */ - -#ifndef LYRICSCOMLYRICSPROVIDER_H -#define LYRICSCOMLYRICSPROVIDER_H - -#include -#include -#include -#include -#include -#include - -#include "core/shared_ptr.h" -#include "jsonlyricsprovider.h" -#include "lyricssearchrequest.h" - -class QNetworkReply; -class NetworkAccessManager; - -class LyricsComLyricsProvider : public JsonLyricsProvider { - Q_OBJECT - - public: - explicit LyricsComLyricsProvider(SharedPtr network, QObject *parent = nullptr); - ~LyricsComLyricsProvider() override; - - bool StartSearch(const int id, const LyricsSearchRequest &request) override; - void CancelSearch(const int id) override; - - private: - void SendSearchRequest(const int id, const LyricsSearchRequest &request); - void CreateLyricsRequest(const int id, const LyricsSearchRequest &request); - void SendLyricsRequest(const int id, const LyricsSearchRequest &request, const QString &result_artist, const QString &result_album, const QString &result_title, QUrl url = QUrl()); - void Error(const QString &error, const QVariant &debug = QVariant()) override; - static QString StringFixup(QString string); - - private slots: - void HandleSearchReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request); - void HandleLyricsReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request, const QString &result_artist, const QString &result_album, const QString &result_title); - - private: - static const char *kApiUrl; - static const char *kLyricsUrl; - static const char *kUID; - static const char *kTokenB64; - QList replies_; - bool use_api_; -}; - -#endif // LYRICSCOMLYRICSPROVIDER_H