From a409408ac03acf24926f9bfe077432eaf3342187 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 17 Jul 2024 17:21:27 -0500 Subject: [PATCH] fix --- repertory/librepertory/src/app_config.cpp | 140 +++++++++++----------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp index cfe89dc4..ea822147 100644 --- a/repertory/librepertory/src/app_config.cpp +++ b/repertory/librepertory/src/app_config.cpp @@ -156,13 +156,14 @@ auto app_config::default_data_directory(const provider_type &prov) {std::string{REPERTORY_DATA_NAME}, app_config::get_provider_name(prov)}); #else #if defined(__APPLE__) - auto data_directory = utils::path::resolve( - std::string("~/Library/Application Support/") + REPERTORY_DATA_NAME + - '/' + app_config::get_provider_name(prov)); -#else auto data_directory = - utils::path::resolve(std::string("~/.local/") + REPERTORY_DATA_NAME + - '/' + app_config::get_provider_name(prov)); + utils::path::resolve(std::string{"~/Library/Application Support/"} + + std::string{REPERTORY_DATA_NAME} + '/' + + app_config::get_provider_name(prov)); +#else + auto data_directory = utils::path::resolve( + std::string{"~/.local/"} + std::string{REPERTORY_DATA_NAME} + '/' + + app_config::get_provider_name(prov)); #endif #endif return data_directory; @@ -194,71 +195,72 @@ auto app_config::default_rpc_port(const provider_type &prov) -> std::uint16_t { auto app_config::get_json() const -> json { json ret = { - {"ApiAuth", api_auth_}, - {"ApiPort", api_port_}, - {"ApiUser", api_user_}, - {"ChunkDownloaderTimeoutSeconds", download_timeout_secs_}, - {"EnableChunkDownloaderTimeout", enable_chunk_downloader_timeout_}, - {"EnableCommDurationEvents", enable_comm_duration_events_}, - {"EnableDriveEvents", enable_drive_events_}, + {"ApiAuth", api_auth_}, + {"ApiPort", api_port_}, + {"ApiUser", api_user_}, + {"ChunkDownloaderTimeoutSeconds", download_timeout_secs_}, + {"EnableChunkDownloaderTimeout", enable_chunk_downloader_timeout_}, + {"EnableCommDurationEvents", enable_comm_duration_events_}, + {"EnableDriveEvents", enable_drive_events_}, #if defined(_WIN32) - {"EnableMountManager", enable_mount_manager_}, + {"EnableMountManager", enable_mount_manager_}, #endif - {"EnableMaxCacheSize", enable_max_cache_size_}, - {"EncryptConfig", - { - {"EncryptionToken", encrypt_config_.encryption_token}, - {"Path", encrypt_config_.path}, - }}, - {"EventLevel", event_level_to_string(event_level_)}, - {"EvictionDelayMinutes", eviction_delay_mins_}, - {"EvictionUsesAccessedTime", eviction_uses_accessed_time_}, - {"HighFreqIntervalSeconds", high_freq_interval_secs_}, - {"HostConfig", - { - {"AgentString", hc_.agent_string}, - {"ApiPassword", hc_.api_password}, - {"ApiPort", hc_.api_port}, - {"HostNameOrIp", hc_.host_name_or_ip}, - {"TimeoutMs", hc_.timeout_ms}, - }}, - {"LowFreqIntervalSeconds", low_freq_interval_secs_}, - {"MaxCacheSizeBytes", max_cache_size_bytes_}, - {"MaxUploadCount", max_upload_count_}, - {"OnlineCheckRetrySeconds", online_check_retry_secs_}, - {"OrphanedFileRetentionDays", orphaned_file_retention_days_}, - {"PreferredDownloadType", preferred_download_type_}, - {"ReadAheadCount", read_ahead_count_}, - { - "RemoteMount", - { - {"EnableRemoteMount", enable_remote_mount_}, - {"IsRemoteMount", is_remote_mount_}, - {"RemoteClientPoolSize", remote_client_pool_size_}, - {"RemoteMaxConnections", remote_max_connections_}, - {"RemoteHostNameOrIp", remote_host_name_or_ip_}, - {"RemotePort", remote_port_}, - {"RemoteReceiveTimeoutSeconds", remote_receive_timeout_secs_}, - {"RemoteSendTimeoutSeconds", remote_send_timeout_secs_}, - {"RemoteToken", remote_token_}, - }, - }, - {"RetryReadCount", retry_read_count_}, - {"RingBufferFileSize", ring_buffer_file_size_}, - {"S3Config", - { - {"AccessKey", s3_config_.access_key}, - {"Bucket", s3_config_.bucket}, - {"CacheTimeoutSeconds", s3_config_.cache_timeout_secs}, - {"EncryptionToken", s3_config_.encryption_token}, - {"Region", s3_config_.region}, - {"SecretKey", s3_config_.secret_key}, - {"TimeoutMs", s3_config_.timeout_ms}, - {"URL", s3_config_.url}, - {"UsePathStyle", s3_config_.use_path_style}, - {"UseRegionInURL", s3_config_.use_region_in_url}, - }}, - {"Version", version_}}; + {"EnableMaxCacheSize", enable_max_cache_size_}, + {"EncryptConfig", + { + {"EncryptionToken", encrypt_config_.encryption_token}, + {"Path", encrypt_config_.path}, + }}, + {"EventLevel", event_level_to_string(event_level_)}, + {"EvictionDelayMinutes", eviction_delay_mins_}, + {"EvictionUsesAccessedTime", eviction_uses_accessed_time_}, + {"HighFreqIntervalSeconds", high_freq_interval_secs_}, + {"HostConfig", + { + {"AgentString", hc_.agent_string}, + {"ApiPassword", hc_.api_password}, + {"ApiPort", hc_.api_port}, + {"HostNameOrIp", hc_.host_name_or_ip}, + {"TimeoutMs", hc_.timeout_ms}, + }}, + {"LowFreqIntervalSeconds", low_freq_interval_secs_}, + {"MaxCacheSizeBytes", max_cache_size_bytes_}, + {"MaxUploadCount", max_upload_count_}, + {"OnlineCheckRetrySeconds", online_check_retry_secs_}, + {"OrphanedFileRetentionDays", orphaned_file_retention_days_}, + {"PreferredDownloadType", preferred_download_type_}, + {"ReadAheadCount", read_ahead_count_}, + { + "RemoteMount", + { + {"EnableRemoteMount", enable_remote_mount_}, + {"IsRemoteMount", is_remote_mount_}, + {"RemoteClientPoolSize", remote_client_pool_size_}, + {"RemoteMaxConnections", remote_max_connections_}, + {"RemoteHostNameOrIp", remote_host_name_or_ip_}, + {"RemotePort", remote_port_}, + {"RemoteReceiveTimeoutSeconds", remote_receive_timeout_secs_}, + {"RemoteSendTimeoutSeconds", remote_send_timeout_secs_}, + {"RemoteToken", remote_token_}, + }, + }, + {"RetryReadCount", retry_read_count_}, + {"RingBufferFileSize", ring_buffer_file_size_}, + {"S3Config", + { + {"AccessKey", s3_config_.access_key}, + {"Bucket", s3_config_.bucket}, + {"CacheTimeoutSeconds", s3_config_.cache_timeout_secs}, + {"EncryptionToken", s3_config_.encryption_token}, + {"Region", s3_config_.region}, + {"SecretKey", s3_config_.secret_key}, + {"TimeoutMs", s3_config_.timeout_ms}, + {"URL", s3_config_.url}, + {"UsePathStyle", s3_config_.use_path_style}, + {"UseRegionInURL", s3_config_.use_region_in_url}, + }}, + {"Version", version_} + }; if (prov_ == provider_type::encrypt) { ret.erase("ChunkDownloaderTimeoutSeconds");