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

Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2021-07-11 07:40:57 +02:00
parent 87b9a8c4c8
commit a6742d401c
149 changed files with 595 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/covermanager/albumcoverchoicecontroller.cpp
View File

@@ -78,31 +78,30 @@ const char *AlbumCoverChoiceController::kAllFilesFilter = QT_TR_NOOP("All files
QSet<QString> *AlbumCoverChoiceController::sImageExtensions = nullptr;
AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent) :
QWidget(parent),
app_(nullptr),
cover_searcher_(nullptr),
cover_fetcher_(nullptr),
save_file_dialog_(nullptr),
cover_from_url_dialog_(nullptr),
cover_from_file_(nullptr),
cover_to_file_(nullptr),
cover_from_url_(nullptr),
search_for_cover_(nullptr),
separator1_(nullptr),
unset_cover_(nullptr),
delete_cover_(nullptr),
clear_cover_(nullptr),
separator2_(nullptr),
show_cover_(nullptr),
search_cover_auto_(nullptr),
save_cover_type_(CollectionSettingsPage::SaveCoverType_Cache),
save_cover_filename_(CollectionSettingsPage::SaveCoverFilename_Pattern),
cover_overwrite_(false),
cover_lowercase_(true),
cover_replace_spaces_(true),
save_embedded_cover_override_(false)
{
AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent)
: QWidget(parent),
app_(nullptr),
cover_searcher_(nullptr),
cover_fetcher_(nullptr),
save_file_dialog_(nullptr),
cover_from_url_dialog_(nullptr),
cover_from_file_(nullptr),
cover_to_file_(nullptr),
cover_from_url_(nullptr),
search_for_cover_(nullptr),
separator1_(nullptr),
unset_cover_(nullptr),
delete_cover_(nullptr),
clear_cover_(nullptr),
separator2_(nullptr),
show_cover_(nullptr),
search_cover_auto_(nullptr),
save_cover_type_(CollectionSettingsPage::SaveCoverType_Cache),
save_cover_filename_(CollectionSettingsPage::SaveCoverFilename_Pattern),
cover_overwrite_(false),
cover_lowercase_(true),
cover_replace_spaces_(true),
save_embedded_cover_override_(false) {
cover_from_file_ = new QAction(IconLoader::Load("document-open"), tr("Load cover from disk..."), this);
cover_to_file_ = new QAction(IconLoader::Load("document-save"), tr("Save cover to disk..."), this);

3
src/covermanager/albumcoverloader.cpp
View File

@@ -68,8 +68,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject *parent)
cover_overwrite_(false),
cover_lowercase_(true),
cover_replace_spaces_(true),
original_thread_(nullptr)
{
original_thread_(nullptr) {
original_thread_ = thread();
ReloadSettings();

8
src/covermanager/coverexportrunnable.cpp
View File

@@ -33,10 +33,10 @@
#include "albumcoverexport.h"
#include "coverexportrunnable.h"
CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song, QObject *parent) :
QObject(parent),
dialog_result_(dialog_result),
song_(song) {}
CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song, QObject *parent)
: QObject(parent),
dialog_result_(dialog_result),
song_(song) {}
void CoverExportRunnable::run() {

3
src/covermanager/currentalbumcoverloader.cpp
View File

@@ -43,8 +43,7 @@ CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *pare
: QObject(parent),
app_(app),
temp_file_pattern_(QDir::tempPath() + "/strawberry-cover-XXXXXX.jpg"),
id_(0)
{
id_(0) {
options_.get_image_data_ = true;
options_.get_image_ = true;

6
src/covermanager/deezercoverprovider.cpp
View File

@@ -53,7 +53,9 @@
const char *DeezerCoverProvider::kApiUrl = "https://api.deezer.com";
const int DeezerCoverProvider::kLimit = 10;
DeezerCoverProvider::DeezerCoverProvider(Application *app, QObject *parent): JsonCoverProvider("Deezer", true, false, 2.0, true, true, app, parent), network_(new NetworkAccessManager(this)) {}
DeezerCoverProvider::DeezerCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Deezer", true, false, 2.0, true, true, app, parent),
network_(new NetworkAccessManager(this)) {}
DeezerCoverProvider::~DeezerCoverProvider() {
@@ -160,7 +162,7 @@ QByteArray DeezerCoverProvider::GetReplyData(QNetworkReply *reply) {
}
return data;
}
QJsonValue DeezerCoverProvider::ExtractData(const QByteArray &data) {

7
src/covermanager/discogscoverprovider.cpp
View File

@@ -61,9 +61,10 @@ const char *DiscogsCoverProvider::kAccessKeyB64 = "dGh6ZnljUGJlZ1NEeXBuSFFxSVk="
const char *DiscogsCoverProvider::kSecretKeyB64 = "ZkFIcmlaSER4aHhRSlF2U3d0bm5ZVmdxeXFLWUl0UXI=";
const int DiscogsCoverProvider::kRequestsDelay = 1000;
DiscogsCoverProvider::DiscogsCoverProvider(Application *app, QObject *parent) :
JsonCoverProvider("Discogs", false, false, 0.0, false, false, app, parent),
network_(new NetworkAccessManager(this)), timer_flush_requests_(new QTimer(this)) {
DiscogsCoverProvider::DiscogsCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Discogs", false, false, 0.0, false, false, app, parent),
network_(new NetworkAccessManager(this)),
timer_flush_requests_(new QTimer(this)) {
timer_flush_requests_->setInterval(kRequestsDelay);
timer_flush_requests_->setSingleShot(false);

3
src/covermanager/jsoncoverprovider.cpp
View File

@@ -31,7 +31,8 @@
#include "coverprovider.h"
#include "jsoncoverprovider.h"
JsonCoverProvider::JsonCoverProvider(const QString &name, const bool enabled, const bool authentication_required, const float quality, const bool batch, const bool allow_missing_album, Application *app, QObject *parent) : CoverProvider(name, enabled, authentication_required, quality, batch, allow_missing_album, app, parent) {}
JsonCoverProvider::JsonCoverProvider(const QString &name, const bool enabled, const bool authentication_required, const float quality, const bool batch, const bool allow_missing_album, Application *app, QObject *parent)
: CoverProvider(name, enabled, authentication_required, quality, batch, allow_missing_album, app, parent) {}
QJsonObject JsonCoverProvider::ExtractJsonObj(const QByteArray &data) {

4
src/covermanager/lastfmcoverprovider.cpp
View File

@@ -53,7 +53,9 @@ const char *LastFmCoverProvider::kUrl = "https://ws.audioscrobbler.com/2.0/";
const char *LastFmCoverProvider::kApiKey = "211990b4c96782c05d1536e7219eb56e";
const char *LastFmCoverProvider::kSecret = "80fd738f49596e9709b1bf9319c444a8";
LastFmCoverProvider::LastFmCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Last.fm", true, false, 1.0, true, false, app, parent), network_(new NetworkAccessManager(this)) {}
LastFmCoverProvider::LastFmCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Last.fm", true, false, 1.0, true, false, app, parent),
network_(new NetworkAccessManager(this)) {}
LastFmCoverProvider::~LastFmCoverProvider() {

5
src/covermanager/musicbrainzcoverprovider.cpp
View File

@@ -51,7 +51,10 @@ const char *MusicbrainzCoverProvider::kAlbumCoverUrl = "https://coverartarchive.
const int MusicbrainzCoverProvider::kLimit = 8;
const int MusicbrainzCoverProvider::kRequestsDelay = 1000;
MusicbrainzCoverProvider::MusicbrainzCoverProvider(Application *app, QObject *parent): JsonCoverProvider("MusicBrainz", true, false, 1.5, true, false, app, parent), network_(new NetworkAccessManager(this)), timer_flush_requests_(new QTimer(this)) {
MusicbrainzCoverProvider::MusicbrainzCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("MusicBrainz", true, false, 1.5, true, false, app, parent),
network_(new NetworkAccessManager(this)),
timer_flush_requests_(new QTimer(this)) {
timer_flush_requests_->setInterval(kRequestsDelay);
timer_flush_requests_->setSingleShot(false);

4
src/covermanager/musixmatchcoverprovider.cpp
View File

@@ -40,7 +40,9 @@
#include "jsoncoverprovider.h"
#include "musixmatchcoverprovider.h"
MusixmatchCoverProvider::MusixmatchCoverProvider(Application *app, QObject *parent): JsonCoverProvider("Musixmatch", true, false, 1.0, true, false, app, parent), network_(new NetworkAccessManager(this)) {}
MusixmatchCoverProvider::MusixmatchCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Musixmatch", true, false, 1.0, true, false, app, parent),
network_(new NetworkAccessManager(this)) {}
MusixmatchCoverProvider::~MusixmatchCoverProvider() {

7
src/covermanager/qobuzcoverprovider.cpp
View File

@@ -52,9 +52,10 @@
const int QobuzCoverProvider::kLimit = 10;
QobuzCoverProvider::QobuzCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Qobuz", true, true, 2.0, true, true, app, parent),
service_(app->internet_services()->Service<QobuzService>()),
network_(new NetworkAccessManager(this)) {}
QobuzCoverProvider::QobuzCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Qobuz", true, true, 2.0, true, true, app, parent),
service_(app->internet_services()->Service<QobuzService>()),
network_(new NetworkAccessManager(this)) {}
QobuzCoverProvider::~QobuzCoverProvider() {

10
src/covermanager/spotifycoverprovider.cpp
View File

@@ -63,7 +63,12 @@ const char *SpotifyCoverProvider::kClientSecretB64 = "N2ZlMDMxODk1NTBlNDE3ZGI1ZW
const char *SpotifyCoverProvider::kApiUrl = "https://api.spotify.com/v1";
const int SpotifyCoverProvider::kLimit = 10;
SpotifyCoverProvider::SpotifyCoverProvider(Application *app, QObject *parent) : JsonCoverProvider("Spotify", true, true, 2.5, true, true, app, parent), network_(new NetworkAccessManager(this)), server_(nullptr), expires_in_(0), login_time_(0) {
SpotifyCoverProvider::SpotifyCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Spotify", true, true, 2.5, true, true, app, parent),
network_(new NetworkAccessManager(this)),
server_(nullptr),
expires_in_(0),
login_time_(0) {
refresh_login_timer_.setSingleShot(true);
QObject::connect(&refresh_login_timer_, &QTimer::timeout, this, &SpotifyCoverProvider::RequestNewAccessToken);
@@ -128,10 +133,9 @@ void SpotifyCoverProvider::Authenticate() {
}
const ParamList params = ParamList() << Param("client_id", QByteArray::fromBase64(kClientIDB64))
<< Param("response_type", "code")
<< Param("response_type", "code")
<< Param("redirect_uri", redirect_url.toString())
<< Param("state", code_challenge_);
QUrlQuery url_query;
for (const Param &param : params) {

10
src/covermanager/tidalcoverprovider.cpp
View File

@@ -50,12 +50,10 @@
const int TidalCoverProvider::kLimit = 10;
TidalCoverProvider::TidalCoverProvider(Application *app, QObject *parent) :
JsonCoverProvider("Tidal", true, true, 2.5, true, true, app, parent),
service_(app->internet_services()->Service<TidalService>()),
network_(new NetworkAccessManager(this)) {
}
TidalCoverProvider::TidalCoverProvider(Application *app, QObject *parent)
: JsonCoverProvider("Tidal", true, true, 2.5, true, true, app, parent),
service_(app->internet_services()->Service<TidalService>()),
network_(new NetworkAccessManager(this)) {}
TidalCoverProvider::~TidalCoverProvider() {