evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Songbook interface no longer excluding /songs/ & .abc

Browse Source
This commit is contained in:
Kae 2024-05-24 12:00:53 +10:00
parent 8f8220f517
commit ae26440bac
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/frontend/StarSongbookInterface.cpp
View File

@ -60,9 +60,18 @@ bool SongbookInterface::play() {
void SongbookInterface::refresh(bool reloadFiles) { void SongbookInterface::refresh(bool reloadFiles) {
if (reloadFiles) { if (reloadFiles) {
m_files = Root::singleton().assets()->scanExtension(".abc").values(); m_files = Root::singleton().assets()->scanExtension(".abc").values();
String prefix = "/songs/";
eraseWhere(m_files, [&](String& song) {
if (!song.beginsWith(prefix, String::CaseInsensitive)) {
Logger::warn("Song '{}' isn't in {}, ignoring", prefix.size(), song);
return true;
}
song = song.substr(prefix.size(), song.size() - (prefix.size() + 4));
return false;
});
sort(m_files, [](String const& a, String const& b) -> bool { return b.compare(a, String::CaseInsensitive) > 0; }); sort(m_files, [](String const& a, String const& b) -> bool { return b.compare(a, String::CaseInsensitive) > 0; });
} }
auto search = fetchChild<TextBoxWidget>("search")->getText(); auto& search = fetchChild<TextBoxWidget>("search")->getText();
if (m_lastSearch != search || reloadFiles) { if (m_lastSearch != search || reloadFiles) {
m_lastSearch = search; m_lastSearch = search;
auto songList = fetchChild<ListWidget>("songs.list"); auto songList = fetchChild<ListWidget>("songs.list");