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

Create common class for Musixmatch

Browse Source
This commit is contained in:
Jonas Kvinge
2022-10-18 22:49:15 +02:00
parent d722035883
commit ec99df3144
7 changed files with 85 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lyrics/musixmatchlyricsprovider.cpp
View File

@@ -39,9 +39,7 @@
#include "jsonlyricsprovider.h"
#include "lyricsfetcher.h"
#include "musixmatchlyricsprovider.h"
const char *MusixmatchLyricsProvider::kApiUrl = "https://api.musixmatch.com/ws/1.1";
const char *MusixmatchLyricsProvider::kApiKey = "Y2FhMDRlN2Y4OWE5OTIxYmZlOGMzOWQzOGI3ZGU4MjE=";
#include "providers/musixmatchprovider.h"
MusixmatchLyricsProvider::MusixmatchLyricsProvider(NetworkAccessManager *network, QObject *parent) : JsonLyricsProvider("Musixmatch", true, false, network, parent), rate_limit_exceeded_(false) {}
@@ -247,18 +245,6 @@ void MusixmatchLyricsProvider::HandleSearchReply(QNetworkReply *reply, LyricsSea
}
QString MusixmatchLyricsProvider::StringFixup(QString string) {
return string.replace('/', '-')
.replace('\'', '-')
.remove(QRegularExpression("[^\\w0-9\\- ]", QRegularExpression::UseUnicodePropertiesOption))
.simplified()
.replace(' ', '-')
.replace(QRegularExpression("(-)\\1+"), "-")
.toLower();
}
bool MusixmatchLyricsProvider::CreateLyricsRequest(LyricsSearchContextPtr search) {
QString artist_stripped = StringFixup(search->artist);

6
src/lyrics/musixmatchlyricsprovider.h
View File

@@ -33,11 +33,12 @@
#include "jsonlyricsprovider.h"
#include "lyricsfetcher.h"
#include "providers/musixmatchprovider.h"
class QNetworkReply;
class NetworkAccessManager;
class MusixmatchLyricsProvider : public JsonLyricsProvider {
class MusixmatchLyricsProvider : public JsonLyricsProvider, public MusixmatchProvider {
Q_OBJECT
public:
@@ -60,7 +61,6 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider {
using LyricsSearchContextPtr = std::shared_ptr<LyricsSearchContext>;
QString StringFixup(QString string);
bool SendSearchRequest(LyricsSearchContextPtr search);
bool CreateLyricsRequest(LyricsSearchContextPtr search);
bool SendLyricsRequest(LyricsSearchContextPtr search, const QUrl &url);
@@ -72,8 +72,6 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider {
void HandleLyricsReply(QNetworkReply *reply, LyricsSearchContextPtr search, const QUrl &url);
private:
static const char *kApiUrl;
static const char *kApiKey;
QList<LyricsSearchContextPtr> requests_search_;
QList<QNetworkReply*> replies_;
bool rate_limit_exceeded_;