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

make SearchEngine::CaseSensitive regex flag

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-09 11:23:55 +01:00
parent 14a817e83e
commit 2f68c48eb0
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/search_engine.cpp
View File

@@ -40,7 +40,7 @@ size_t SearchEngine::SearchButton = 15;
size_t SearchEngine::ResetButton = 16; size_t SearchEngine::ResetButton = 16;
bool SearchEngine::MatchToPattern = 1; bool SearchEngine::MatchToPattern = 1;
bool SearchEngine::CaseSensitive = 0; int SearchEngine::CaseSensitive = REG_ICASE;
void SearchEngine::Init() void SearchEngine::Init()
{ {
@@ -178,8 +178,8 @@ void SearchEngine::EnterPressed()
} }
case 13: case 13:
{ {
CaseSensitive = !CaseSensitive; CaseSensitive = !CaseSensitive * REG_ICASE;
*w->Current().first << fmtBold << "Case sensitive:" << fmtBoldEnd << ' ' << (CaseSensitive ? "Yes" : "No"); *w->Current().first << fmtBold << "Case sensitive:" << fmtBoldEnd << ' ' << (!CaseSensitive ? "Yes" : "No");
break; break;
} }
case 15: case 15:
@@ -371,7 +371,7 @@ void SearchEngine::Prepare()
*w->at(11).first << fmtBold << "Search in:" << fmtBoldEnd << ' ' << (Config.search_in_db ? "Database" : "Current playlist"); *w->at(11).first << fmtBold << "Search in:" << fmtBoldEnd << ' ' << (Config.search_in_db ? "Database" : "Current playlist");
*w->at(12).first << fmtBold << "Search mode:" << fmtBoldEnd << ' ' << (MatchToPattern ? NormalMode : StrictMode); *w->at(12).first << fmtBold << "Search mode:" << fmtBoldEnd << ' ' << (MatchToPattern ? NormalMode : StrictMode);
*w->at(13).first << fmtBold << "Case sensitive:" << fmtBoldEnd << ' ' << (CaseSensitive ? "Yes" : "No"); *w->at(13).first << fmtBold << "Case sensitive:" << fmtBoldEnd << ' ' << (!CaseSensitive ? "Yes" : "No");
*w->at(15).first << "Search"; *w->at(15).first << "Search";
*w->at(16).first << "Reset"; *w->at(16).first << "Reset";
@@ -484,7 +484,7 @@ void SearchEngine::Search()
if (!s.Any().empty()) if (!s.Any().empty())
{ {
if (regcomp(&rx, s.Any().c_str(), ((CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) | Config.regex_type) == 0) if (regcomp(&rx, s.Any().c_str(), CaseSensitive | Config.regex_type) == 0)
{ {
any_found = any_found =
regexec(&rx, copy.GetArtist().c_str(), 0, 0, 0) == 0 regexec(&rx, copy.GetArtist().c_str(), 0, 0, 0) == 0
@@ -502,55 +502,55 @@ void SearchEngine::Search()
if (found && !s.GetArtist().empty()) if (found && !s.GetArtist().empty())
{ {
if (regcomp(&rx, s.GetArtist().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetArtist().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetArtist().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetArtist().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetTitle().empty()) if (found && !s.GetTitle().empty())
{ {
if (regcomp(&rx, s.GetTitle().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetTitle().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetTitle().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetTitle().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetAlbum().empty()) if (found && !s.GetAlbum().empty())
{ {
if (regcomp(&rx, s.GetAlbum().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetAlbum().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetAlbum().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetAlbum().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetFile().empty()) if (found && !s.GetFile().empty())
{ {
if (regcomp(&rx, s.GetFile().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetFile().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetName().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetName().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetComposer().empty()) if (found && !s.GetComposer().empty())
{ {
if (regcomp(&rx, s.GetComposer().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetComposer().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetComposer().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetComposer().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetPerformer().empty()) if (found && !s.GetPerformer().empty())
{ {
if (regcomp(&rx, s.GetPerformer().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetPerformer().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetPerformer().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetPerformer().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetGenre().empty()) if (found && !s.GetGenre().empty())
{ {
if (regcomp(&rx, s.GetGenre().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetGenre().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetGenre().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetGenre().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetYear().empty()) if (found && !s.GetYear().empty())
{ {
if (regcomp(&rx, s.GetYear().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetYear().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetYear().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetYear().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }
if (found && !s.GetComment().empty()) if (found && !s.GetComment().empty())
{ {
if (regcomp(&rx, s.GetComment().c_str(), (CaseSensitive ? 0 : REG_ICASE) | Config.regex_type) == 0) if (regcomp(&rx, s.GetComment().c_str(), CaseSensitive | Config.regex_type) == 0)
found = regexec(&rx, copy.GetComment().c_str(), 0, 0, 0) == 0; found = regexec(&rx, copy.GetComment().c_str(), 0, 0, 0) == 0;
regfree(&rx); regfree(&rx);
} }

2
src/search_engine.h
View File

@@ -77,7 +77,7 @@ class SearchEngine : public Screen< Menu< std::pair<Buffer *, MPD::Song *> > >
SearchPattern itsPattern; SearchPattern itsPattern;
static bool MatchToPattern; static bool MatchToPattern;
static bool CaseSensitive; static int CaseSensitive;
}; };
extern SearchEngine *mySearcher; extern SearchEngine *mySearcher;