oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'clng11' of git://github.com/neheb/MPD into master

This commit is contained in:
Max Kellermann 2020-11-04 20:34:55 +01:00
parent 3d276d50b4 f1fc5d79ca
commit 0b8208fe7f
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/command/FileCommands.cxx
View File

@ -113,12 +113,9 @@ IsValidName(const StringView s) noexcept
if (s.empty() || !IsAlphaASCII(s.front()))
return false;
for (const char ch : s) {
if (!IsAlphaASCII(ch) && ch != '_' && ch != '-')
return false;
}
return true;
return std::none_of(s.begin(), s.end(), [=](const auto &ch) {
return !IsAlphaASCII(ch) && ch != '_' && ch != '-';
});
}
gcc_pure

15
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@ -356,11 +356,9 @@ SendConstraints(mpd_connection *connection, const SongFilter &filter)
filter.ToExpression().c_str());
#endif
for (const auto &i : filter.GetItems())
if (!SendConstraints(connection, *i))
return false;
return true;
return std::all_of(
filter.GetItems().begin(), filter.GetItems().end(),
[=](const auto &item) { return SendConstraints(connection, *item); });
}
static bool
@ -896,11 +894,8 @@ IsFilterFullySupported(const SongFilter &filter,
(void)connection;
#endif
for (const auto &i : filter.GetItems())
if (!IsFilterSupported(*i))
return false;
return true;
return std::all_of(filter.GetItems().begin(), filter.GetItems().end(),
[](const auto &item) { return IsFilterSupported(*item); });
}
gcc_pure

32
src/song/Filter.cxx
View File

@ -429,29 +429,27 @@ SongFilter::Match(const LightSong &song) const noexcept
bool
SongFilter::HasFoldCase() const noexcept
{
for (const auto &i : and_filter.GetItems()) {
if (auto t = dynamic_cast<const TagSongFilter *>(i.get())) {
if (t->GetFoldCase())
return true;
} else if (auto u = dynamic_cast<const UriSongFilter *>(i.get())) {
if (u->GetFoldCase())
return true;
}
}
return std::any_of(
and_filter.GetItems().begin(), and_filter.GetItems().end(),
[](const auto &item) {
if (auto t = dynamic_cast<const TagSongFilter *>(item.get()))
return t->GetFoldCase();
return false;
if (auto u = dynamic_cast<const UriSongFilter *>(item.get()))
return u->GetFoldCase();
return false;
});
}
bool
SongFilter::HasOtherThanBase() const noexcept
{
for (const auto &i : and_filter.GetItems()) {
const auto *f = dynamic_cast<const BaseSongFilter *>(i.get());
if (f == nullptr)
return true;
}
return false;
return std::any_of(and_filter.GetItems().begin(), and_filter.GetItems().end(),
[=](const auto &item) {
return !dynamic_cast<const BaseSongFilter *>(
item.get());
});
}
const char *