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

4
src/qobuz/qobuzbaserequest.cpp
View File

@@ -37,15 +37,15 @@
#include <QJsonArray>
#include <QJsonValue>
#include "includes/shared_ptr.h"
#include "core/logging.h"
#include "core/shared_ptr.h"
#include "core/networkaccessmanager.h"
#include "qobuzservice.h"
#include "qobuzbaserequest.h"
using namespace Qt::Literals::StringLiterals;
QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, SharedPtr<NetworkAccessManager> network, QObject *parent)
QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, const SharedPtr<NetworkAccessManager> network, QObject *parent)
: QObject(parent),
service_(service),
network_(network) {}

6
src/qobuz/qobuzbaserequest.h
View File

@@ -34,7 +34,7 @@
#include <QJsonObject>
#include <QJsonValue>
#include "core/shared_ptr.h"
#include "includes/shared_ptr.h"
#include "core/song.h"
#include "qobuzservice.h"
@@ -45,7 +45,7 @@ class QobuzBaseRequest : public QObject {
Q_OBJECT
public:
explicit QobuzBaseRequest(QobuzService *service, SharedPtr<NetworkAccessManager> network, QObject *parent = nullptr);
explicit QobuzBaseRequest(QobuzService *service, const SharedPtr<NetworkAccessManager> network, QObject *parent = nullptr);
~QobuzBaseRequest();
enum class Type {
@@ -96,7 +96,7 @@ class QobuzBaseRequest : public QObject {
private:
QobuzService *service_;
SharedPtr<NetworkAccessManager> network_;
const SharedPtr<NetworkAccessManager> network_;
};
#endif // QOBUZBASEREQUEST_H

4
src/qobuz/qobuzfavoriterequest.cpp
View File

@@ -28,8 +28,8 @@
#include <QUrlQuery>
#include <QNetworkReply>
#include "includes/shared_ptr.h"
#include "core/logging.h"
#include "core/shared_ptr.h"
#include "core/networkaccessmanager.h"
#include "core/song.h"
#include "qobuzservice.h"
@@ -38,7 +38,7 @@
using namespace Qt::Literals::StringLiterals;
QobuzFavoriteRequest::QobuzFavoriteRequest(QobuzService *service, SharedPtr<NetworkAccessManager> network, QObject *parent)
QobuzFavoriteRequest::QobuzFavoriteRequest(QobuzService *service, const SharedPtr<NetworkAccessManager> network, QObject *parent)
: QobuzBaseRequest(service, network, parent),
service_(service),
network_(network) {}

4
src/qobuz/qobuzfavoriterequest.h
View File

@@ -28,7 +28,7 @@
#include <QString>
#include "qobuzbaserequest.h"
#include "core/shared_ptr.h"
#include "includes/shared_ptr.h"
#include "core/song.h"
class QNetworkReply;
@@ -81,7 +81,7 @@ class QobuzFavoriteRequest : public QobuzBaseRequest {
void RemoveFavoritesRequest(const FavoriteType type, const QStringList &ids_list, const SongList &songs);
QobuzService *service_;
SharedPtr<NetworkAccessManager> network_;
const SharedPtr<NetworkAccessManager> network_;
QList<QNetworkReply*> replies_;
};

10
src/qobuz/qobuzrequest.cpp
View File

@@ -36,12 +36,11 @@
#include <QJsonValue>
#include <QTimer>
#include "includes/shared_ptr.h"
#include "core/logging.h"
#include "core/shared_ptr.h"
#include "core/networkaccessmanager.h"
#include "core/song.h"
#include "core/application.h"
#include "utilities/timeconstants.h"
#include "core/networkaccessmanager.h"
#include "constants/timeconstants.h"
#include "utilities/imageutils.h"
#include "utilities/coverutils.h"
#include "qobuzservice.h"
@@ -61,11 +60,10 @@ constexpr int kMaxConcurrentAlbumCoverRequests = 1;
constexpr int kFlushRequestsDelay = 200;
} // namespace
QobuzRequest::QobuzRequest(QobuzService *service, QobuzUrlHandler *url_handler, Application *app, SharedPtr<NetworkAccessManager> network, const Type query_type, QObject *parent)
QobuzRequest::QobuzRequest(QobuzService *service, QobuzUrlHandler *url_handler, const SharedPtr<NetworkAccessManager> network, const Type query_type, QObject *parent)
: QobuzBaseRequest(service, network, parent),
service_(service),
url_handler_(url_handler),
app_(app),
network_(network),
timer_flush_requests_(new QTimer(this)),
query_type_(query_type),

8
src/qobuz/qobuzrequest.h
View File

@@ -37,13 +37,12 @@
#include <QUrl>
#include <QJsonObject>
#include "core/shared_ptr.h"
#include "includes/shared_ptr.h"
#include "core/song.h"
#include "qobuzbaserequest.h"
class QNetworkReply;
class QTimer;
class Application;
class NetworkAccessManager;
class QobuzService;
class QobuzUrlHandler;
@@ -53,7 +52,7 @@ class QobuzRequest : public QobuzBaseRequest {
public:
explicit QobuzRequest(QobuzService *service, QobuzUrlHandler *url_handler, Application *app, SharedPtr<NetworkAccessManager> network, const Type query_type, QObject *parent = nullptr);
explicit QobuzRequest(QobuzService *service, QobuzUrlHandler *url_handler, const SharedPtr<NetworkAccessManager> network, const Type query_type, QObject *parent = nullptr);
~QobuzRequest() override;
void ReloadSettings();
@@ -173,8 +172,7 @@ class QobuzRequest : public QobuzBaseRequest {
QobuzService *service_;
QobuzUrlHandler *url_handler_;
Application *app_;
SharedPtr<NetworkAccessManager> network_;
const SharedPtr<NetworkAccessManager> network_;
QTimer *timer_flush_requests_;
const Type query_type_;

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);

20
src/qobuz/qobuzservice.h
View File

@@ -37,15 +37,18 @@
#include <QUrl>
#include <QSslError>
#include "core/shared_ptr.h"
#include "includes/shared_ptr.h"
#include "core/song.h"
#include "streaming/streamingservice.h"
#include "streaming/streamingsearchview.h"
class QTimer;
class QNetworkReply;
class Application;
class TaskManager;
class Database;
class UrlHandlers;
class NetworkAccessManager;
class AlbumCoverLoader;
class QobuzUrlHandler;
class QobuzRequest;
class QobuzFavoriteRequest;
@@ -58,7 +61,13 @@ class QobuzService : public StreamingService {
Q_OBJECT
public:
explicit QobuzService(Application *app, QObject *parent = nullptr);
explicit 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 = nullptr);
~QobuzService();
static const Song::Source kSource;
@@ -74,7 +83,6 @@ class QobuzService : public StreamingService {
int max_login_attempts() const { return kLoginAttempts; }
Application *app() const { return app_; }
QString app_id() const { return app_id_; }
QString app_secret() const { return app_secret_; }
QString username() const { return username_; }
@@ -110,7 +118,6 @@ class QobuzService : public StreamingService {
CollectionFilter *songs_collection_filter_model() override { return songs_collection_model_->filter(); }
public Q_SLOTS:
void ShowConfig() override;
void TryLogin();
void SendLogin();
void SendLoginWithCredentials(const QString &app_id, const QString &username, const QString &password);
@@ -148,8 +155,7 @@ class QobuzService : public StreamingService {
void SendSearch();
void LoginError(const QString &error = QString(), const QVariant &debug = QVariant());
Application *app_;
SharedPtr<NetworkAccessManager> network_;
const SharedPtr<NetworkAccessManager> network_;
QobuzUrlHandler *url_handler_;
SharedPtr<CollectionBackend> artists_collection_backend_;

6
src/qobuz/qobuzstreamurlrequest.cpp
View File

@@ -34,18 +34,18 @@
#include <QCryptographicHash>
#include <QJsonObject>
#include "includes/shared_ptr.h"
#include "core/logging.h"
#include "core/shared_ptr.h"
#include "core/networkaccessmanager.h"
#include "core/song.h"
#include "utilities/timeconstants.h"
#include "constants/timeconstants.h"
#include "qobuzservice.h"
#include "qobuzbaserequest.h"
#include "qobuzstreamurlrequest.h"
using namespace Qt::Literals::StringLiterals;
QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, SharedPtr<NetworkAccessManager> network, const QUrl &media_url, const uint id, QObject *parent)
QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, const SharedPtr<NetworkAccessManager> network, const QUrl &media_url, const uint id, QObject *parent)
: QobuzBaseRequest(service, network, parent),
service_(service),
reply_(nullptr),

4
src/qobuz/qobuzstreamurlrequest.h
View File

@@ -29,7 +29,7 @@
#include <QStringList>
#include <QUrl>
#include "core/shared_ptr.h"
#include "includes/shared_ptr.h"
#include "core/song.h"
#include "qobuzbaserequest.h"
@@ -41,7 +41,7 @@ class QobuzStreamURLRequest : public QobuzBaseRequest {
Q_OBJECT
public:
explicit QobuzStreamURLRequest(QobuzService *service, SharedPtr<NetworkAccessManager> network, const QUrl &media_url, const uint id, QObject *parent = nullptr);
explicit QobuzStreamURLRequest(QobuzService *service, const SharedPtr<NetworkAccessManager> network, const QUrl &media_url, const uint id, QObject *parent = nullptr);
~QobuzStreamURLRequest();
void GetStreamURL();

9
src/qobuz/qobuzurlhandler.cpp
View File

@@ -23,15 +23,14 @@
#include <QString>
#include <QUrl>
#include "core/application.h"
#include "core/taskmanager.h"
#include "core/song.h"
#include "qobuz/qobuzservice.h"
#include "qobuzurlhandler.h"
QobuzUrlHandler::QobuzUrlHandler(Application *app, QobuzService *service)
QobuzUrlHandler::QobuzUrlHandler(const SharedPtr<TaskManager> task_manager, QobuzService *service)
: UrlHandler(service),
app_(app),
task_manager_(task_manager),
service_(service) {
QObject::connect(service, &QobuzService::StreamURLFailure, this, &QobuzUrlHandler::GetStreamURLFailure);
@@ -42,7 +41,7 @@ QobuzUrlHandler::QobuzUrlHandler(Application *app, QobuzService *service)
UrlHandler::LoadResult QobuzUrlHandler::StartLoading(const QUrl &url) {
Request req;
req.task_id = app_->task_manager()->StartTask(QStringLiteral("Loading %1 stream...").arg(url.scheme()));
req.task_id = task_manager_->StartTask(QStringLiteral("Loading %1 stream...").arg(url.scheme()));
QString error;
req.id = service_->GetStreamURL(url, error);
if (req.id == 0) {
@@ -80,5 +79,5 @@ void QobuzUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &media_url,
}
void QobuzUrlHandler::CancelTask(const int task_id) {
app_->task_manager()->SetTaskFinished(task_id);
task_manager_->SetTaskFinished(task_id);
}

6
src/qobuz/qobuzurlhandler.h
View File

@@ -30,13 +30,13 @@
#include "core/song.h"
#include "qobuz/qobuzservice.h"
class Application;
class TaskManager;
class QobuzUrlHandler : public UrlHandler {
Q_OBJECT
public:
explicit QobuzUrlHandler(Application *app, QobuzService *service);
explicit QobuzUrlHandler(const SharedPtr<TaskManager> task_manager, QobuzService *service);
QString scheme() const { return service_->url_scheme(); }
LoadResult StartLoading(const QUrl &url);
@@ -54,7 +54,7 @@ class QobuzUrlHandler : public UrlHandler {
uint id;
int task_id;
};
Application *app_;
const SharedPtr<TaskManager> task_manager_;
QobuzService *service_;
QMap<uint, Request> requests_;
};