From edb57903bc939d3ac8dbdd33907ee556033a8fdf Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 20 Dec 2024 13:47:17 -0600 Subject: [PATCH] refactor --- repertory/librepertory/src/app_config.cpp | 27 ++++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp index 8f0654aa..d11420ec 100644 --- a/repertory/librepertory/src/app_config.cpp +++ b/repertory/librepertory/src/app_config.cpp @@ -773,7 +773,8 @@ auto app_config::get_json() const -> json { {JSON_VERSION, version_}, }; - if (prov_ == provider_type::encrypt) { + switch (prov_) { + case provider_type::encrypt: { ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS); ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT); ret.erase(JSON_EVICTION_DELAY_MINS); @@ -789,16 +790,8 @@ auto app_config::get_json() const -> json { ret.erase(JSON_RING_BUFFER_FILE_SIZE); ret.erase(JSON_S3_CONFIG); ret.erase(JSON_SIA_CONFIG); - } else if (prov_ == provider_type::s3) { - ret.erase(JSON_ENCRYPT_CONFIG); - ret.erase(JSON_HOST_CONFIG); - ret.erase(JSON_REMOTE_CONFIG); - ret.erase(JSON_SIA_CONFIG); - } else if (prov_ == provider_type::sia) { - ret.erase(JSON_ENCRYPT_CONFIG); - ret.erase(JSON_REMOTE_CONFIG); - ret.erase(JSON_S3_CONFIG); - } else if (prov_ == provider_type::remote) { + } break; + case provider_type::remote: { ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS); ret.erase(JSON_DATABASE_TYPE); ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT); @@ -819,6 +812,18 @@ auto app_config::get_json() const -> json { ret.erase(JSON_RING_BUFFER_FILE_SIZE); ret.erase(JSON_S3_CONFIG); ret.erase(JSON_SIA_CONFIG); + } break; + case provider_type::s3: { + ret.erase(JSON_ENCRYPT_CONFIG); + ret.erase(JSON_HOST_CONFIG); + ret.erase(JSON_REMOTE_CONFIG); + ret.erase(JSON_SIA_CONFIG); + } break; + case provider_type::sia: { + ret.erase(JSON_ENCRYPT_CONFIG); + ret.erase(JSON_REMOTE_CONFIG); + ret.erase(JSON_S3_CONFIG); + } break; } return ret;