From f5c4aebdac864b8e2307b90a4ca14c972b495604 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 2 Apr 2025 10:17:23 -0500 Subject: [PATCH] fix json names --- .../drives/fuse/remotefuse/remote_server.cpp | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp index ca917165..21457032 100644 --- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp +++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp @@ -1390,7 +1390,7 @@ auto remote_server::winfsp_read_directory(PVOID file_desc, PWSTR /*pattern*/, item_list.clear(); - const auto handle = reinterpret_cast(file_desc); + auto handle = reinterpret_cast(file_desc); auto ret = static_cast( has_open_info(static_cast(handle), STATUS_INVALID_HANDLE)); if (ret == STATUS_SUCCESS) { @@ -1680,29 +1680,30 @@ auto remote_server::json_release_directory_snapshot( } auto remote_server::update_to_windows_format(json &item) -> json & { - const auto api_path = item["path"].get(); - item["meta"][META_ACCESSED] = std::to_string( - utils::string::to_uint64(empty_as_zero(item["meta"][META_ACCESSED]))); - item["meta"][META_CREATION] = std::to_string( - utils::string::to_uint64(empty_as_zero(item["meta"][META_CREATION]))); - item["meta"][META_MODIFIED] = std::to_string( - utils::string::to_uint64(empty_as_zero(item["meta"][META_MODIFIED]))); + auto api_path = item[JSON_API_PATH].get(); + item[JSON_META][META_ACCESSED] = std::to_string( + utils::string::to_uint64(empty_as_zero(item[JSON_META][META_ACCESSED]))); + item[JSON_META][META_CREATION] = std::to_string( + utils::string::to_uint64(empty_as_zero(item[JSON_META][META_CREATION]))); + item[JSON_META][META_MODIFIED] = std::to_string( + utils::string::to_uint64(empty_as_zero(item[JSON_META][META_MODIFIED]))); - if (item["meta"][META_WRITTEN].empty() || - (item["meta"][META_WRITTEN].get() == "0") || - (item["meta"][META_WRITTEN].get() == + if (item[JSON_META][META_WRITTEN].empty() || + (item[JSON_META][META_WRITTEN].get() == "0") || + (item[JSON_META][META_WRITTEN].get() == std::to_string(utils::time::WIN32_TIME_CONVERSION))) { drive_.set_item_meta(api_path, META_WRITTEN, - item["meta"][META_MODIFIED].get()); - item["meta"][META_WRITTEN] = item["meta"][META_MODIFIED]; + item[JSON_META][META_MODIFIED].get()); + item[JSON_META][META_WRITTEN] = item[JSON_META][META_MODIFIED]; } - if (item["meta"][META_ATTRIBUTES].empty()) { - item["meta"][META_ATTRIBUTES] = - item["directory"].get() ? std::to_string(FILE_ATTRIBUTE_DIRECTORY) - : std::to_string(FILE_ATTRIBUTE_ARCHIVE); + if (item[JSON_META][META_ATTRIBUTES].empty()) { + item[JSON_META][META_ATTRIBUTES] = + item[JSON_DIRECTORY].get() + ? std::to_string(FILE_ATTRIBUTE_DIRECTORY) + : std::to_string(FILE_ATTRIBUTE_ARCHIVE); drive_.set_item_meta(api_path, META_ATTRIBUTES, - item["meta"][META_ATTRIBUTES].get()); + item[JSON_META][META_ATTRIBUTES].get()); } return item;