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-12-08 23:49:48 +01:00
parent 109ff90401
commit 93af866185
179 changed files with 1187 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qobuz/qobuzrequest.cpp
View File

@@ -424,7 +424,7 @@ void QobuzRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re
Error(u"Json artists object is missing values."_s, json_object);
return;
}
//int limit = obj_artists["limit"].toInt();
// int limit = obj_artists["limit"].toInt();
offset = object_artists["offset"_L1].toInt();
int artists_total = object_artists["total"_L1].toInt();
@@ -648,7 +648,7 @@ void QobuzRequest::AlbumsReceived(QNetworkReply *reply, const Artist &artist_req
return;
}
//int limit = obj_albums["limit"].toInt();
// int limit = obj_albums["limit"].toInt();
offset = object_albums["offset"_L1].toInt();
albums_total = object_albums["total"_L1].toInt();
@@ -936,7 +936,7 @@ void QobuzRequest::SongsReceived(QNetworkReply *reply, const Artist &artist_requ
return;
}
//int limit = obj_tracks["limit"].toInt();
// int limit = obj_tracks["limit"].toInt();
const int offset = obj_tracks["offset"_L1].toInt();
songs_total = obj_tracks["total"_L1].toInt();
@@ -1050,7 +1050,7 @@ void QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
int disc = 0;
QString copyright = json_obj["copyright"_L1].toString();
qint64 duration = json_obj["duration"_L1].toInt() * kNsecPerSec;
//bool streamable = json_obj["streamable"].toBool();
// bool streamable = json_obj["streamable"].toBool();
QString composer;
QString performer;
@@ -1148,9 +1148,9 @@ void QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
performer = obj_performer["name"_L1].toString();
}
//if (!streamable) {
//Warn(QString("Song %1 %2 %3 is not streamable").arg(album_artist).arg(album).arg(title));
//}
// if (!streamable) {
// Warn(QString("Song %1 %2 %3 is not streamable").arg(album_artist).arg(album).arg(title));
// }
QUrl url;
url.setScheme(url_handler_->scheme());
@@ -1160,7 +1160,7 @@ void QobuzRequest::ParseSong(Song &song, const QJsonObject &json_obj, const Arti
title = Song::TitleRemoveMisc(title);
}
//qLog(Debug) << "id" << song_id << "track" << track << "title" << title << "album" << album << "album artist" << album_artist << cover_url << streamable << url;
// qLog(Debug) << "id" << song_id << "track" << track << "title" << title << "album" << album << "album artist" << album_artist << cover_url << streamable << url;
song.set_source(Song::Source::Qobuz);
song.set_song_id(song_id);

4
src/qobuz/qobuzservice.cpp
View File

@@ -248,7 +248,7 @@ QString QobuzService::DecodeAppSecret(const QString &app_secret_base64) const {
const QByteArray app_secret_binary = QByteArray::fromBase64(app_secret_base64.toUtf8());
QString app_secret_decoded;
for (int x = 0, y = 0; x < app_secret_binary.length(); ++x , ++y) {
for (int x = 0, y = 0; x < app_secret_binary.length(); ++x, ++y) {
if (y == appid.length()) y = 0;
const uint rc = static_cast<uint>(app_secret_binary[x] ^ appid[y]);
if (rc > 0xFFFF) {
@@ -296,7 +296,7 @@ void QobuzService::SendLoginWithCredentials(const QString &app_id, const QString
QObject::connect(reply, &QNetworkReply::sslErrors, this, &QobuzService::HandleLoginSSLErrors);
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply]() { HandleAuthReply(reply); });
//qLog(Debug) << "Qobuz: Sending request" << url << query;
// qLog(Debug) << "Qobuz: Sending request" << url << query;
}