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

count braces while passing format in the loop to omit nested ones

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-08-14 02:04:22 +02:00
parent e68306c8c0
commit 0f53677eb6
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/song.cpp
View File

@@ -371,9 +371,16 @@ std::string MPD::Song::Format_ParseBraces(std::string::const_iterator &it, std::
else else
result += *it; result += *it;
} }
int brace_counter = 0;
if (*it != '}' || !has_some_tags) if (*it != '}' || !has_some_tags)
{ {
for (; *it != '}'; ++it) { } for (; *it != '}' || brace_counter; ++it)
{
if (*it == '{')
++brace_counter;
else if (*it == '}')
--brace_counter;
}
if (*++it == '|') if (*++it == '|')
return Format_ParseBraces(++it, end_it); return Format_ParseBraces(++it, end_it);
else else
@@ -381,8 +388,17 @@ std::string MPD::Song::Format_ParseBraces(std::string::const_iterator &it, std::
} }
else else
{ {
if (*++it == '|') if (*(it+1) == '|')
for (; *it != '}' || *++it == '|'; ++it) { } {
for (; *it != '}' || *(it+1) == '|' || brace_counter; ++it)
{
if (*it == '{')
++brace_counter;
else if (*it == '}')
--brace_counter;
}
}
++it;
return result; return result;
} }
} }