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

do not copy strings while doing case insensitive comparison

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-15 18:48:38 +00:00
parent 27687fd2b1
commit 8cf7a7cab6
3 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/helpers.cpp
View File

@@ -225,32 +225,6 @@ void ParseArgv(int argc, char **argv)
exit(0);
}
bool CaseInsensitiveSorting::operator()(std::string a, std::string b)
{
ToLower(a);
ToLower(b);
if (Config.ignore_leading_the)
{
RemoveTheWord(a);
RemoveTheWord(b);
}
return a < b;
}
bool CaseInsensitiveSorting::operator()(Song *sa, Song *sb)
{
std::string a = sa->GetName();
std::string b = sb->GetName();
ToLower(a);
ToLower(b);
if (Config.ignore_leading_the)
{
RemoveTheWord(a);
RemoveTheWord(b);
}
return a < b;
}
bool CaseInsensitiveSorting::operator()(const Item &a, const Item &b)
{
if (a.type == b.type)
@@ -258,9 +232,9 @@ bool CaseInsensitiveSorting::operator()(const Item &a, const Item &b)
switch (a.type)
{
case itDirectory:
return operator()(ExtractTopDirectory(a.name), ExtractTopDirectory(b.name));
return cmp(ExtractTopDirectory(a.name), ExtractTopDirectory(b.name)) < 0;
case itPlaylist:
return operator()(a.name, b.name);
return cmp(a.name, b.name) < 0;
case itSong:
return operator()(a.song, b.song);
default: // there's no other type, just silence compiler.
@@ -354,13 +328,6 @@ std::string GetLineValue(std::string &line, char a, char b, bool once)
return result;
}
void RemoveTheWord(std::string &s)
{
size_t the_pos = s.find("the ");
if (the_pos == 0 && the_pos != std::string::npos)
s = s.substr(4);
}
std::string ExtractTopDirectory(const std::string &s)
{
size_t slash = s.rfind("/");