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

client/Response: add method Fmt() based on libfmt

Browse Source
This commit is contained in:
Max Kellermann
2021-05-21 20:35:29 +02:00
parent a9c704b76e
commit 0440c41cba
27 changed files with 241 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/OtherCommands.cxx
View File

@@ -55,13 +55,15 @@
#include "db/update/Service.hxx"
#endif
#include <fmt/format.h>
#include <cassert>
static void
print_spl_list(Response &r, const PlaylistVector &list)
{
for (const auto &i : list) {
r.Format("playlist: %s\n", i.name.c_str());
r.Fmt(FMT_STRING("playlist: {}\n"), i.name);
if (!IsNegative(i.mtime))
time_print(r, "Last-Modified", i.mtime);
@@ -72,7 +74,7 @@ CommandResult
handle_urlhandlers(Client &client, [[maybe_unused]] Request args, Response &r)
{
if (client.IsLocal())
r.Format("handler: file://\n");
r.Write("handler: file://\n");
print_supported_uri_schemes(r);
return CommandResult::OK;
}
@@ -248,7 +250,7 @@ handle_update(Response &r, UpdateService &update,
const char *uri_utf8, bool discard)
{
unsigned ret = update.Enqueue(uri_utf8, discard);
r.Format("updating_db: %i\n", ret);
r.Fmt(FMT_STRING("updating_db: {}\n"), ret);
return CommandResult::OK;
}
@@ -258,7 +260,7 @@ handle_update(Response &r, Database &db,
{
unsigned id = db.Update(uri_utf8, discard);
if (id > 0) {
r.Format("updating_db: %i\n", id);
r.Fmt(FMT_STRING("updating_db: {}\n"), id);
return CommandResult::OK;
} else {
/* Database::Update() has returned 0 without setting
@@ -325,7 +327,7 @@ handle_getvol(Client &client, Request, Response &r)
const auto volume = volume_level_get(partition.outputs);
if (volume >= 0)
r.Format("volume: %i\n", volume);
r.Fmt(FMT_STRING("volume: {}\n"), volume);
return CommandResult::OK;
}
@@ -391,7 +393,7 @@ handle_config(Client &client, [[maybe_unused]] Request args, Response &r)
const Storage *storage = client.GetStorage();
if (storage != nullptr) {
const auto path = storage->MapUTF8("");
r.Format("music_directory: %s\n", path.c_str());
r.Fmt(FMT_STRING("music_directory: {}\n"), path);
}
#endif