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

Use fingerprints from database if available when fetching tags from MusicBrainz

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-08 20:58:46 +02:00
parent 3ca0c828c6
commit 80d127c277
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/musicbrainz/tagfetcher.cpp
View File

@@ -55,13 +55,30 @@ void TagFetcher::StartFetch(const SongList &songs) {
songs_ = songs; songs_ = songs;
QFuture<QString> future = QtConcurrent::mapped(songs_, GetFingerprint); bool have_fingerprints = true;
fingerprint_watcher_ = new QFutureWatcher<QString>(this);
fingerprint_watcher_->setFuture(future);
QObject::connect(fingerprint_watcher_, &QFutureWatcher<QString>::resultReadyAt, this, &TagFetcher::FingerprintFound);
for (const Song &song : songs) { for (const Song &song : songs_) {
emit Progress(song, tr("Fingerprinting song")); if (song.fingerprint().isEmpty()) {
have_fingerprints = false;
break;
}
}
if (have_fingerprints) {
for (int i = 0 ; i < songs_.count() ; ++i) {
const Song &song = songs_[i];
emit Progress(song, tr("Identifying song"));
acoustid_client_->Start(i, song.fingerprint(), static_cast<int>(song.length_nanosec() / kNsecPerMsec));
}
}
else {
QFuture<QString> future = QtConcurrent::mapped(songs_, GetFingerprint);
fingerprint_watcher_ = new QFutureWatcher<QString>(this);
fingerprint_watcher_->setFuture(future);
QObject::connect(fingerprint_watcher_, &QFutureWatcher<QString>::resultReadyAt, this, &TagFetcher::FingerprintFound);
for (const Song &song : songs_) {
emit Progress(song, tr("Fingerprinting song"));
}
} }
} }
@@ -83,7 +100,7 @@ void TagFetcher::Cancel() {
void TagFetcher::FingerprintFound(const int index) { void TagFetcher::FingerprintFound(const int index) {
QFutureWatcher<QString>* watcher = reinterpret_cast<QFutureWatcher<QString>*>(sender()); QFutureWatcher<QString> *watcher = reinterpret_cast<QFutureWatcher<QString>*>(sender());
if (!watcher || index >= songs_.count()) return; if (!watcher || index >= songs_.count()) return;
const QString fingerprint = watcher->resultAt(index); const QString fingerprint = watcher->resultAt(index);