mpd/src/client/Idle.cxx
Max Kellermann b0cfdfa257 client/Idle: consume only idle flags that were subscribed to
Since the very beginning when idle subscriptions where introduced
(commit 0bad84066b), waiting for a certain idle mask would clear
all other idle flags as well.  This would cause idle events to get
lost.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1998
2024-03-11 15:07:07 +01:00

70 lines
1.2 KiB
C++

// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project
#include "Client.hxx"
#include "Config.hxx"
#include "Response.hxx"
#include "Idle.hxx"
#include <fmt/format.h>
#include <cassert>
static void
WriteIdleResponse(Response &r, unsigned flags) noexcept
{
const char *const*idle_names = idle_get_names();
for (unsigned i = 0; idle_names[i]; ++i) {
if (flags & (1 << i))
r.Fmt(FMT_STRING("changed: {}\n"), idle_names[i]);
}
r.Write("OK\n");
}
void
Client::IdleNotify() noexcept
{
assert(idle_waiting);
const unsigned flags = idle_flags & idle_subscriptions;
idle_flags &= ~idle_subscriptions;
assert(flags != 0);
idle_waiting = false;
Response r(*this, 0);
WriteIdleResponse(r, flags);
timeout_event.Schedule(client_timeout);
}
void
Client::IdleAdd(unsigned flags) noexcept
{
if (IsExpired())
return;
idle_flags |= flags;
if (idle_waiting && (idle_flags & idle_subscriptions))
IdleNotify();
}
bool
Client::IdleWait(unsigned flags) noexcept
{
assert(!idle_waiting);
idle_waiting = true;
idle_subscriptions = flags;
if (idle_flags & idle_subscriptions) {
IdleNotify();
return true;
} else {
/* disable timeouts while in "idle" */
timeout_event.Cancel();
return false;
}
}