BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2025-04-03 19:34:42 -05:00
parent 4f2ee2ad99
commit 8d2024d34b
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repertory/librepertory/include/providers/sia/sia_provider.hpp
View File

@ -52,6 +52,9 @@ private:
[[nodiscard]] auto create_directory_key(const std::string &api_path) const
-> repertory::api_error;
[[nodiscard]] auto ensure_directory_exists(const std::string &api_path) const
-> api_error;
[[nodiscard]] auto get_object_info(const std::string &api_path,
json &object_info) const -> api_error;

46
repertory/librepertory/src/providers/sia/sia_provider.cpp
View File

@ -159,14 +159,14 @@ auto sia_provider::create_directory_key(const std::string &api_path) const
}
if (not object_list.contains("objects")) {
return api_error::item_not_found;
return api_error::directory_not_found;
}
const auto &list = object_list.at("objects");
if (std::ranges::find_if(list, [&api_path](auto &&entry) -> bool {
return entry.at("key").template get<std::string>() == api_path + '/';
}) == list.end()) {
return api_error::item_not_found;
return api_error::directory_not_found;
}
api_meta_map meta;
@ -174,6 +174,27 @@ auto sia_provider::create_directory_key(const std::string &api_path) const
meta);
}
auto sia_provider::ensure_directory_exists(const std::string &api_path) const
-> api_error {
REPERTORY_USES_FUNCTION_NAME();
bool exists{};
auto res{is_directory(api_path, exists)};
if (res != api_error::success) {
utils::error::raise_api_path_error(function_name, api_path, res,
"failed detect existing directory");
return res;
}
if (not exists) {
utils::error::raise_api_path_error(function_name, api_path, res,
"directory not found");
return api_error::directory_not_found;
}
return api_error::success;
}
auto sia_provider::get_directory_item_count(const std::string &api_path) const
-> std::uint64_t {
REPERTORY_USES_FUNCTION_NAME();
@ -241,20 +262,13 @@ auto sia_provider::get_directory_items_impl(const std::string &api_path,
: entry["size"].get<std::uint64_t>(),
get_last_modified(entry));
if (directory) {
bool exists{};
auto res{is_directory(entry_api_path, exists)};
auto res{ensure_directory_exists(entry_api_path)};
if (res != api_error::success) {
utils::error::raise_api_path_error(
function_name, entry_api_path, res,
"failed detect existing directory");
continue;
}
if (not exists) {
utils::error::raise_api_path_error(function_name, entry_api_path,
res, "directory not found");
continue;
}
}
get_api_item_added()(directory, file);
@ -364,8 +378,7 @@ auto sia_provider::get_file_list(api_file_list &list,
get_last_modified(entry)),
};
bool exists{};
auto res{is_directory(entry_api_path, exists)};
auto res{ensure_directory_exists(entry_api_path)};
if (res != api_error::success) {
utils::error::raise_api_path_error(
function_name, entry_api_path, res,
@ -373,12 +386,6 @@ auto sia_provider::get_file_list(api_file_list &list,
return res;
}
if (not exists) {
utils::error::raise_api_path_error(
function_name, entry_api_path, res, "directory not found");
return api_error::directory_not_found;
}
get_api_item_added()(true, dir);
}
@ -578,7 +585,8 @@ auto sia_provider::is_directory(const std::string &api_path, bool &exists) const
}
}
if (res == api_error::item_not_found) {
if (res == api_error::directory_not_found ||
res == api_error::item_not_found) {
return api_error::success;
}