Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu: generalize filtering, introduce interfaces

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-08-31 23:09:56 +02:00
parent f1625c920a
commit 4c944085d6
25 changed files with 516 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/search_engine.cpp
View File

@@ -156,6 +156,7 @@ void SearchEngine::EnterPressed()
}
else if (option == SearchButton)
{
w->ShowAll();
ShowMessage("Searching...");
if (w->Size() > StaticOptions)
Prepare();
@@ -260,9 +261,21 @@ void SearchEngine::GetSelectedSongs(MPD::SongList &v)
}
}
void SearchEngine::ApplyFilter(const std::string &s)
std::string SearchEngine::currentFilter()
{
w->ApplyFilter(s, StaticOptions, REG_ICASE | Config.regex_type);
return RegexFilter<SEItem>::currentFilter(*w);
}
void SearchEngine::applyFilter(const std::string &filter)
{
w->ShowAll();
auto fun = [](const Regex &rx, Menu<SEItem> &menu, const Menu<SEItem>::Item &item) {
if (item.isSeparator() || !item.value().isSong())
return true;
return rx.match(menu.Stringify(item));
};
auto rx = RegexFilter<SEItem>(filter, Config.regex_type, fun);
w->Filter(w->Begin(), w->End(), rx);
}
void SearchEngine::UpdateFoundList()
@@ -515,7 +528,7 @@ void SearchEngine::Search()
std::string SearchEngine::SearchEngineOptionToString(const SEItem &ei)
{
std::string result;
if (!ei.isSong())
if (ei.isSong())
{
if (Config.columns_in_search_engine)
result = Playlist::SongInColumnsToString(ei.song());