diff --git a/README.md b/README.md index eab2d734..f785a92d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,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 [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/), [elyrics.net](https://www.elyrics.net/) and [lyricsmode.com](https://www.lyricsmode.com/) + * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/) and [elyrics.net](https://www.elyrics.net/) * Support for multiple backends * Audio analyzer * Audio equalizer diff --git a/debian/control.in b/debian/control.in index f792ddd5..c8d838f3 100644 --- a/debian/control.in +++ b/debian/control.in @@ -53,7 +53,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 Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com + - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net - 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 10407180..fc5b6648 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 Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com
  • +
  • Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
  • 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 427bc40a..9394134b 100644 --- a/dist/unix/strawberry.spec.in +++ b/dist/unix/strawberry.spec.in @@ -99,7 +99,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 Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com + - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net - Support for multiple backends - Audio analyzer - Audio equalizer diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8f06b3c..498b2c4e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -188,7 +188,6 @@ set(SOURCES lyrics/songlyricscomlyricsprovider.cpp lyrics/azlyricscomlyricsprovider.cpp lyrics/elyricsnetlyricsprovider.cpp - lyrics/lyricsmodecomlyricsprovider.cpp providers/musixmatchprovider.cpp @@ -431,7 +430,6 @@ set(HEADERS lyrics/songlyricscomlyricsprovider.h lyrics/azlyricscomlyricsprovider.h lyrics/elyricsnetlyricsprovider.h - lyrics/lyricsmodecomlyricsprovider.h settings/settingsdialog.h settings/settingspage.h diff --git a/src/core/application.cpp b/src/core/application.cpp index 84c39b5a..eb31e4c9 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -67,7 +67,6 @@ #include "lyrics/songlyricscomlyricsprovider.h" #include "lyrics/azlyricscomlyricsprovider.h" #include "lyrics/elyricsnetlyricsprovider.h" -#include "lyrics/lyricsmodecomlyricsprovider.h" #include "scrobbler/audioscrobbler.h" #include "scrobbler/lastfmscrobbler.h" @@ -169,7 +168,6 @@ class ApplicationImpl { lyrics_providers->AddProvider(new SongLyricsComLyricsProvider(app->network())); lyrics_providers->AddProvider(new AzLyricsComLyricsProvider(app->network())); lyrics_providers->AddProvider(new ElyricsNetLyricsProvider(app->network())); - lyrics_providers->AddProvider(new LyricsModeComLyricsProvider(app->network())); lyrics_providers->ReloadSettings(); return lyrics_providers; }), diff --git a/src/lyrics/lyricsmodecomlyricsprovider.cpp b/src/lyrics/lyricsmodecomlyricsprovider.cpp deleted file mode 100644 index b14ab43b..00000000 --- a/src/lyrics/lyricsmodecomlyricsprovider.cpp +++ /dev/null @@ -1,56 +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 "core/shared_ptr.h" -#include "core/networkaccessmanager.h" -#include "lyricssearchrequest.h" -#include "lyricsmodecomlyricsprovider.h" - -const char LyricsModeComLyricsProvider::kUrl[] = "https://www.lyricsmode.com/lyrics/"; -const char LyricsModeComLyricsProvider::kStartTag[] = "]*>"; -const char LyricsModeComLyricsProvider::kEndTag[] = "<\\/div>"; -const char LyricsModeComLyricsProvider::kLyricsStart[] = "
    ]*>"; - -LyricsModeComLyricsProvider::LyricsModeComLyricsProvider(SharedPtr network, QObject *parent) - : HtmlLyricsProvider("lyricsmode.com", true, kStartTag, kEndTag, kLyricsStart, false, network, parent) {} - -QUrl LyricsModeComLyricsProvider::Url(const LyricsSearchRequest &request) { - - return QUrl(kUrl + request.artist[0].toLower() + "/" + StringFixup(request.artist) + "/" + StringFixup(request.title) + ".html"); - -} - -QString LyricsModeComLyricsProvider::StringFixup(QString text) { - - return text - .remove(QRegularExpression("[^\\w0-9_\\- ]")) - .replace(QRegularExpression(" {2,}"), " ") - .simplified() - .replace(' ', '_') - .replace('-', '_') - .toLower(); - -} diff --git a/src/lyrics/lyricsmodecomlyricsprovider.h b/src/lyrics/lyricsmodecomlyricsprovider.h deleted file mode 100644 index 4f5572c0..00000000 --- a/src/lyrics/lyricsmodecomlyricsprovider.h +++ /dev/null @@ -1,54 +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 LYRICSMODECOMLYRICSPROVIDER_H -#define LYRICSMODECOMLYRICSPROVIDER_H - -#include -#include -#include -#include -#include -#include - -#include "core/shared_ptr.h" -#include "core/networkaccessmanager.h" -#include "htmllyricsprovider.h" -#include "lyricssearchrequest.h" - -class LyricsModeComLyricsProvider : public HtmlLyricsProvider { - Q_OBJECT - - public: - explicit LyricsModeComLyricsProvider(SharedPtr network, QObject *parent = nullptr); - - protected: - QUrl Url(const LyricsSearchRequest &request) override; - - private: - QString StringFixup(QString text); - - private: - static const char kUrl[]; - static const char kStartTag[]; - static const char kEndTag[]; - static const char kLyricsStart[]; -}; - -#endif // LYRICSMODECOMLYRICSPROVIDER_H