aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/vfs/vfsimpl.cpp
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2024-10-10 09:57:06 +0200
committerGitHub Enterprise <[email protected]>2024-10-10 09:57:06 +0200
commit14f2d5665e00f9742a417e913eb05af38e570ea5 (patch)
treef6369d401a7b16edd894ac304f1c59f8b630cc48 /src/zenserver/vfs/vfsimpl.cpp
parentDashboard: alignment of complex stats & logo goes home (#187) (diff)
downloadzen-14f2d5665e00f9742a417e913eb05af38e570ea5.tar.xz
zen-14f2d5665e00f9742a417e913eb05af38e570ea5.zip
oplog mirror and vfs utf8 paths (#189)
* assume "filename" fields in oplog entries are utf8 paths
Diffstat (limited to 'src/zenserver/vfs/vfsimpl.cpp')
-rw-r--r--src/zenserver/vfs/vfsimpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/zenserver/vfs/vfsimpl.cpp b/src/zenserver/vfs/vfsimpl.cpp
index abb7e8f94..7e4fbe83e 100644
--- a/src/zenserver/vfs/vfsimpl.cpp
+++ b/src/zenserver/vfs/vfsimpl.cpp
@@ -381,12 +381,12 @@ VfsServiceDataSource::PopulateDirectory(std::string NodePath, VfsTreeNode& DirNo
{
if (zen::CbObjectView Data = DataIter.AsObjectView())
{
- std::string_view FileName = Data["filename"sv].AsString();
- zen::Oid ChunkId = Data["id"sv].AsObjectId();
+ std::filesystem::path FileName(Data["filename"sv].AsU8String());
+ zen::Oid ChunkId = Data["id"sv].AsObjectId();
if (auto FindIt = ChunkSizes.find(ChunkId); FindIt != ChunkSizes.end())
{
- DirNode.AddFileNode(FileName, FindIt->second /* file size */, ChunkId, DataSource);
+ DirNode.AddFileNode(FileName.string(), FindIt->second /* file size */, ChunkId, DataSource);
}
else
{