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

Rewrite MusicBrainzClient

Browse Source 
Use Json instead of XML, make Disc ID requests respect rate limiting, handle sort names.
This commit is contained in:
Jonas Kvinge
2025-10-05 21:42:14 +02:00
parent 330284f03e
commit 1d0d03ed83
8 changed files with 542 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/device/cddasongloader.cpp
View File

@@ -53,11 +53,17 @@ using namespace Qt::Literals::StringLiterals;
CDDASongLoader::CDDASongLoader(const QUrl &url, QObject *parent)
: QObject(parent),
url_(url),
network_(make_shared<NetworkAccessManager>()) {
network_(make_shared<NetworkAccessManager>()),
#ifdef HAVE_MUSICBRAINZ
musicbrainz_client_(new MusicBrainzClient(network_, this)),
#endif
whatever_(false) {
#ifdef HAVE_MUSICBRAINZ
QObject::connect(this, &CDDASongLoader::LoadTagsFromMusicBrainz, this, &CDDASongLoader::LoadTagsFromMusicBrainzSlot);
QObject::connect(musicbrainz_client_, &MusicBrainzClient::DiscIdFinished, this, &CDDASongLoader::LoadTagsFromMusicBrainzFinished);
#endif // HAVE_MUSICBRAINZ
}
CDDASongLoader::~CDDASongLoader() {
@@ -349,7 +355,7 @@ void CDDASongLoader::LoadSongsFromCDDA() {
}
else {
qLog(Info) << "MusicBrainz Disc ID:" << musicbrainz_discid;
Q_EMIT LoadTagsFromMusicBrainz(musicbrainz_discid);
Q_EMIT LoadTagsFromMusicBrainz(musicbrainz_discid, songs);
}
#else
Q_EMIT LoadingFinished();
@@ -360,18 +366,23 @@ void CDDASongLoader::LoadSongsFromCDDA() {
#ifdef HAVE_MUSICBRAINZ
void CDDASongLoader::LoadTagsFromMusicBrainzSlot(const QString &musicbrainz_discid) const {
void CDDASongLoader::LoadTagsFromMusicBrainzSlot(const QString &musicbrainz_discid, const QMap<int, Song> &songs) {
MusicBrainzClient *musicbrainz_client = new MusicBrainzClient(network_);
QObject::connect(musicbrainz_client, &MusicBrainzClient::DiscIdFinished, this, &CDDASongLoader::LoadTagsFromMusicBrainzFinished);
musicbrainz_client->StartDiscIdRequest(musicbrainz_discid);
musicbrainz_discid_ = musicbrainz_discid;
musicbrainz_songs_ = songs;
musicbrainz_client_->StartDiscIdRequest(musicbrainz_discid);
}
void CDDASongLoader::LoadTagsFromMusicBrainzFinished(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results, const QString &error) {
void CDDASongLoader::LoadTagsFromMusicBrainzFinished(const QString &musicbrainz_discid, const MusicBrainzClient::ResultList &results, const QString &error) {
MusicBrainzClient *musicbrainz_client = qobject_cast<MusicBrainzClient*>(sender());
musicbrainz_client->deleteLater();
if (musicbrainz_discid != musicbrainz_discid_) {
return;
}
QMap<int, Song> songs = musicbrainz_songs_;
musicbrainz_discid_.clear();
musicbrainz_songs_.clear();
if (!error.isEmpty()) {
Error(error);
@@ -383,27 +394,32 @@ void CDDASongLoader::LoadTagsFromMusicBrainzFinished(const QString &artist, cons
return;
}
SongList songs;
songs.reserve(results.count());
int track_number = 0;
for (const MusicBrainzClient::Result &result : results) {
++track_number;
Song song(Song::Source::CDDA);
song.set_artist(artist);
song.set_album(album);
song.set_title(result.title_);
song.set_length_nanosec(result.duration_msec_ * kNsecPerMsec);
song.set_track(track_number);
song.set_year(result.year_);
song.set_id(track_number);
song.set_filetype(Song::FileType::CDDA);
song.set_valid(true);
// We need to set URL, that's how playlist will find the correct item to update
song.set_url(GetUrlFromTrack(track_number));
songs << song;
if (songs.contains(result.track_)) {
Song &song = songs[result.track_];
song.set_valid(true);
song.set_id(result.track_);
song.set_track(result.track_);
song.set_artist(result.artist_);
song.set_artistsort(result.sort_artist_);
song.set_album(result.album_);
song.set_title(result.title_);
song.set_track(result.track_);
song.set_year(result.year_);
song.set_url(GetUrlFromTrack(song.track()));
if (song.length_nanosec() <= 0) {
song.set_length_nanosec(result.duration_msec_ * kNsecPerMsec);
}
if (!result.album_artist_.isEmpty() && result.album_artist_ != result.artist_) {
song.set_albumartist(result.album_artist_);
}
if (!result.sort_album_artist_.isEmpty() && result.sort_album_artist_ != result.sort_artist_) {
song.set_albumartistsort(result.sort_album_artist_);
}
}
}
Q_EMIT SongsUpdated(songs);
Q_EMIT SongsUpdated(songs.values());
Q_EMIT LoadingFinished();
}

17
src/device/cddasongloader.h
View File

@@ -29,9 +29,10 @@
#include <QObject>
#include <QMutex>
#include <QFuture>
#include <QMap>
#include <QString>
#include <QUrl>
#include <QFuture>
#include "includes/shared_ptr.h"
#include "core/song.h"
@@ -62,19 +63,27 @@ class CDDASongLoader : public QObject {
void SongsUpdated(const SongList &songs);
void LoadError(const QString &error);
void LoadingFinished();
void LoadTagsFromMusicBrainz(const QString &musicbrainz_discid);
void LoadTagsFromMusicBrainz(const QString &musicbrainz_discid, const QMap<int, Song> &songs);
private Q_SLOTS:
#ifdef HAVE_MUSICBRAINZ
void LoadTagsFromMusicBrainzSlot(const QString &musicbrainz_discid) const;
void LoadTagsFromMusicBrainzFinished(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results, const QString &error);
void LoadTagsFromMusicBrainzSlot(const QString &musicbrainz_discid, const QMap<int, Song> &songs);
void LoadTagsFromMusicBrainzFinished(const QString &musicbrainz_discid, const MusicBrainzClient::ResultList &results, const QString &error);
#endif
private:
const QUrl url_;
SharedPtr<NetworkAccessManager> network_;
#ifdef HAVE_MUSICBRAINZ
MusicBrainzClient *musicbrainz_client_;
#endif
QMutex mutex_load_;
QFuture<void> loading_future_;
#ifdef HAVE_MUSICBRAINZ
QString musicbrainz_discid_;
QMap<int, Song> musicbrainz_songs_;
#endif
bool whatever_;
};
#endif // CDDASONGLOADER_H