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

lmao oops

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

14
source/frontend/StarSongbookInterface.cpp
View File

@ -9,6 +9,8 @@
namespace Star { namespace Star {
String const SongPathPrefix = "/songs/";
SongbookInterface::SongbookInterface(PlayerPtr player) { SongbookInterface::SongbookInterface(PlayerPtr player) {
m_player = std::move(player); m_player = std::move(player);
@ -60,13 +62,11 @@ 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) {
eraseWhere(m_files, [&](String& song) { if (!song.beginsWith(SongPathPrefix, String::CaseInsensitive)) {
if (!song.beginsWith(prefix, String::CaseInsensitive)) { Logger::warn("Song '{}' isn't in {}, ignoring", SongPathPrefix.size(), song);
Logger::warn("Song '{}' isn't in {}, ignoring", prefix.size(), song);
return true; return true;
} }
song = song.substr(prefix.size(), song.size() - (prefix.size() + 4));
return false; 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; });
@ -81,12 +81,14 @@ void SongbookInterface::refresh(bool reloadFiles) {
auto widget = songList->addItem(); auto widget = songList->addItem();
widget->setData(i); widget->setData(i);
auto songName = widget->fetchChild<LabelWidget>("songName"); auto songName = widget->fetchChild<LabelWidget>("songName");
songName->setText(m_files[i]); String const& song = m_files[i];
songName->setText(song.substr(SongPathPrefix.size(), song.size() - (SongPathPrefix.size() + 4)));
widget->show(); widget->show();
} }
} else { } else {
for (size_t i = 0; i != m_files.size(); ++i) { for (size_t i = 0; i != m_files.size(); ++i) {
StringView song = m_files[i]; StringView song = m_files[i];
song = song.substr(SongPathPrefix.size(), song.size() - (SongPathPrefix.size() + 4));
auto find = song.find(search, 0, String::CaseInsensitive); auto find = song.find(search, 0, String::CaseInsensitive);
if (find != NPos) { if (find != NPos) {
auto widget = songList->addItem(); auto widget = songList->addItem();