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

Finish Tidal

Browse Source 
- Add configurable settings
- Add progressbar
- Simplify code
This commit is contained in:
Jonas Kvinge
2018-09-06 17:39:26 +02:00
parent 440a223bfb
commit 0a64a2a394
10 changed files with 578 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/settings/tidalsettingspage.cpp
View File

@@ -54,6 +54,12 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent)
ui_->combobox_quality->addItem("High", "HIGH"); ui_->combobox_quality->addItem("High", "HIGH");
ui_->combobox_quality->addItem("Lossless", "LOSSLESS"); ui_->combobox_quality->addItem("Lossless", "LOSSLESS");
ui_->combobox_coversize->addItem("160x160", "160x160");
ui_->combobox_coversize->addItem("320x320", "320x320");
ui_->combobox_coversize->addItem("640x640", "640x640");
ui_->combobox_coversize->addItem("750x750", "750x750");
ui_->combobox_coversize->addItem("1280x1280", "1280x1280");
} }
TidalSettingsPage::~TidalSettingsPage() { delete ui_; } TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
@@ -61,11 +67,23 @@ TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
void TidalSettingsPage::Load() { void TidalSettingsPage::Load() {
QSettings s; QSettings s;
s.beginGroup(kSettingsGroup); s.beginGroup(kSettingsGroup);
ui_->username->setText(s.value("username").toString()); ui_->username->setText(s.value("username").toString());
ui_->password->setText(s.value("password").toString()); ui_->password->setText(s.value("password").toString());
QString quality = s.value("quality", "HIGH").toString(); QString quality = s.value("quality", "HIGH").toString();
ui_->combobox_quality->setCurrentIndex(ui_->combobox_quality->findData(quality)); ui_->combobox_quality->setCurrentIndex(ui_->combobox_quality->findData(quality));
ui_->spinbox_searchdelay->setValue(s.value("searchdelay", 1500).toInt());
ui_->spinbox_albumssearchlimit->setValue(s.value("albumssearchlimit", 40).toInt());
ui_->spinbox_songssearchlimit->setValue(s.value("songssearchlimit", 10).toInt());
ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool());
QString coversize = s.value("coversize", "320x320").toString();
ui_->combobox_coversize->setCurrentIndex(ui_->combobox_coversize->findData(coversize));
s.endGroup(); s.endGroup();
if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn); if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn);
@@ -79,6 +97,11 @@ void TidalSettingsPage::Save() {
s.setValue("username", ui_->username->text()); s.setValue("username", ui_->username->text());
s.setValue("password", ui_->password->text()); s.setValue("password", ui_->password->text());
s.setValue("quality", ui_->combobox_quality->itemData(ui_->combobox_quality->currentIndex())); s.setValue("quality", ui_->combobox_quality->itemData(ui_->combobox_quality->currentIndex()));
s.setValue("searchdelay", ui_->spinbox_searchdelay->value());
s.setValue("albumssearchlimit", ui_->spinbox_albumssearchlimit->value());
s.setValue("songssearchlimit", ui_->spinbox_songssearchlimit->value());
s.setValue("fetchalbums", ui_->checkbox_fetchalbums->isChecked());
s.setValue("coversize", ui_->combobox_coversize->itemData(ui_->combobox_coversize->currentIndex()));
s.endGroup(); s.endGroup();
service_->ReloadSettings(); service_->ReloadSettings();

220
src/settings/tidalsettingspage.ui
View File

@@ -7,16 +7,13 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>715</width> <width>715</width>
<height>425</height> <height>483</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Tidal</string> <string>Tidal</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="LoginStateWidget" name="login_state" native="true"/>
</item>
<item> <item>
<widget class="QGroupBox" name="credential_group"> <widget class="QGroupBox" name="credential_group">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -68,20 +65,221 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupbox_pref"> <widget class="LoginStateWidget" name="login_state" native="true"/>
</item>
<item>
<widget class="QGroupBox" name="groupbox_preferences">
<property name="title"> <property name="title">
<string>Preferences</string> <string>Preferences</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item row="0" column="0"> <item>
<widget class="QLabel" name="label_quality"> <layout class="QHBoxLayout" name="horizontalLayout_quality">
<item>
<widget class="QLabel" name="label_quality">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Audio quality</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="combobox_quality"/>
</item>
<item>
<spacer name="spacer_quality">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_searchdelay">
<item>
<widget class="QLabel" name="label_searchdelay">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Search delay</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinbox_searchdelay">
<property name="suffix">
<string>ms</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>50</number>
</property>
<property name="value">
<number>1500</number>
</property>
</widget>
</item>
<item>
<spacer name="spacer_searchdelay">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_albumssearchlimit">
<item>
<widget class="QLabel" name="label_albumssearchlimit">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Albums search limit</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinbox_albumssearchlimit">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>50</number>
</property>
</widget>
</item>
<item>
<spacer name="spacer_albumssearchlimit">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_songssearchlimit">
<item>
<widget class="QLabel" name="label_songssearchlimit">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Songs search limit</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinbox_songssearchlimit">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>50</number>
</property>
</widget>
</item>
<item>
<spacer name="spacer_songssearchlimit">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="checkbox_fetchalbums">
<property name="text"> <property name="text">
<string>Audio quality</string> <string>Fetch entire albums when searching songs</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QComboBox" name="combobox_quality"/> <layout class="QHBoxLayout" name="horizontalLayout_coversize">
<item>
<widget class="QLabel" name="label_coversize">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Album cover size</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="combobox_coversize"/>
</item>
<item>
<spacer name="spacer_coversize">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>

16
src/tidal/tidalsearch.cpp
View File

@@ -71,6 +71,9 @@ TidalSearch::TidalSearch(Application *app, QObject *parent)
connect(this, SIGNAL(SearchAsyncSig(int, QString, TidalSettingsPage::SearchBy)), this, SLOT(DoSearchAsync(int, QString, TidalSettingsPage::SearchBy))); connect(this, SIGNAL(SearchAsyncSig(int, QString, TidalSettingsPage::SearchBy)), this, SLOT(DoSearchAsync(int, QString, TidalSettingsPage::SearchBy)));
connect(this, SIGNAL(ResultsAvailable(int, TidalSearch::ResultList)), SLOT(ResultsAvailableSlot(int, TidalSearch::ResultList))); connect(this, SIGNAL(ResultsAvailable(int, TidalSearch::ResultList)), SLOT(ResultsAvailableSlot(int, TidalSearch::ResultList)));
connect(this, SIGNAL(ArtLoaded(int, QImage)), SLOT(ArtLoadedSlot(int, QImage))); connect(this, SIGNAL(ArtLoaded(int, QImage)), SLOT(ArtLoadedSlot(int, QImage)));
connect(service_, SIGNAL(UpdateStatus(QString)), SLOT(UpdateStatusSlot(QString)));
connect(service_, SIGNAL(ProgressSetMaximum(int)), SLOT(ProgressSetMaximumSlot(int)));
connect(service_, SIGNAL(UpdateProgress(int)), SLOT(UpdateProgressSlot(int)));
connect(service_, SIGNAL(SearchResults(int, SongList)), SLOT(SearchDone(int, SongList))); connect(service_, SIGNAL(SearchResults(int, SongList)), SLOT(SearchDone(int, SongList)));
connect(service_, SIGNAL(SearchError(int, QString)), SLOT(HandleError(int, QString))); connect(service_, SIGNAL(SearchError(int, QString)), SLOT(HandleError(int, QString)));
@@ -178,6 +181,7 @@ void TidalSearch::CancelSearch(int id) {
return; return;
} }
} }
service_->CancelSearch();
} }
void TidalSearch::timerEvent(QTimerEvent *e) { void TidalSearch::timerEvent(QTimerEvent *e) {
@@ -311,3 +315,15 @@ MimeData *TidalSearch::LoadTracks(const ResultList &results) {
return mime_data; return mime_data;
} }
void TidalSearch::UpdateStatusSlot(QString text) {
emit UpdateStatus(text);
}
void TidalSearch::ProgressSetMaximumSlot(int max) {
emit ProgressSetMaximum(max);
}
void TidalSearch::UpdateProgressSlot(int progress) {
emit UpdateProgress(progress);
}

7
src/tidal/tidalsearch.h
View File

@@ -75,6 +75,9 @@ class TidalSearch : public QObject {
void AddResults(int id, const TidalSearch::ResultList &results); void AddResults(int id, const TidalSearch::ResultList &results);
void SearchError(const int id, const QString error); void SearchError(const int id, const QString error);
void SearchFinished(int id); void SearchFinished(int id);
void UpdateStatus(QString text);
void ProgressSetMaximum(int progress);
void UpdateProgress(int max);
void ArtLoaded(int id, const QPixmap &pixmap); void ArtLoaded(int id, const QPixmap &pixmap);
void ArtLoaded(int id, const QImage &image); void ArtLoaded(int id, const QImage &image);
@@ -113,6 +116,10 @@ class TidalSearch : public QObject {
void ArtLoadedSlot(int id, const QImage &image); void ArtLoadedSlot(int id, const QImage &image);
void AlbumArtLoaded(quint64 id, const QImage &image); void AlbumArtLoaded(quint64 id, const QImage &image);
void UpdateStatusSlot(QString text);
void ProgressSetMaximumSlot(int progress);
void UpdateProgressSlot(int max);
private: private:
void SearchAsync(int id, const QString &query, TidalSettingsPage::SearchBy searchby); void SearchAsync(int id, const QString &query, TidalSettingsPage::SearchBy searchby);
void HandleLoadedArt(int id, const QImage &image); void HandleLoadedArt(int id, const QImage &image);

2
src/tidal/tidalsearchmodel.cpp
View File

@@ -45,7 +45,7 @@ TidalSearchModel::TidalSearchModel(TidalSearch *engine, QObject *parent)
group_by_[0] = CollectionModel::GroupBy_Artist; group_by_[0] = CollectionModel::GroupBy_Artist;
group_by_[1] = CollectionModel::GroupBy_Album; group_by_[1] = CollectionModel::GroupBy_Album;
group_by_[2] = CollectionModel::GroupBy_None; group_by_[2] = CollectionModel::GroupBy_None;
QIcon nocover = IconLoader::Load("cdcase"); QIcon nocover = IconLoader::Load("cdcase");
no_cover_icon_ = nocover.pixmap(nocover.availableSizes().last()).scaled(CollectionModel::kPrettyCoverSize, CollectionModel::kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); no_cover_icon_ = nocover.pixmap(nocover.availableSizes().last()).scaled(CollectionModel::kPrettyCoverSize, CollectionModel::kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);

32
src/tidal/tidalsearchview.cpp
View File

@@ -83,6 +83,8 @@ TidalSearchView::TidalSearchView(Application *app, QWidget *parent)
error_(false) { error_(false) {
ui_->setupUi(this); ui_->setupUi(this);
ui_->progressbar->hide();
ui_->progressbar->reset();
front_model_->set_proxy(front_proxy_); front_model_->set_proxy(front_proxy_);
back_model_->set_proxy(back_proxy_); back_model_->set_proxy(back_proxy_);
@@ -147,6 +149,11 @@ TidalSearchView::TidalSearchView(Application *app, QWidget *parent)
connect(group_by_actions_, SIGNAL(triggered(QAction*)), SLOT(GroupByClicked(QAction*))); connect(group_by_actions_, SIGNAL(triggered(QAction*)), SLOT(GroupByClicked(QAction*)));
// These have to be queued connections because they may get emitted before our call to Search() (or whatever) returns and we add the ID to the map. // These have to be queued connections because they may get emitted before our call to Search() (or whatever) returns and we add the ID to the map.
connect(engine_, SIGNAL(UpdateStatus(QString)), SLOT(UpdateStatus(QString)));
connect(engine_, SIGNAL(ProgressSetMaximum(int)), SLOT(ProgressSetMaximum(int)), Qt::QueuedConnection);
connect(engine_, SIGNAL(UpdateProgress(int)), SLOT(UpdateProgress(int)), Qt::QueuedConnection);
connect(engine_, SIGNAL(AddResults(int, TidalSearch::ResultList)), SLOT(AddResults(int, TidalSearch::ResultList)), Qt::QueuedConnection); connect(engine_, SIGNAL(AddResults(int, TidalSearch::ResultList)), SLOT(AddResults(int, TidalSearch::ResultList)), Qt::QueuedConnection);
connect(engine_, SIGNAL(SearchError(int, QString)), SLOT(SearchError(int, QString)), Qt::QueuedConnection); connect(engine_, SIGNAL(SearchError(int, QString)), SLOT(SearchError(int, QString)), Qt::QueuedConnection);
connect(engine_, SIGNAL(ArtLoaded(int, QPixmap)), SLOT(ArtLoaded(int, QPixmap)), Qt::QueuedConnection); connect(engine_, SIGNAL(ArtLoaded(int, QPixmap)), SLOT(ArtLoaded(int, QPixmap)), Qt::QueuedConnection);
@@ -219,8 +226,12 @@ void TidalSearchView::TextEdited(const QString &text) {
if (trimmed.isEmpty()) { if (trimmed.isEmpty()) {
last_search_id_ = -1; last_search_id_ = -1;
ui_->label_helptext->setText("Enter search terms above to find music"); ui_->label_helptext->setText("Enter search terms above to find music");
ui_->label_status->clear();
ui_->progressbar->hide();
ui_->progressbar->reset();
} }
else { else {
ui_->progressbar->reset();
last_search_id_ = engine_->SearchAsync(trimmed, searchby_); last_search_id_ = engine_->SearchAsync(trimmed, searchby_);
} }
@@ -229,12 +240,18 @@ void TidalSearchView::TextEdited(const QString &text) {
void TidalSearchView::AddResults(int id, const TidalSearch::ResultList &results) { void TidalSearchView::AddResults(int id, const TidalSearch::ResultList &results) {
if (id != last_search_id_) return; if (id != last_search_id_) return;
if (results.isEmpty()) return; if (results.isEmpty()) return;
ui_->label_status->clear();
ui_->progressbar->reset();
ui_->progressbar->hide();
current_model_->AddResults(results); current_model_->AddResults(results);
} }
void TidalSearchView::SearchError(const int id, const QString error) { void TidalSearchView::SearchError(const int id, const QString error) {
error_ = true; error_ = true;
ui_->label_helptext->setText(error); ui_->label_helptext->setText(error);
ui_->label_status->clear();
ui_->progressbar->reset();
ui_->progressbar->hide();
ui_->results_stack->setCurrentWidget(ui_->help_page); ui_->results_stack->setCurrentWidget(ui_->help_page);
} }
@@ -378,7 +395,7 @@ bool TidalSearchView::SearchKeyEvent(QKeyEvent *event) {
break; break;
case Qt::Key_Return: case Qt::Key_Return:
AddSelectedToPlaylist(); TextEdited(ui_->search->text());
break; break;
default: default:
@@ -542,3 +559,16 @@ void TidalSearchView::SetSearchBy(TidalSettingsPage::SearchBy searchby) {
s.endGroup(); s.endGroup();
TextEdited(ui_->search->text()); TextEdited(ui_->search->text());
} }
void TidalSearchView::UpdateStatus(QString text) {
ui_->progressbar->show();
ui_->label_status->setText(text);
}
void TidalSearchView::ProgressSetMaximum(int max) {
ui_->progressbar->setMaximum(max);
}
void TidalSearchView::UpdateProgress(int progress) {
ui_->progressbar->setValue(progress);
}

3
src/tidal/tidalsearchview.h
View File

@@ -77,6 +77,9 @@ signals:
private slots: private slots:
void SwapModels(); void SwapModels();
void TextEdited(const QString &text); void TextEdited(const QString &text);
void UpdateStatus(QString text);
void ProgressSetMaximum(int progress);
void UpdateProgress(int max);
void AddResults(int id, const TidalSearch::ResultList &results); void AddResults(int id, const TidalSearch::ResultList &results);
void SearchError(const int id, const QString error); void SearchError(const int id, const QString error);
void ArtLoaded(int id, const QPixmap &pixmap); void ArtLoaded(int id, const QPixmap &pixmap);

104
src/tidal/tidalsearchview.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>633</height> <height>660</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@@ -33,7 +33,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="layout_top" stretch="0,0"> <layout class="QVBoxLayout" name="layout_top" stretch="0,0,0">
<item> <item>
<layout class="QHBoxLayout" name="layout_search"> <layout class="QHBoxLayout" name="layout_search">
<item> <item>
@@ -108,6 +108,27 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QVBoxLayout" name="layout_progress">
<item>
<widget class="QLabel" name="label_status">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressbar">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@@ -187,46 +208,55 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>398</width> <width>398</width>
<height>533</height> <height>502</height>
</rect> </rect>
</property> </property>
<widget class="QWidget" name="widget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_5">
<property name="geometry"> <item>
<rect> <widget class="QWidget" name="widget" native="true">
<x>9</x> <layout class="QVBoxLayout" name="verticalLayout_4">
<y>109</y> <property name="leftMargin">
<width>336</width> <number>32</number>
<height>100</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>32</number>
</property>
<property name="topMargin">
<number>16</number>
</property>
<property name="rightMargin">
<number>32</number>
</property>
<property name="bottomMargin">
<number>64</number>
</property>
<item>
<widget class="QLabel" name="label_helptext">
<property name="text">
<string>Enter search terms above to find music</string>
</property> </property>
<property name="alignment"> <property name="topMargin">
<set>Qt::AlignCenter</set> <number>16</number>
</property> </property>
<property name="wordWrap"> <property name="rightMargin">
<bool>true</bool> <number>32</number>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>64</number>
</layout> </property>
</widget> <item>
<widget class="QLabel" name="label_helptext">
<property name="text">
<string>Enter search terms above to find music</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="spacer_helptext">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>

351
src/tidal/tidalservice.cpp
View File

@@ -59,24 +59,23 @@ const char *TidalService::kAuthUrl = "https://listen.tidal.com/v1/login/username
const char *TidalService::kResourcesUrl = "http://resources.tidal.com"; const char *TidalService::kResourcesUrl = "http://resources.tidal.com";
const char *TidalService::kApiToken = "P5Xbeo5LFvESeDy6"; const char *TidalService::kApiToken = "P5Xbeo5LFvESeDy6";
const int TidalService::kSearchDelayMsec = 1500;
const int TidalService::kSearchAlbumsLimit = 40;
const int TidalService::kSearchTracksLimit = 10;
typedef QPair<QString, QString> Param; typedef QPair<QString, QString> Param;
TidalService::TidalService(Application *app, InternetModel *parent) TidalService::TidalService(Application *app, InternetModel *parent)
: InternetService(kServiceName, app, parent, parent), : InternetService(kServiceName, app, parent, parent),
network_(new NetworkAccessManager(this)), network_(new NetworkAccessManager(this)),
search_delay_(new QTimer(this)), timer_searchdelay_(new QTimer(this)),
searchdelay_(1500),
albumssearchlimit_(1),
songssearchlimit_(1),
fetchalbums_(false),
pending_search_id_(0), pending_search_id_(0),
next_pending_search_id_(1), next_pending_search_id_(1),
search_requests_(0), login_sent_(false)
login_sent_(false) { {
search_delay_->setInterval(kSearchDelayMsec); timer_searchdelay_->setSingleShot(true);
search_delay_->setSingleShot(true); connect(timer_searchdelay_, SIGNAL(timeout()), SLOT(StartSearch()));
connect(search_delay_, SIGNAL(timeout()), SLOT(StartSearch()));
ReloadSettings(); ReloadSettings();
LoadSessionID(); LoadSessionID();
@@ -96,6 +95,11 @@ void TidalService::ReloadSettings() {
username_ = s.value("username").toString(); username_ = s.value("username").toString();
password_ = s.value("password").toString(); password_ = s.value("password").toString();
quality_ = s.value("quality").toString(); quality_ = s.value("quality").toString();
searchdelay_ = s.value("searchdelay", 1500).toInt();
albumssearchlimit_ = s.value("albumssearchlimit", 40).toInt();
songssearchlimit_ = s.value("songssearchlimit", 10).toInt();
fetchalbums_ = s.value("fetchalbums", false).toBool();
coversize_ = s.value("coversize", "320x320").toString();
s.endGroup(); s.endGroup();
} }
@@ -112,20 +116,12 @@ void TidalService::LoadSessionID() {
} }
void TidalService::Login(const QString &username, const QString &password) { void TidalService::Login(const QString &username, const QString &password, int search_id) {
Login(nullptr, username, password);
}
void TidalService::Login(TidalSearchContext *search_ctx, const QString &username, const QString &password) { if (search_id != 0) emit UpdateStatus("Authenticating...");
login_sent_ = true; login_sent_ = true;
login_attempts_++;
int id = 0;
if (search_ctx) {
search_ctx->login_sent = true;
search_ctx->login_attempts++;
id = search_ctx->id;
}
typedef QPair<QString, QString> Arg; typedef QPair<QString, QString> Arg;
typedef QList<Arg> ArgList; typedef QList<Arg> ArgList;
@@ -148,28 +144,22 @@ void TidalService::Login(TidalSearchContext *search_ctx, const QString &username
req.setRawHeader("Origin", "http://listen.tidal.com"); req.setRawHeader("Origin", "http://listen.tidal.com");
QNetworkReply *reply = network_->post(req, url_query.toString(QUrl::FullyEncoded).toUtf8()); QNetworkReply *reply = network_->post(req, url_query.toString(QUrl::FullyEncoded).toUtf8());
NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleAuthReply(QNetworkReply*, int)), reply, id); NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleAuthReply(QNetworkReply*, int)), reply, search_id);
} }
void TidalService::HandleAuthReply(QNetworkReply *reply, int id) { void TidalService::HandleAuthReply(QNetworkReply *reply, int search_id) {
reply->deleteLater(); reply->deleteLater();
login_sent_ = false; login_sent_ = false;
TidalSearchContext *search_ctx(nullptr);
if (id != 0 && requests_search_.contains(id)) {
search_ctx = requests_search_.value(id);
search_ctx->login_sent = false;
}
//int http_status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); //int http_status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
if (reply->error() < 200) { if (reply->error() < 200) {
// This is a network error, there is nothing more to do. // This is a network error, there is nothing more to do.
QString failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); QString failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
@@ -191,7 +181,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int id) {
else { else {
failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
} }
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
@@ -203,21 +193,21 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int id) {
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
QString failure_reason("Authentication reply from server missing Json data."); QString failure_reason("Authentication reply from server missing Json data.");
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
if (json_doc.isNull() || json_doc.isEmpty()) { if (json_doc.isNull() || json_doc.isEmpty()) {
QString failure_reason("Authentication reply from server has empty Json document."); QString failure_reason("Authentication reply from server has empty Json document.");
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
if (!json_doc.isObject()) { if (!json_doc.isObject()) {
QString failure_reason("Authentication reply from server has Json document that is not an object."); QString failure_reason("Authentication reply from server has Json document that is not an object.");
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
@@ -225,14 +215,14 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int id) {
QJsonObject json_obj = json_doc.object(); QJsonObject json_obj = json_doc.object();
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
QString failure_reason("Authentication reply from server has empty Json object."); QString failure_reason("Authentication reply from server has empty Json object.");
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
if ( !json_obj.contains("userId") || !json_obj.contains("sessionId") || !json_obj.contains("countryCode") ) { if ( !json_obj.contains("userId") || !json_obj.contains("sessionId") || !json_obj.contains("countryCode") ) {
QString failure_reason = tr("Authentication reply from server is missing userId, sessionId or countryCode"); QString failure_reason = tr("Authentication reply from server is missing userId, sessionId or countryCode");
if (search_ctx) Error(search_ctx, failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
} }
@@ -250,9 +240,9 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int id) {
qLog(Debug) << "Tidal: Login successful" << "user id" << user_id_ << "session id" << session_id_ << "country code" << country_code_; qLog(Debug) << "Tidal: Login successful" << "user id" << user_id_ << "session id" << session_id_ << "country code" << country_code_;
if (search_ctx) { if (search_id != 0) {
qLog(Debug) << "Tidal: Resuming search"; qLog(Debug) << "Tidal: Resuming search";
SendSearch(search_ctx); SendSearch();
} }
emit LoginSuccess(); emit LoginSuccess();
@@ -305,7 +295,7 @@ QNetworkReply *TidalService::CreateRequest(const QString &ressource_name, const
} }
QJsonObject TidalService::ExtractJsonObj(TidalSearchContext *search_ctx, QNetworkReply *reply) { QJsonObject TidalService::ExtractJsonObj(QNetworkReply *reply) {
QByteArray data; QByteArray data;
@@ -317,7 +307,7 @@ QJsonObject TidalService::ExtractJsonObj(TidalSearchContext *search_ctx, QNetwor
if (reply->error() < 200) { if (reply->error() < 200) {
// This is a network error, there is nothing more to do. // This is a network error, there is nothing more to do.
QString failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); QString failure_reason = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
Error(search_ctx, failure_reason); Error(failure_reason);
} }
else { else {
// See if there is Json data containing "userMessage" - then use that instead. // See if there is Json data containing "userMessage" - then use that instead.
@@ -340,21 +330,21 @@ QJsonObject TidalService::ExtractJsonObj(TidalSearchContext *search_ctx, QNetwor
if (reply->error() == QNetworkReply::ContentAccessDenied || reply->error() == QNetworkReply::ContentOperationNotPermittedError || reply->error() == QNetworkReply::AuthenticationRequiredError) { if (reply->error() == QNetworkReply::ContentAccessDenied || reply->error() == QNetworkReply::ContentOperationNotPermittedError || reply->error() == QNetworkReply::AuthenticationRequiredError) {
// Session is probably expired, attempt to login once // Session is probably expired, attempt to login once
Logout(); Logout();
if (search_ctx->login_attempts < 1 && !username_.isEmpty() && !password_.isEmpty()) { if (login_attempts_ < 1 && !username_.isEmpty() && !password_.isEmpty()) {
qLog(Error) << "Tidal:" << failure_reason; qLog(Error) << "Tidal:" << failure_reason;
qLog(Error) << "Tidal:" << QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()); qLog(Error) << "Tidal:" << QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
qLog(Error) << "Tidal:" << "Attempting to login."; qLog(Error) << "Tidal:" << "Attempting to login.";
Login(search_ctx, username_, password_); Login(username_, password_);
} }
else { else {
Error(search_ctx, failure_reason); Error(failure_reason);
} }
} }
else if (reply->error() == QNetworkReply::ContentNotFoundError) { // Ignore this error else if (reply->error() == QNetworkReply::ContentNotFoundError) { // Ignore this error
qLog(Error) << "Tidal:" << failure_reason; qLog(Error) << "Tidal:" << failure_reason;
} }
else { // Fail else { // Fail
Error(search_ctx, failure_reason); Error(failure_reason);
} }
} }
return QJsonObject(); return QJsonObject();
@@ -364,23 +354,23 @@ QJsonObject TidalService::ExtractJsonObj(TidalSearchContext *search_ctx, QNetwor
QJsonDocument json_doc = QJsonDocument::fromJson(data, &error); QJsonDocument json_doc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
Error(search_ctx, "Reply from server missing Json data."); Error("Reply from server missing Json data.");
return QJsonObject(); return QJsonObject();
} }
if (json_doc.isNull() || json_doc.isEmpty()) { if (json_doc.isNull() || json_doc.isEmpty()) {
Error(search_ctx, "Received empty Json document."); Error("Received empty Json document.");
return QJsonObject(); return QJsonObject();
} }
if (!json_doc.isObject()) { if (!json_doc.isObject()) {
Error(search_ctx, "Json document is not an object."); Error("Json document is not an object.");
return QJsonObject(); return QJsonObject();
} }
QJsonObject json_obj = json_doc.object(); QJsonObject json_obj = json_doc.object();
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
Error(search_ctx, "Received empty Json object."); Error("Received empty Json object.");
return QJsonObject(); return QJsonObject();
} }
@@ -390,19 +380,19 @@ QJsonObject TidalService::ExtractJsonObj(TidalSearchContext *search_ctx, QNetwor
} }
QJsonArray TidalService::ExtractItems(TidalSearchContext *search_ctx, QNetworkReply *reply) { QJsonArray TidalService::ExtractItems(QNetworkReply *reply) {
QJsonObject json_obj = ExtractJsonObj(search_ctx, reply); QJsonObject json_obj = ExtractJsonObj(reply);
if (json_obj.isEmpty()) return QJsonArray(); if (json_obj.isEmpty()) return QJsonArray();
if (!json_obj.contains("items")) { if (!json_obj.contains("items")) {
Error(search_ctx, "Json reply is missing items."); Error("Json reply is missing items.");
return QJsonArray(); return QJsonArray();
} }
QJsonArray json_items = json_obj["items"].toArray(); QJsonArray json_items = json_obj["items"].toArray();
if (json_items.isEmpty()) { if (json_items.isEmpty()) {
Error(search_ctx, "No match."); Error("No match.");
return QJsonArray(); return QJsonArray();
} }
@@ -413,16 +403,17 @@ QJsonArray TidalService::ExtractItems(TidalSearchContext *search_ctx, QNetworkRe
int TidalService::Search(const QString &text, TidalSettingsPage::SearchBy searchby) { int TidalService::Search(const QString &text, TidalSettingsPage::SearchBy searchby) {
pending_search_id_ = next_pending_search_id_; pending_search_id_ = next_pending_search_id_;
pending_search_ = text; pending_search_text_ = text;
pending_searchby_ = searchby; pending_searchby_ = searchby;
next_pending_search_id_++; next_pending_search_id_++;
if (text.isEmpty()) { if (text.isEmpty()) {
search_delay_->stop(); timer_searchdelay_->stop();
return pending_search_id_; return pending_search_id_;
} }
search_delay_->start(); timer_searchdelay_->setInterval(searchdelay_);
timer_searchdelay_->start();
return pending_search_id_; return pending_search_id_;
@@ -436,48 +427,54 @@ void TidalService::StartSearch() {
ShowConfig(); ShowConfig();
return; return;
} }
ClearSearch();
search_id_ = pending_search_id_;
search_text_ = pending_search_text_;
TidalSearchContext *search_ctx = CreateSearch(pending_search_id_, pending_search_); if (authenticated()) SendSearch();
if (authenticated()) SendSearch(search_ctx); else Login(username_, password_);
else Login(search_ctx, username_, password_);
} }
TidalSearchContext *TidalService::CreateSearch(const int search_id, const QString text) { void TidalService::CancelSearch() {
ClearSearch();
TidalSearchContext *search_ctx = new TidalSearchContext; }
search_ctx->id = search_id; void TidalService::ClearSearch() {
search_ctx->text = text; search_id_ = 0;
search_ctx->album_requests = 0; search_text_ = QString();
search_ctx->song_requests = 0; search_error_ = QString();
search_ctx->requests_album_.clear(); albums_requested_ = 0;
search_ctx->requests_song_.clear(); songs_requested_ = 0;
search_ctx->login_attempts = 0; albums_received_ = 0;
requests_search_.insert(search_id, search_ctx); songs_received_ = 0;
return search_ctx; requests_album_.clear();
requests_song_.clear();
login_attempts_ = 0;
songs_.clear();
} }
void TidalService::SendSearch(TidalSearchContext *search_ctx) { void TidalService::SendSearch() {
emit UpdateStatus("Searching...");
QList<Param> parameters; QList<Param> parameters;
parameters << Param("query", search_ctx->text); parameters << Param("query", search_text_);
QString searchparam; QString searchparam;
switch (pending_searchby_) { switch (pending_searchby_) {
case TidalSettingsPage::SearchBy_Songs: case TidalSettingsPage::SearchBy_Songs:
searchparam = "search/tracks"; searchparam = "search/tracks";
parameters << Param("limit", QString::number(kSearchTracksLimit)); parameters << Param("limit", QString::number(songssearchlimit_));
break; break;
case TidalSettingsPage::SearchBy_Albums: case TidalSettingsPage::SearchBy_Albums:
default: default:
searchparam = "search/albums"; searchparam = "search/albums";
parameters << Param("limit", QString::number(kSearchAlbumsLimit)); parameters << Param("limit", QString::number(albumssearchlimit_));
break; break;
} }
QNetworkReply *reply = CreateRequest(searchparam, parameters); QNetworkReply *reply = CreateRequest(searchparam, parameters);
NewClosure(reply, SIGNAL(finished()), this, SLOT(SearchFinished(QNetworkReply*, int)), reply, search_ctx->id); NewClosure(reply, SIGNAL(finished()), this, SLOT(SearchFinished(QNetworkReply*, int)), reply, search_id_);
} }
@@ -485,12 +482,11 @@ void TidalService::SearchFinished(QNetworkReply *reply, int id) {
reply->deleteLater(); reply->deleteLater();
if (!requests_search_.contains(id)) return; if (id != search_id_) return;
TidalSearchContext *search_ctx = requests_search_.value(id);
QJsonArray json_items = ExtractItems(search_ctx, reply); QJsonArray json_items = ExtractItems(reply);
if (json_items.isEmpty()) { if (json_items.isEmpty()) {
CheckFinish(search_ctx); CheckFinish();
return; return;
} }
@@ -498,6 +494,7 @@ void TidalService::SearchFinished(QNetworkReply *reply, int id) {
QVector<QString> albums; QVector<QString> albums;
for (const QJsonValue &value : json_items) { for (const QJsonValue &value : json_items) {
//qLog(Debug) << value;
if (!value.isObject()) { if (!value.isObject()) {
qLog(Error) << "Tidal: Invalid Json reply, item not a object."; qLog(Error) << "Tidal: Invalid Json reply, item not a object.";
qLog(Debug) << value; qLog(Debug) << value;
@@ -519,6 +516,10 @@ void TidalService::SearchFinished(QNetworkReply *reply, int id) {
} }
else if (json_obj.contains("album")) { else if (json_obj.contains("album")) {
// This was a tracks search // This was a tracks search
if (!fetchalbums_) {
ParseSong(0, value);
continue;
}
QJsonValue json_value_album = json_obj["album"]; QJsonValue json_value_album = json_obj["album"];
if (!json_value_album.isObject()) { if (!json_value_album.isObject()) {
qLog(Error) << "Tidal: Invalid Json reply, item album is not a object."; qLog(Error) << "Tidal: Invalid Json reply, item album is not a object.";
@@ -540,7 +541,7 @@ void TidalService::SearchFinished(QNetworkReply *reply, int id) {
continue; continue;
} }
if (search_ctx->requests_album_.contains(album_id)) continue; if (requests_album_.contains(album_id)) continue;
if (!json_obj.contains("artist") || !json_obj.contains("title") || !json_obj.contains("audioQuality")) { if (!json_obj.contains("artist") || !json_obj.contains("title") || !json_obj.contains("audioQuality")) {
qLog(Error) << "Tidal: Invalid Json reply, item missing artist, title or audioQuality."; qLog(Error) << "Tidal: Invalid Json reply, item missing artist, title or audioQuality.";
@@ -572,17 +573,28 @@ void TidalService::SearchFinished(QNetworkReply *reply, int id) {
} }
albums.insert(0, artist_album); albums.insert(0, artist_album);
search_ctx->requests_album_.insert(album_id, album_id); requests_album_.insert(album_id, album_id);
GetAlbum(search_ctx, album_id); GetAlbum(album_id);
search_ctx->album_requests++; albums_requested_++;
if (search_ctx->album_requests >= kSearchAlbumsLimit) break; if (albums_requested_ >= albumssearchlimit_) break;
} }
CheckFinish(search_ctx); if (albums_requested_ > 0) {
emit UpdateStatus(QString("Retriving %1 album%2...").arg(albums_requested_).arg(albums_requested_ == 1 ? "" : "s"));
emit ProgressSetMaximum(albums_requested_);
emit UpdateProgress(0);
}
else if (songs_requested_ > 0) {
emit UpdateStatus(QString("Retriving %1 song%2...").arg(songs_requested_).arg(songs_requested_ == 1 ? "" : "s"));
emit ProgressSetMaximum(songs_requested_);
emit UpdateProgress(songs_received_);
}
CheckFinish();
} }
void TidalService::GetAlbum(TidalSearchContext *search_ctx, const int album_id) { void TidalService::GetAlbum(const int album_id) {
QList<Param> parameters; QList<Param> parameters;
parameters << Param("token", session_id_) parameters << Param("token", session_id_)
@@ -590,7 +602,7 @@ void TidalService::GetAlbum(TidalSearchContext *search_ctx, const int album_id)
QNetworkReply *reply = CreateRequest(QString("albums/%1/tracks").arg(album_id), parameters); QNetworkReply *reply = CreateRequest(QString("albums/%1/tracks").arg(album_id), parameters);
NewClosure(reply, SIGNAL(finished()), this, SLOT(GetAlbumFinished(QNetworkReply*, int, int)), reply, search_ctx->id, album_id); NewClosure(reply, SIGNAL(finished()), this, SLOT(GetAlbumFinished(QNetworkReply*, int, int)), reply, search_id_, album_id);
} }
@@ -598,52 +610,57 @@ void TidalService::GetAlbumFinished(QNetworkReply *reply, int search_id, int alb
reply->deleteLater(); reply->deleteLater();
if (!requests_search_.contains(search_id)) return; if (search_id != search_id_) return;
TidalSearchContext *search_ctx = requests_search_.value(search_id); if (!requests_album_.contains(album_id)) return;
albums_received_++;
emit UpdateProgress(albums_received_);
if (!search_ctx->requests_album_.contains(album_id)) return; QJsonArray json_items = ExtractItems(reply);
search_ctx->album_requests--;
QJsonArray json_items = ExtractItems(search_ctx, reply);
if (json_items.isEmpty()) { if (json_items.isEmpty()) {
CheckFinish(search_ctx); CheckFinish();
return; return;
} }
bool compilation = false; bool compilation = false;
bool multidisc = false; bool multidisc = false;
Song *first_song(nullptr); Song first_song;
QList<Song *> songs; QList<Song> songs;
for (const QJsonValue &value : json_items) { for (const QJsonValue &value : json_items) {
Song *song = ParseSong(search_ctx, album_id, value); Song song = ParseSong(album_id, value);
if (!song) continue; if (!song.is_valid()) continue;
if (song.disc() >= 2) multidisc = true;
if (song.is_compilation() || (first_song.is_valid() && song.artist() != first_song.artist())) compilation = true;
if (!first_song.is_valid()) first_song = song;
songs << song; songs << song;
if (song->disc() >= 2) multidisc = true;
if (song->is_compilation() || (first_song && song->artist() != first_song->artist())) compilation = true;
if (!first_song) first_song = song;
} }
if (compilation || multidisc) { for (Song &song : songs) {
for (Song *song : songs) { if (compilation) song.set_compilation_detected(true);
if (compilation) song->set_compilation_detected(true); if (multidisc) {
if (multidisc) { QString album_full(QString("%1 - (Disc %2)").arg(song.album()).arg(song.disc()));
QString album_full(QString("%1 - (Disc %2)").arg(song->album()).arg(song->disc())); song.set_album(album_full);
song->set_album(album_full);
}
} }
requests_song_.insert(song.id(), song);
songs_requested_++;
} }
CheckFinish(search_ctx); if (albums_requested_ <= albums_received_) {
emit UpdateStatus(QString("Retriving %1 song%2...").arg(songs_requested_).arg(songs_requested_ == 1 ? "" : "s"));
emit ProgressSetMaximum(songs_requested_);
emit UpdateProgress(songs_received_);
}
CheckFinish();
} }
Song *TidalService::ParseSong(TidalSearchContext *search_ctx, const int album_id, const QJsonValue &value) { Song TidalService::ParseSong(const int album_id_requested, const QJsonValue &value) {
Song song; Song song;
if (!value.isObject()) { if (!value.isObject()) {
qLog(Error) << "Tidal: Invalid Json reply, track is not a object."; qLog(Error) << "Tidal: Invalid Json reply, track is not a object.";
qLog(Debug) << value; qLog(Debug) << value;
return nullptr; return song;
} }
QJsonObject json_obj = value.toObject(); QJsonObject json_obj = value.toObject();
@@ -665,7 +682,7 @@ Song *TidalService::ParseSong(TidalSearchContext *search_ctx, const int album_id
) { ) {
qLog(Error) << "Tidal: Invalid Json reply, track is missing one or more values."; qLog(Error) << "Tidal: Invalid Json reply, track is missing one or more values.";
qLog(Debug) << json_obj; qLog(Debug) << json_obj;
return nullptr; return song;
} }
QJsonValue json_value_artist = json_obj["artist"]; QJsonValue json_value_artist = json_obj["artist"];
@@ -673,7 +690,9 @@ Song *TidalService::ParseSong(TidalSearchContext *search_ctx, const int album_id
QJsonValue json_duration = json_obj["duration"]; QJsonValue json_duration = json_obj["duration"];
QJsonArray json_artists = json_obj["artists"].toArray(); QJsonArray json_artists = json_obj["artists"].toArray();
int id = json_obj["id"].toInt(); int song_id = json_obj["id"].toInt();
if (requests_song_.contains(song_id)) return requests_song_.value(song_id);
QString title = json_obj["title"].toString(); QString title = json_obj["title"].toString();
QString url = json_obj["url"].toString(); QString url = json_obj["url"].toString();
int track = json_obj["trackNumber"].toInt(); int track = json_obj["trackNumber"].toInt();
@@ -684,38 +703,45 @@ Song *TidalService::ParseSong(TidalSearchContext *search_ctx, const int album_id
if (!json_value_artist.isObject()) { if (!json_value_artist.isObject()) {
qLog(Error) << "Tidal: Invalid Json reply, track artist is not a object."; qLog(Error) << "Tidal: Invalid Json reply, track artist is not a object.";
qLog(Debug) << json_value_artist; qLog(Debug) << json_value_artist;
return nullptr; return song;
} }
QJsonObject json_artist = json_value_artist.toObject(); QJsonObject json_artist = json_value_artist.toObject();
if (!json_artist.contains("name")) { if (!json_artist.contains("name")) {
qLog(Error) << "Tidal: Invalid Json reply, track artist is missing name."; qLog(Error) << "Tidal: Invalid Json reply, track artist is missing name.";
qLog(Debug) << json_artist; qLog(Debug) << json_artist;
return nullptr; return song;
} }
QString artist = json_artist["name"].toString(); QString artist = json_artist["name"].toString();
if (!json_value_album.isObject()) { if (!json_value_album.isObject()) {
qLog(Error) << "Tidal: Invalid Json reply, track album is not a object."; qLog(Error) << "Tidal: Invalid Json reply, track album is not a object.";
qLog(Debug) << json_value_album; qLog(Debug) << json_value_album;
return nullptr; return song;
} }
QJsonObject json_album = json_value_album.toObject(); QJsonObject json_album = json_value_album.toObject();
if (!json_album.contains("title") || !json_album.contains("cover")) { if (!json_album.contains("id") || !json_album.contains("title") || !json_album.contains("cover")) {
qLog(Error) << "Tidal: Invalid Json reply, track album is missing title or cover."; qLog(Error) << "Tidal: Invalid Json reply, track album is missing id, title or cover.";
qLog(Debug) << json_album; qLog(Debug) << json_album;
return nullptr; return song;
}
int album_id = json_album["id"].toInt();
if (album_id_requested != 0 && album_id_requested != album_id) {
qLog(Error) << "Tidal: Invalid Json reply, track album is wrong.";
qLog(Debug) << json_album;
return song;
} }
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 (!allow_streaming || !stream_ready) { if (!allow_streaming || !stream_ready) {
qLog(Error) << "Tidal: Skipping song" << artist << album << title << "because allowStreaming is false OR streamReady is false."; qLog(Error) << "Tidal: Skipping song" << artist << album << title << "because allowStreaming is false OR streamReady is false.";
qLog(Debug) << json_obj; //qLog(Debug) << json_obj;
return nullptr; return song;
} }
//qLog(Debug) << "id" << id << "track" << track << "disc" << disc << "title" << title << "album" << album << "artist" << artist << cover << allow_streaming << url; //qLog(Debug) << "id" << id << "track" << track << "disc" << disc << "title" << title << "album" << album << "artist" << artist << cover << allow_streaming << url;
song.set_id(song_id);
song.set_album_id(album_id); song.set_album_id(album_id);
song.set_artist(artist); song.set_artist(artist);
song.set_album(album); song.set_album(album);
@@ -732,30 +758,19 @@ Song *TidalService::ParseSong(TidalSearchContext *search_ctx, const int album_id
song.set_length_nanosec(duration); song.set_length_nanosec(duration);
} }
// Check and see if there is more than 1 artist on the song.
//int i = 0;
//for (const QJsonValue &a : json_artists) {
//i++;
//qLog(Debug) << a << i;
//}
//if (i > 1) song.set_compilation_detected(true);
cover = cover.replace("-", "/"); cover = cover.replace("-", "/");
//QUrl cover_url (QString("%1/images/%2/750x750.jpg").arg(kResourcesUrl).arg(cover)); QUrl cover_url (QString("%1/images/%2/%3.jpg").arg(kResourcesUrl).arg(cover).arg(coversize_));
QUrl cover_url (QString("%1/images/%2/320x320.jpg").arg(kResourcesUrl).arg(cover));
song.set_art_automatic(cover_url.toEncoded()); song.set_art_automatic(cover_url.toEncoded());
if (search_ctx->requests_song_.contains(id)) return search_ctx->requests_song_.value(id); song.set_valid(true);
Song *song_new = new Song(song);
search_ctx->requests_song_.insert(id, song_new);
search_ctx->song_requests++;
GetStreamURL(search_ctx, album_id, id);
return song_new; GetStreamURL(album_id, song_id);
return song;
} }
void TidalService::GetStreamURL(TidalSearchContext *search_ctx, const int album_id, const int song_id) { void TidalService::GetStreamURL(const int album_id, const int song_id) {
QList<Param> parameters; QList<Param> parameters;
parameters << Param("token", session_id_) parameters << Param("token", session_id_)
@@ -763,7 +778,7 @@ void TidalService::GetStreamURL(TidalSearchContext *search_ctx, const int album_
QNetworkReply *reply = CreateRequest(QString("tracks/%1/streamUrl").arg(song_id), parameters); QNetworkReply *reply = CreateRequest(QString("tracks/%1/streamUrl").arg(song_id), parameters);
NewClosure(reply, SIGNAL(finished()), this, SLOT(GetStreamURLFinished(QNetworkReply*, int, int)), reply, search_ctx->id, song_id); NewClosure(reply, SIGNAL(finished()), this, SLOT(GetStreamURLFinished(QNetworkReply*, int, int)), reply, search_id_, song_id);
} }
@@ -771,63 +786,63 @@ void TidalService::GetStreamURLFinished(QNetworkReply *reply, const int search_i
reply->deleteLater(); reply->deleteLater();
if (!requests_search_.contains(search_id)) return; if (search_id != search_id_) return;
TidalSearchContext *search_ctx = requests_search_.value(search_id);
if (!search_ctx->requests_song_.contains(song_id)) { if (!requests_song_.contains(song_id)) {
CheckFinish(search_ctx); CheckFinish();
return; return;
} }
Song *song = search_ctx->requests_song_.value(song_id); Song song = requests_song_.value(song_id);
songs_received_++;
search_ctx->song_requests--; if (albums_requested_ <= albums_received_) {
emit UpdateProgress(songs_received_);
}
QJsonObject json_obj = ExtractJsonObj(search_ctx, reply); QJsonObject json_obj = ExtractJsonObj(reply);
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
delete search_ctx->requests_song_.take(song_id); requests_song_.remove(song_id);
CheckFinish(search_ctx); CheckFinish();
return; return;
} }
if (!json_obj.contains("url") || !json_obj.contains("codec")) { if (!json_obj.contains("url") || !json_obj.contains("codec")) {
qLog(Error) << "Tidal: Invalid Json reply, stream missing url or codec."; qLog(Error) << "Tidal: Invalid Json reply, stream missing url or codec.";
qLog(Debug) << json_obj; qLog(Debug) << json_obj;
delete search_ctx->requests_song_.take(song_id); requests_song_.remove(song_id);
CheckFinish(search_ctx); CheckFinish();
return; return;
} }
song->set_url(QUrl(json_obj["url"].toString())); song.set_url(QUrl(json_obj["url"].toString()));
song->set_valid(true); song.set_valid(true);
QString codec = json_obj["codec"].toString(); QString codec = json_obj["codec"].toString();
if (codec == "AAC") song->set_filetype(Song::Type_MP4); if (codec == "AAC") song.set_filetype(Song::Type_MP4);
else qLog(Debug) << "Tidal codec" << codec; else qLog(Debug) << "Tidal codec" << codec;
//qLog(Debug) << song->artist() << song->album() << song->title() << song->url() << song->filetype(); //qLog(Debug) << song.artist() << song.album() << song.title() << song.url() << song.filetype();
search_ctx->songs << *song; songs_ << song;
delete search_ctx->requests_song_.take(song_id); requests_song_.remove(song_id);
CheckFinish(search_ctx); CheckFinish();
} }
void TidalService::CheckFinish(TidalSearchContext *search_ctx) { void TidalService::CheckFinish() {
if (!search_ctx->login_sent && search_ctx->album_requests <= 0 && search_ctx->song_requests <= 0) { if (!login_sent_ && albums_requested_ <= albums_received_ && songs_requested_ <= songs_received_) {
if (search_ctx->songs.isEmpty()) emit SearchError(search_ctx->id, search_ctx->error); if (songs_.isEmpty()) emit SearchError(search_id_, search_error_);
else emit SearchResults(search_ctx->id, search_ctx->songs); else emit SearchResults(search_id_, songs_);
delete requests_search_.take(search_ctx->id); ClearSearch();
} }
} }
void TidalService::Error(TidalSearchContext *search_ctx, QString error, QString debug) { void TidalService::Error(QString error, QString debug) {
qLog(Error) << "Tidal:" << error; qLog(Error) << "Tidal:" << error;
if (!debug.isEmpty()) qLog(Debug) << debug; if (!debug.isEmpty()) qLog(Debug) << debug;
if (search_ctx) { search_error_ = error;
search_ctx->error = error; CheckFinish();
CheckFinish(search_ctx);
}
} }

76
src/tidal/tidalservice.h
View File

@@ -40,20 +40,6 @@
class NetworkAccessManager; class NetworkAccessManager;
struct TidalSearchContext {
int id;
QString text;
QHash<int, int> requests_album_;
QHash<int, Song *> requests_song_;
int album_requests;
int song_requests;
SongList songs;
QString error;
bool login_sent;
int login_attempts;
};
Q_DECLARE_METATYPE(TidalSearchContext);
class TidalService : public InternetService { class TidalService : public InternetService {
Q_OBJECT Q_OBJECT
@@ -65,9 +51,10 @@ class TidalService : public InternetService {
void ReloadSettings(); void ReloadSettings();
void Login(const QString &username, const QString &password); void Login(const QString &username, const QString &password, int search_id = 0);
void Logout(); void Logout();
int Search(const QString &query, TidalSettingsPage::SearchBy searchby); int Search(const QString &query, TidalSettingsPage::SearchBy searchby);
void CancelSearch();
const bool login_sent() { return login_sent_; } const bool login_sent() { return login_sent_; }
const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); } const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); }
@@ -77,31 +64,32 @@ class TidalService : public InternetService {
void LoginFailure(QString failure_reason); void LoginFailure(QString failure_reason);
void SearchResults(int id, SongList songs); void SearchResults(int id, SongList songs);
void SearchError(int id, QString message); void SearchError(int id, QString message);
void UpdateStatus(QString text);
void ProgressSetMaximum(int max);
void UpdateProgress(int max);
public slots: public slots:
void ShowConfig(); void ShowConfig();
private slots: private slots:
void HandleAuthReply(QNetworkReply *reply, int id); void HandleAuthReply(QNetworkReply *reply, int search_id);
void StartSearch(); void StartSearch();
void SearchFinished(QNetworkReply *reply, int id); void SearchFinished(QNetworkReply *reply, int search_id);
void GetAlbumFinished(QNetworkReply *reply, int search_id, int album_id); void GetAlbumFinished(QNetworkReply *reply, int search_id, int album_id);
void GetStreamURLFinished(QNetworkReply *reply, const int search_id, const int song_id); void GetStreamURLFinished(QNetworkReply *reply, const int search_id, const int song_id);
private: private:
void Login(TidalSearchContext *search_ctx, const QString &username, const QString &password); void ClearSearch();
void LoadSessionID(); void LoadSessionID();
QNetworkReply *CreateRequest(const QString &ressource_name, const QList<QPair<QString, QString>> &params); QNetworkReply *CreateRequest(const QString &ressource_name, const QList<QPair<QString, QString>> &params);
QJsonObject ExtractJsonObj(TidalSearchContext *search_ctx, QNetworkReply *reply); QJsonObject ExtractJsonObj(QNetworkReply *reply);
QJsonArray ExtractItems(TidalSearchContext *search_ctx, QNetworkReply *reply); QJsonArray ExtractItems(QNetworkReply *reply);
TidalSearchContext *CreateSearch(const int search_id, const QString text); void SendSearch();
void SendSearch(TidalSearchContext *search_ctx); void GetAlbum(const int album_id);
void GetAlbum(TidalSearchContext *search_ctx, const int album_id); Song ParseSong(const int album_id_requested, const QJsonValue &value);
Song *ParseSong(TidalSearchContext *search_ctx, const int album_id, const QJsonValue &value); void GetStreamURL(const int album_id, const int song_id);
Song ExtractSong(TidalSearchContext *search_ctx, const QJsonValue &value); void CheckFinish();
void GetStreamURL(TidalSearchContext *search_ctx, const int album_id, const int song_id); void Error(QString error, QString debug = "");
void CheckFinish(TidalSearchContext *search_ctx);
void Error(TidalSearchContext *search_ctx, QString error, QString debug = "");
static const char *kApiUrl; static const char *kApiUrl;
static const char *kAuthUrl; static const char *kAuthUrl;
@@ -109,25 +97,37 @@ class TidalService : public InternetService {
static const char *kApiToken; static const char *kApiToken;
NetworkAccessManager *network_; NetworkAccessManager *network_;
QTimer *search_delay_; QTimer *timer_searchdelay_;
int pending_search_id_;
int next_pending_search_id_;
int search_requests_;
bool login_sent_;
static const int kSearchAlbumsLimit;
static const int kSearchTracksLimit;
static const int kSearchDelayMsec;
QString username_; QString username_;
QString password_; QString password_;
QString quality_; QString quality_;
int searchdelay_;
int albumssearchlimit_;
int songssearchlimit_;
bool fetchalbums_;
QString coversize_;
QString session_id_; QString session_id_;
quint64 user_id_; quint64 user_id_;
QString country_code_; QString country_code_;
QString pending_search_; int pending_search_id_;
int next_pending_search_id_;
QString pending_search_text_;
TidalSettingsPage::SearchBy pending_searchby_; TidalSettingsPage::SearchBy pending_searchby_;
QHash<int, TidalSearchContext*> requests_search_;
int search_id_;
QString search_text_;
QHash<int, int> requests_album_;
QHash<int, Song> requests_song_;
int albums_requested_;
int albums_received_;
int songs_requested_;
int songs_received_;
SongList songs_;
QString search_error_;
bool login_sent_;
int login_attempts_;
}; };