Merge pull request mixxxdj#13672 from daschuer/gh13666

Musicbrainz: Improved messages in case of empty results
daschuer · Sep 23, 2024 · f5890a8 · f5890a8
2 parents feb320a + 4f4f281
commit f5890a8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
@@ -483,15 +483,15 @@ void DlgTagFetcher::setPercentOfEachRecordings(int totalRecordingsFound) {
 
 void DlgTagFetcher::fetchTagFinished(
         TrackPointer pTrack,
-        const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases) {
+        const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases,
+        const QString& whyEmptyMessage) {
     VERIFY_OR_DEBUG_ASSERT(pTrack == m_pTrack) {
         return;
     }
     m_data.m_tags = guessedTrackReleases;
     if (guessedTrackReleases.size() == 0) {
         loadingProgressBar->setValue(kMaximumValueOfQProgressBar);
-        QString emptyMessage = tr("Could not find this track in the MusicBrainz database.");
-        loadingProgressBar->setFormat(emptyMessage);
+        loadingProgressBar->setFormat(whyEmptyMessage);
         return;
     } else {
         btnApply->setDisabled(true);

diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h
@@ -41,7 +41,8 @@ class DlgTagFetcher : public QDialog, public Ui::DlgTagFetcher {
   private slots:
     void fetchTagFinished(
             TrackPointer pTrack,
-            const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases);
+            const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases,
+            const QString& whyEmptyMessage);
     void tagSelected();
     void showProgressOfConstantTask(const QString&);
     void setPercentOfEachRecordings(int totalRecordingsFound);

diff --git a/src/musicbrainz/tagfetcher.cpp b/src/musicbrainz/tagfetcher.cpp
@@ -116,11 +116,12 @@ void TagFetcher::slotFingerprintReady() {
     if (fingerprint.isEmpty()) {
         emit resultAvailable(
                 m_pTrack,
-                QList<mixxx::musicbrainz::TrackRelease>());
+                {},
+                tr("Reading track for fingerprinting failed."));
         return;
     }
 
-    emit fetchProgress(tr("Identifying track through Acoustid"));
+    emit fetchProgress(tr("Identifying track through AcoustID"));
     DEBUG_ASSERT(!m_pAcoustIdTask);
     m_pAcoustIdTask = make_parented<mixxx::AcoustIdLookupTask>(
             &m_network,
@@ -165,7 +166,8 @@ void TagFetcher::slotAcoustIdTaskSucceeded(
 
         emit resultAvailable(
                 std::move(pTrack),
-                QList<mixxx::musicbrainz::TrackRelease>());
+                {},
+                tr("Could not identify track through AcoustID."));
         return;
     }
 
@@ -299,9 +301,17 @@ void TagFetcher::slotMusicBrainzTaskSucceeded(
     auto pTrack = m_pTrack;
     terminate();
 
-    emit resultAvailable(
-            std::move(pTrack),
-            std::move(guessedTrackReleases));
+    if (guessedTrackReleases.empty()) {
+        emit resultAvailable(
+                std::move(pTrack),
+                {},
+                tr("Could not find this track in the MusicBrainz database."));
+    } else {
+        emit resultAvailable(
+                std::move(pTrack),
+                std::move(guessedTrackReleases),
+                {});
+    }
 }
 
 void TagFetcher::startFetchCoverArtLinks(

diff --git a/src/musicbrainz/tagfetcher.h b/src/musicbrainz/tagfetcher.h
@@ -47,7 +47,8 @@ class TagFetcher : public QObject {
   signals:
     void resultAvailable(
             TrackPointer pTrack,
-            const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases);
+            const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases,
+            const QString& whyEmptyMessage); // To explain why the result is empty
     void fetchProgress(
             const QString& message);
     void numberOfRecordingsFoundFromAcoustId(int totalNumberOfRecordings);