Skip to content

Commit 152137e

Browse files
committed
Fix #472 by checking for markings during bulk search
1 parent 5fc83c7 commit 152137e

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/ui_contextmenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ class OpenLyricsContextSubItem : public contextmenu_item_simple
287287
}
288288
search_avoidance_force_by_mark_instrumental(track, track_info);
289289
}
290-
LOG_INFO("Finished marking %d tracks as instrumental with %d failures", int(failure_count));
290+
LOG_INFO("Finished marking %d tracks as instrumental with %d failures", int(track_count), int(failure_count));
291291

292292
fb2k::inMainThread2(
293293
[failure_count, track_count]()

src/ui_lyric_bulk_search.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "metrics.h"
1313
#include "tag_util.h"
1414
#include "win32_util.h"
15+
#include "metadb_index_search_avoidance.h"
1516

1617
class BulkLyricSearch;
1718
static BulkLyricSearch* g_active_bulk_search_panel = nullptr;
@@ -279,8 +280,16 @@ LRESULT BulkLyricSearch::OnTimer(WPARAM)
279280

280281
const TrackAndInfo& track = m_tracks_to_search[m_next_search_index];
281282
m_child_search.emplace(LyricUpdate::Type::ManualSearch, track.track, track.track_info, m_child_abort);
282-
283-
io::search_for_lyrics(m_child_search.value(), false);
283+
const SearchAvoidanceReason avoid_reason = false // todo change
284+
? SearchAvoidanceReason::Allowed
285+
: search_avoidance_allows_search(track.track, track.track_info);
286+
const bool search_local_only = (avoid_reason != SearchAvoidanceReason::Allowed);
287+
if(search_local_only)
288+
{
289+
LOG_INFO("Search avoidance skipped remote sources for this track: %s",
290+
search_avoid_reason_to_string(avoid_reason));
291+
}
292+
io::search_for_lyrics(m_child_search.value(), search_local_only);
284293

285294
UINT_PTR result = SetTimer(BULK_SEARCH_UPDATE_TIMER, 16, nullptr);
286295
if(result != BULK_SEARCH_UPDATE_TIMER)

0 commit comments

Comments
 (0)