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

Partition, ...: use libfmt for logging

Browse Source
This commit is contained in:
Max Kellermann
2021-06-24 20:22:48 +02:00
parent 0185d58a2b
commit 6f539cfcd6
44 changed files with 320 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/db/update/Archive.cxx
View File

@@ -23,6 +23,7 @@
#include "db/plugins/simple/Directory.hxx"
#include "db/plugins/simple/Song.hxx"
#include "storage/StorageInterface.hxx"
#include "lib/fmt/PathFormatter.hxx"
#include "fs/AllocatedPath.hxx"
#include "storage/FileInfo.hxx"
#include "archive/ArchiveList.hxx"
@@ -82,14 +83,14 @@ UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory,
}
modified = true;
FormatNotice(update_domain, "added %s/%s",
directory.GetPath(), name);
FmtNotice(update_domain, "added {}/{}",
directory.GetPath(), name);
}
} else {
if (!song->UpdateFileInArchive(archive)) {
FormatDebug(update_domain,
"deleting unrecognized file %s/%s",
directory.GetPath(), name);
FmtDebug(update_domain,
"deleting unrecognized file {}/{}",
directory.GetPath(), name);
editor.LockDeleteSong(directory, song);
}
}
@@ -107,8 +108,8 @@ class UpdateArchiveVisitor final : public ArchiveVisitor {
:walk(_walk), archive(_archive), directory(_directory) {}
void VisitArchiveEntry(const char *path_utf8) override {
FormatDebug(update_domain,
"adding archive file: %s", path_utf8);
FmtDebug(update_domain,
"adding archive file: {}", path_utf8);
walk.UpdateArchiveTree(archive, directory, path_utf8);
}
};
@@ -149,7 +150,7 @@ UpdateWalk::UpdateArchiveFile(Directory &parent, std::string_view name,
return;
}
FormatDebug(update_domain, "archive %s opened", path_fs.c_str());
FmtDebug(update_domain, "archive {} opened", path_fs);
UpdateArchiveVisitor visitor(*this, *file, *directory);
file->Visit(visitor);