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
2025-03-08 22:31:00 +01:00
parent 6f731fcf4a
commit f85d60f5cd
8 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/covermanager/albumcoverfetchersearch.cpp
View File

@@ -285,9 +285,9 @@ void AlbumCoverFetcherSearch::FetchMoreImages() {
qLog(Debug) << "Loading" << result.artist << result.album << result.image_url << "from" << result.provider << "with current score" << result.score();
QNetworkRequest req(result.image_url);
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *image_reply = network_->get(req);
QNetworkRequest network_request(result.image_url);
network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *image_reply = network_->get(network_request);
QObject::connect(image_reply, &QNetworkReply::finished, this, [this, image_reply]() { ProviderCoverFetchFinished(image_reply); });
pending_image_loads_[image_reply] = result;
image_load_timeout_->AddReply(image_reply);

14
src/covermanager/albumcoverloader.cpp
View File

@@ -397,9 +397,9 @@ AlbumCoverLoader::LoadImageResult AlbumCoverLoader::LoadRemoteUrlImage(TaskPtr t
qLog(Debug) << "Loading remote cover from URL" << cover_url;
QNetworkRequest request(cover_url);
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *reply = network_->get(request);
QNetworkRequest network_request(cover_url);
network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *reply = network_->get(network_request);
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, task, result_type, cover_url]() { LoadRemoteImageFinished(reply, task, result_type, cover_url); });
return LoadImageResult(result_type, LoadImageResult::Status::Async);
@@ -418,10 +418,10 @@ void AlbumCoverLoader::LoadRemoteImageFinished(QNetworkReply *reply, TaskPtr tas
}
const QUrl redirect_url = redirect.toUrl();
qLog(Debug) << "Loading remote cover from redirected URL" << redirect_url;
QNetworkRequest request = reply->request();
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
request.setUrl(redirect_url);
QNetworkReply *redirected_reply = network_->get(request);
QNetworkRequest network_request = reply->request();
network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
network_request.setUrl(redirect_url);
QNetworkReply *redirected_reply = network_->get(network_request);
QObject::connect(redirected_reply, &QNetworkReply::finished, this, [this, reply, task, result_type, redirect_url]() { LoadRemoteImageFinished(reply, task, result_type, redirect_url); });
return;
}

6
src/covermanager/coverfromurldialog.cpp
View File

@@ -73,10 +73,10 @@ void CoverFromURLDialog::accept() {
ui_->busy->show();
QNetworkRequest req(QUrl::fromUserInput(ui_->url->text()));
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkRequest network_request(QUrl::fromUserInput(ui_->url->text()));
network_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *reply = network_->get(req);
QNetworkReply *reply = network_->get(network_request);
QObject::connect(reply, &QNetworkReply::finished, this, &CoverFromURLDialog::LoadCoverFromURLFinished);
}

19
src/radios/radioparadiseservice.cpp
View File

@@ -35,7 +35,7 @@ using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kApiChannelsUrl[] = "https://api.radioparadise.com/api/list_streams";
}
} // namespace
RadioParadiseService::RadioParadiseService(const SharedPtr<TaskManager> task_manager, const SharedPtr<NetworkAccessManager> network, QObject *parent)
: RadioService(Song::Source::RadioParadise, u"Radio Paradise"_s, IconLoader::Load(u"radioparadise"_s), task_manager, network, parent) {}
@@ -60,9 +60,8 @@ void RadioParadiseService::GetChannels() {
Abort();
QUrl url(QString::fromLatin1(kApiChannelsUrl));
QNetworkRequest req(url);
QNetworkReply *reply = network_->get(req);
QNetworkRequest network_request(QUrl(QString::fromLatin1(kApiChannelsUrl)));
QNetworkReply *reply = network_->get(network_request);
replies_ << reply;
const int task_id = task_manager_->StartTask(tr("Getting %1 channels").arg(name_));
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, task_id]() { GetChannelsReply(reply, task_id); });
@@ -74,7 +73,7 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task
if (replies_.contains(reply)) replies_.removeAll(reply);
reply->deleteLater();
QJsonObject object = ExtractJsonObj(reply);
const QJsonObject object = ExtractJsonObj(reply);
if (object.isEmpty()) {
task_manager_->SetTaskFinished(task_id);
Q_EMIT NewChannels();
@@ -92,23 +91,23 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task
RadioChannelList channels;
for (const QJsonValue &value_channel : array_channels) {
if (!value_channel.isObject()) continue;
QJsonObject obj_channel = value_channel.toObject();
const QJsonObject obj_channel = value_channel.toObject();
if (!obj_channel.contains("chan_name"_L1) || !obj_channel.contains("streams"_L1)) {
continue;
}
QString name = obj_channel["chan_name"_L1].toString();
QJsonValue value_streams = obj_channel["streams"_L1];
const QString name = obj_channel["chan_name"_L1].toString();
const QJsonValue value_streams = obj_channel["streams"_L1];
if (!value_streams.isArray()) {
continue;
}
const QJsonArray array_streams = obj_channel["streams"_L1].toArray();
for (const QJsonValue &value_stream : array_streams) {
if (!value_stream.isObject()) continue;
QJsonObject obj_stream = value_stream.toObject();
const QJsonObject obj_stream = value_stream.toObject();
if (!obj_stream.contains("label"_L1) || !obj_stream.contains("url"_L1)) {
continue;
}
QString label = obj_stream["label"_L1].toString();
const QString label = obj_stream["label"_L1].toString();
QString url = obj_stream["url"_L1].toString();
static const QRegularExpression regex_url_schema(u"^[0-9a-zA-Z]*:\\/\\/"_s, QRegularExpression::CaseInsensitiveOption);
if (!url.contains(regex_url_schema)) {

18
src/radios/radioservice.cpp
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2021-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -66,30 +66,30 @@ QJsonObject RadioService::ExtractJsonObj(const QByteArray &data) {
}
QJsonParseError json_error;
QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
const QJsonDocument json_document = QJsonDocument::fromJson(data, &json_error);
if (json_error.error != QJsonParseError::NoError) {
Error(QStringLiteral("Failed to parse Json data from %1: %2").arg(name_, json_error.errorString()));
return QJsonObject();
}
if (json_doc.isEmpty()) {
if (json_document.isEmpty()) {
Error(QStringLiteral("%1: Received empty Json document.").arg(name_), data);
return QJsonObject();
}
if (!json_doc.isObject()) {
Error(QStringLiteral("%1: Json document is not an object.").arg(name_), json_doc);
if (!json_document.isObject()) {
Error(QStringLiteral("%1: Json document is not an object.").arg(name_), json_document);
return QJsonObject();
}
QJsonObject json_obj = json_doc.object();
if (json_obj.isEmpty()) {
Error(QStringLiteral("%1: Received empty Json object.").arg(name_), json_doc);
const QJsonObject json_object = json_document.object();
if (json_object.isEmpty()) {
Error(QStringLiteral("%1: Received empty Json object.").arg(name_), json_document);
return QJsonObject();
}
return json_obj;
return json_object;
}

2
src/radios/radioservice.h
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2021-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

16
src/radios/somafmservice.cpp
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2021-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kApiChannelsUrl[] = "https://somafm.com/channels.json";
}
} // namespace
SomaFMService::SomaFMService(const SharedPtr<TaskManager> task_manager, const SharedPtr<NetworkAccessManager> network, QObject *parent)
: RadioService(Song::Source::SomaFM, u"SomaFM"_s, IconLoader::Load(u"somafm"_s), task_manager, network, parent) {}
@@ -68,9 +68,9 @@ void SomaFMService::GetChannels() {
Abort();
QUrl url(QString::fromLatin1(kApiChannelsUrl));
QNetworkRequest req(url);
QNetworkReply *reply = network_->get(req);
const QUrl url(QString::fromLatin1(kApiChannelsUrl));
QNetworkRequest network_request(url);
QNetworkReply *reply = network_->get(network_request);
replies_ << reply;
const int task_id = task_manager_->StartTask(tr("Getting %1 channels").arg(name_));
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, task_id]() { GetChannelsReply(reply, task_id); });
@@ -82,7 +82,7 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) {
if (replies_.contains(reply)) replies_.removeAll(reply);
reply->deleteLater();
QJsonObject object = ExtractJsonObj(reply);
const QJsonObject object = ExtractJsonObj(reply);
if (object.isEmpty()) {
task_manager_->SetTaskFinished(task_id);
Q_EMIT NewChannels();
@@ -141,8 +141,8 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) {
void SomaFMService::GetStreamUrl(const int task_id, const RadioChannel &channel) {
QNetworkRequest req(channel.url);
QNetworkReply *reply = network_->get(req);
QNetworkRequest network_request(channel.url);
QNetworkReply *reply = network_->get(network_request);
replies_ << reply;
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, task_id, channel]() { GetStreamUrlsReply(reply, task_id, channel); });

2
src/radios/somafmservice.h
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2021-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by