From 48e0e6af710e4aace37b0833b6ba280ffae73c1e Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 10 Sep 2020 17:17:55 +0200
Subject: [PATCH] Ignore Radio Paradise "commercial" break for cover and lyrics
 search

---
 src/covermanager/albumcoverfetchersearch.cpp | 9 +++++++++
 src/lyrics/lyricsfetchersearch.cpp           | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp
index d2dbea52e..4bb29af34 100644
--- a/src/covermanager/albumcoverfetchersearch.cpp
+++ b/src/covermanager/albumcoverfetchersearch.cpp
@@ -81,6 +81,12 @@ void AlbumCoverFetcherSearch::TerminateSearch() {
 
 void AlbumCoverFetcherSearch::Start(CoverProviders *cover_providers) {
 
+  // Ignore Radio Paradise "commercial" break.
+  if (request_.artist.toLower() == "commercial-free" && request_.title.toLower() == "listener-supported") {
+    TerminateSearch();
+    return;
+  }
+
   QList<CoverProvider*> cover_providers_sorted = cover_providers->List();
   std::stable_sort(cover_providers_sorted.begin(), cover_providers_sorted.end(), ProviderCompareOrder);
 
@@ -204,6 +210,9 @@ void AlbumCoverFetcherSearch::ProviderSearchResults(CoverProvider *provider, con
         )) {
       results_copy[i].score_match -= 1;
     }
+    else if (request_album.isEmpty() && result_album.contains("soundtrack")) {
+      results_copy[i].score_match -= 0.5;
+    }
 
     // Set the initial image quality score besed on the size returned by the API, this is recalculated when the image is received.
     results_copy[i].score_quality += ScoreImage(results_copy[i].image_size);
diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp
index 22b8a56b0..f45e6a1c6 100644
--- a/src/lyrics/lyricsfetchersearch.cpp
+++ b/src/lyrics/lyricsfetchersearch.cpp
@@ -56,6 +56,12 @@ void LyricsFetcherSearch::TerminateSearch() {
 
 void LyricsFetcherSearch::Start(LyricsProviders *lyrics_providers) {
 
+  // Ignore Radio Paradise "commercial" break.
+  if (request_.artist.toLower() == "commercial-free" && request_.title.toLower() == "listener-supported") {
+    TerminateSearch();
+    return;
+  }
+
   QList<LyricsProvider*> lyrics_providers_sorted = lyrics_providers->List();
   std::stable_sort(lyrics_providers_sorted.begin(), lyrics_providers_sorted.end(), ProviderCompareOrder);