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

Refactoring

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-22 18:12:33 +02:00
parent dfcf715291
commit 8da2b9cd94
623 changed files with 9071 additions and 5126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/qobuz/qobuzservice.cpp
View File

@@ -38,14 +38,13 @@
#include <QSettings>
#include <QSslError>
#include "core/shared_ptr.h"
#include "core/application.h"
#include "core/player.h"
#include "includes/shared_ptr.h"
#include "core/logging.h"
#include "core/networkaccessmanager.h"
#include "core/database.h"
#include "core/song.h"
#include "core/settings.h"
#include "core/urlhandlers.h"
#include "utilities/macaddrutils.h"
#include "streaming/streamingsearchview.h"
#include "collection/collectionbackend.h"
@@ -56,8 +55,7 @@
#include "qobuzrequest.h"
#include "qobuzfavoriterequest.h"
#include "qobuzstreamurlrequest.h"
#include "settings/settingsdialog.h"
#include "settings/qobuzsettingspage.h"
#include "constants/qobuzsettings.h"
using namespace Qt::Literals::StringLiterals;
using std::make_shared;
@@ -78,11 +76,15 @@ constexpr char kSongsTable[] = "qobuz_songs";
} // namespace
QobuzService::QobuzService(Application *app, QObject *parent)
: StreamingService(Song::Source::Qobuz, u"Qobuz"_s, u"qobuz"_s, QLatin1String(QobuzSettingsPage::kSettingsGroup), SettingsDialog::Page::Qobuz, app, parent),
app_(app),
network_(app->network()),
url_handler_(new QobuzUrlHandler(app, this)),
QobuzService::QobuzService(const SharedPtr<TaskManager> task_manager,
const SharedPtr<Database> database,
const SharedPtr<NetworkAccessManager> network,
const SharedPtr<UrlHandlers> url_handlers,
const SharedPtr<AlbumCoverLoader> albumcover_loader,
QObject *parent)
: StreamingService(Song::Source::Qobuz, u"Qobuz"_s, u"qobuz"_s, QLatin1String(QobuzSettings::kSettingsGroup), parent),
network_(network),
url_handler_(new QobuzUrlHandler(task_manager, this)),
artists_collection_backend_(nullptr),
albums_collection_backend_(nullptr),
songs_collection_backend_(nullptr),
@@ -108,26 +110,26 @@ QobuzService::QobuzService(Application *app, QObject *parent)
login_attempts_(0),
next_stream_url_request_id_(0) {
app->player()->RegisterUrlHandler(url_handler_);
url_handlers->Register(url_handler_);
// Backends
artists_collection_backend_ = make_shared<CollectionBackend>();
artists_collection_backend_->moveToThread(app_->database()->thread());
artists_collection_backend_->Init(app_->database(), app->task_manager(), Song::Source::Qobuz, QLatin1String(kArtistsSongsTable));
artists_collection_backend_->moveToThread(database->thread());
artists_collection_backend_->Init(database, task_manager, Song::Source::Qobuz, QLatin1String(kArtistsSongsTable));
albums_collection_backend_ = make_shared<CollectionBackend>();
albums_collection_backend_->moveToThread(app_->database()->thread());
albums_collection_backend_->Init(app_->database(), app->task_manager(), Song::Source::Qobuz, QLatin1String(kAlbumsSongsTable));
albums_collection_backend_->moveToThread(database->thread());
albums_collection_backend_->Init(database, task_manager, Song::Source::Qobuz, QLatin1String(kAlbumsSongsTable));
songs_collection_backend_ = make_shared<CollectionBackend>();
songs_collection_backend_->moveToThread(app_->database()->thread());
songs_collection_backend_->Init(app_->database(), app->task_manager(), Song::Source::Qobuz, QLatin1String(kSongsTable));
songs_collection_backend_->moveToThread(database->thread());
songs_collection_backend_->Init(database, task_manager, Song::Source::Qobuz, QLatin1String(kSongsTable));
// Models
artists_collection_model_ = new CollectionModel(artists_collection_backend_, app_, this);
albums_collection_model_ = new CollectionModel(albums_collection_backend_, app_, this);
songs_collection_model_ = new CollectionModel(songs_collection_backend_, app_, this);
artists_collection_model_ = new CollectionModel(artists_collection_backend_, albumcover_loader, this);
albums_collection_model_ = new CollectionModel(albums_collection_backend_, albumcover_loader, this);
songs_collection_model_ = new CollectionModel(songs_collection_backend_, albumcover_loader, this);
// Search
@@ -205,35 +207,31 @@ void QobuzService::ExitReceived() {
}
void QobuzService::ShowConfig() {
app_->OpenSettingsDialogAtPage(SettingsDialog::Page::Qobuz);
}
void QobuzService::ReloadSettings() {
Settings s;
s.beginGroup(QobuzSettingsPage::kSettingsGroup);
s.beginGroup(QobuzSettings::kSettingsGroup);
app_id_ = s.value("app_id").toString();
app_secret_ = s.value("app_secret").toString();
app_id_ = s.value(QobuzSettings::kAppId).toString();
app_secret_ = s.value(QobuzSettings::kAppSecret).toString();
const bool base64_secret = s.value("base64secret", false).toBool();;
const bool base64_secret = s.value(QobuzSettings::kBase64Secret, false).toBool();;
username_ = s.value("username").toString();
QByteArray password = s.value("password").toByteArray();
username_ = s.value(QobuzSettings::kUsername).toString();
QByteArray password = s.value(QobuzSettings::kPassword).toByteArray();
if (password.isEmpty()) password_.clear();
else password_ = QString::fromUtf8(QByteArray::fromBase64(password));
format_ = s.value("format", 27).toInt();
search_delay_ = s.value("searchdelay", 1500).toInt();
artistssearchlimit_ = s.value("artistssearchlimit", 4).toInt();
albumssearchlimit_ = s.value("albumssearchlimit", 10).toInt();
songssearchlimit_ = s.value("songssearchlimit", 10).toInt();
download_album_covers_ = s.value("downloadalbumcovers", true).toBool();
format_ = s.value(QobuzSettings::kFormat, 27).toInt();
search_delay_ = s.value(QobuzSettings::kSearchDelay, 1500).toInt();
artistssearchlimit_ = s.value(QobuzSettings::kArtistsSearchLimit, 4).toInt();
albumssearchlimit_ = s.value(QobuzSettings::kAlbumsSearchLimit, 10).toInt();
songssearchlimit_ = s.value(QobuzSettings::kSongsSearchLimit, 10).toInt();
download_album_covers_ = s.value(QobuzSettings::kDownloadAlbumCovers, true).toBool();
user_id_ = s.value("user_id").toInt();
device_id_ = s.value("device_id").toString();
user_auth_token_ = s.value("user_auth_token").toString();
user_id_ = s.value(QobuzSettings::kUserId).toInt();
device_id_ = s.value(QobuzSettings::kDeviceId).toString();
user_auth_token_ = s.value(QobuzSettings::kUserAuthToken).toString();
s.endGroup();
@@ -434,11 +432,11 @@ void QobuzService::HandleAuthReply(QNetworkReply *reply) {
credential_id_ = obj_credential["id"_L1].toInt();
Settings s;
s.beginGroup(QobuzSettingsPage::kSettingsGroup);
s.setValue("user_auth_token", user_auth_token_);
s.setValue("user_id", user_id_);
s.setValue("credential_id", credential_id_);
s.setValue("device_id", device_id_);
s.beginGroup(QobuzSettings::kSettingsGroup);
s.setValue(QobuzSettings::kUserAuthToken, user_auth_token_);
s.setValue(QobuzSettings::kUserId, user_id_);
s.setValue(QobuzSettings::kCredentialsId, credential_id_);
s.setValue(QobuzSettings::kDeviceId, device_id_);
s.endGroup();
qLog(Debug) << "Qobuz: Login successful" << "user id" << user_id_ << "device id" << device_id_;
@@ -459,7 +457,7 @@ void QobuzService::Logout() {
credential_id_ = -1;
Settings s;
s.beginGroup(QobuzSettingsPage::kSettingsGroup);
s.beginGroup(QobuzSettings::kSettingsGroup);
s.remove("user_id");
s.remove("credential_id");
s.remove("device_id");
@@ -520,7 +518,7 @@ void QobuzService::GetArtists() {
}
ResetArtistsRequest();
artists_request_.reset(new QobuzRequest(this, url_handler_, app_, network_, QobuzBaseRequest::Type::FavouriteArtists), [](QobuzRequest *request) { request->deleteLater(); });
artists_request_.reset(new QobuzRequest(this, url_handler_, network_, QobuzBaseRequest::Type::FavouriteArtists), [](QobuzRequest *request) { request->deleteLater(); });
QObject::connect(&*artists_request_, &QobuzRequest::Results, this, &QobuzService::ArtistsResultsReceived);
QObject::connect(&*artists_request_, &QobuzRequest::UpdateStatus, this, &QobuzService::ArtistsUpdateStatusReceived);
QObject::connect(&*artists_request_, &QobuzRequest::UpdateProgress, this, &QobuzService::ArtistsUpdateProgressReceived);
@@ -570,7 +568,7 @@ void QobuzService::GetAlbums() {
}
ResetAlbumsRequest();
albums_request_.reset(new QobuzRequest(this, url_handler_, app_, network_, QobuzBaseRequest::Type::FavouriteAlbums), [](QobuzRequest *request) { request->deleteLater(); });
albums_request_.reset(new QobuzRequest(this, url_handler_, network_, QobuzBaseRequest::Type::FavouriteAlbums), [](QobuzRequest *request) { request->deleteLater(); });
QObject::connect(&*albums_request_, &QobuzRequest::Results, this, &QobuzService::AlbumsResultsReceived);
QObject::connect(&*albums_request_, &QobuzRequest::UpdateStatus, this, &QobuzService::AlbumsUpdateStatusReceived);
QObject::connect(&*albums_request_, &QobuzRequest::UpdateProgress, this, &QobuzService::AlbumsUpdateProgressReceived);
@@ -620,7 +618,7 @@ void QobuzService::GetSongs() {
}
ResetSongsRequest();
songs_request_.reset(new QobuzRequest(this, url_handler_, app_, network_, QobuzBaseRequest::Type::FavouriteSongs), [](QobuzRequest *request) { request->deleteLater(); });
songs_request_.reset(new QobuzRequest(this, url_handler_, network_, QobuzBaseRequest::Type::FavouriteSongs), [](QobuzRequest *request) { request->deleteLater(); });
QObject::connect(&*songs_request_, &QobuzRequest::Results, this, &QobuzService::SongsResultsReceived);
QObject::connect(&*songs_request_, &QobuzRequest::UpdateStatus, this, &QobuzService::SongsUpdateStatusReceived);
QObject::connect(&*songs_request_, &QobuzRequest::UpdateProgress, this, &QobuzService::SongsUpdateProgressReceived);
@@ -699,7 +697,7 @@ void QobuzService::SendSearch() {
break;
}
search_request_.reset(new QobuzRequest(this, url_handler_, app_, network_, query_type), [](QobuzRequest *request) { request->deleteLater(); } );
search_request_.reset(new QobuzRequest(this, url_handler_, network_, query_type), [](QobuzRequest *request) { request->deleteLater(); } );
QObject::connect(&*search_request_, &QobuzRequest::Results, this, &QobuzService::SearchResultsReceived);
QObject::connect(&*search_request_, &QobuzRequest::UpdateStatus, this, &QobuzService::SearchUpdateStatus);