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

Fix Tidal authentication

Browse Source
This commit is contained in:
Jonas Kvinge
2018-09-10 21:23:50 +02:00
parent e5e6cbf6e4
commit f9379961e9
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tidal/tidalservice.h
View File

@@ -52,7 +52,6 @@ class TidalService : public InternetService {
void ReloadSettings();
void Login(const QString &username, const QString &password, int search_id = 0);
void Logout();
int Search(const QString &query, TidalSettingsPage::SearchBy searchby);
void CancelSearch();
@@ -61,6 +60,8 @@ class TidalService : public InternetService {
const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); }
signals:
void Login(const int search_id = 0);
void Login(const QString &username, const QString &password, const int search_id = 0);
void LoginSuccess();
void LoginFailure(QString failure_reason);
void SearchResults(int id, SongList songs);
@@ -71,8 +72,10 @@ class TidalService : public InternetService {
public slots:
void ShowConfig();
void SendLogin(const QString &username, const QString &password, const int search_id = 0);
private slots:
void SendLogin(const int search_id = 0);
void HandleAuthReply(QNetworkReply *reply, int search_id);
void StartSearch();
void SearchFinished(QNetworkReply *reply, int search_id);
@@ -83,8 +86,8 @@ class TidalService : public InternetService {
void ClearSearch();
void LoadSessionID();
QNetworkReply *CreateRequest(const QString &ressource_name, const QList<QPair<QString, QString>> &params);
QJsonObject ExtractJsonObj(QNetworkReply *reply);
QJsonArray ExtractItems(QNetworkReply *reply);
QJsonObject ExtractJsonObj(QNetworkReply *reply, bool sendlogin = false);
QJsonArray ExtractItems(QNetworkReply *reply, bool sendlogin = false);
void SendSearch();
void GetAlbum(const int album_id);
Song ParseSong(const int album_id_requested, const QJsonValue &value);