client/Response: new Client wrapper class for writing responses

2 files changed, 121 insertions, 0 deletions

diff --git a/src/client/Response.cxx b/src/client/Response.cxx
new file mode 100644
index 000000000..9beaab156
--- /dev/null
+++ b/src/client/Response.cxx
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Response.hxx"
+#include "Client.hxx"
+#include "protocol/Result.hxx"
+#include "util/FormatString.hxx"
+
+#include <string.h>
+
+bool
+Response::Write(const void *data, size_t length)
+{
+	return client.Write(data, length);
+}
+
+bool
+Response::Write(const char *data)
+{
+	return Write(data, strlen(data));
+}
+
+bool
+Response::FormatV(const char *fmt, va_list args)
+{
+	char *p = FormatNewV(fmt, args);
+	bool success = Write(p);
+	delete[] p;
+	return success;
+}
+
+bool
+Response::Format(const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	bool success = FormatV(fmt, args);
+	va_end(args);
+	return success;
+}
+
+void
+Response::Error(enum ack code, const char *msg)
+{
+	command_error(client, code, "%s", msg);
+}
+
+void
+Response::FormatError(enum ack code, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	command_error_v(client, code, fmt, args);
+	va_end(args);
+}
diff --git a/src/client/Response.hxx b/src/client/Response.hxx
new file mode 100644
index 000000000..ba53298c8
--- /dev/null
+++ b/src/client/Response.hxx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_RESPONSE_HXX
+#define MPD_RESPONSE_HXX
+
+#include "check.h"
+#include "protocol/Ack.hxx"
+
+#include <stddef.h>
+#include <stdarg.h>
+
+class Client;
+
+class Response {
+	Client &client;
+
+public:
+	explicit Response(Client &_client):client(_client) {}
+
+	Response(const Response &) = delete;
+	Response &operator=(const Response &) = delete;
+
+	bool Write(const void *data, size_t length);
+	bool Write(const char *data);
+	bool FormatV(const char *fmt, va_list args);
+	bool Format(const char *fmt, ...);
+
+	void Error(enum ack code, const char *msg);
+	void FormatError(enum ack code, const char *fmt, ...);
+};
+
+#endif