From bb5eed31e2297bcda5af77e4ff926c313cd26b19 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 2 Aug 2024 12:30:11 -0600 Subject: [PATCH 01/20] added NX_PRINT outputs for all error returns --- src/plugin/settings/engine.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index c0a3de8..271a830 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -238,6 +238,7 @@ Result Engine::settingsReceived() } else { + NX_PRINT << "OpenSSL Error: Unable to generate secure passphrase" << std::endl; return error(ErrorCode::internalError, "OpenSSL Error: Unable to generate secure passphrase"); } @@ -257,6 +258,7 @@ Result Engine::settingsReceived() fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -269,12 +271,14 @@ Result Engine::settingsReceived() // On Linux we need to create the folder if it does not yet exist if (!fs::create_directory(mountDir, errCode)) { + NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { + NX_PRINT << "Unable to set mount directory permissions with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permissions with error: " + errCode.message()); } @@ -290,6 +294,7 @@ Result Engine::settingsReceived() fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -299,12 +304,14 @@ Result Engine::settingsReceived() { if (!fs::create_directories(fileCacheDir, errCode)) { + NX_PRINT << "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message()); } fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { + NX_PRINT << "Unable to set file cache directory permissions with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to set file cache directory permissions with error: " + errCode.message()); } @@ -312,6 +319,7 @@ Result Engine::settingsReceived() if (!cfManager.isInstalled()) { + NX_PRINT << "Cloudfuse is not installed" << std::endl; return error(ErrorCode::internalError, "Cloudfuse is not installed"); } @@ -324,6 +332,7 @@ Result Engine::settingsReceived() if (dryGenConfig.errCode != 0) { + NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output << std::endl; return error(ErrorCode::internalError, "Unable to generate config file with error: " + dryGenConfig.output); } @@ -340,6 +349,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Bucket Error", "Error with provided cloud bucket: " + parseCloudfuseError(dryRunRet.output)); + NX_PRINT << "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output)); } @@ -348,6 +358,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent( IPluginDiagnosticEvent::Level::error, "Plugin Credential or Endpoint Error", "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); + NX_PRINT << "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -356,6 +367,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Endpoint Error", "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -364,6 +376,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Secret Error", "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); } @@ -372,6 +385,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Error", "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); + NX_PRINT << "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } @@ -384,6 +398,7 @@ Result Engine::settingsReceived() if (mountRet.errCode != 0) { + NX_PRINT << "Unable to launch mount with error: " + mountRet.output << std::endl; return error(ErrorCode::internalError, "Unable to launch mount with error: " + mountRet.output); } @@ -397,6 +412,7 @@ Result Engine::settingsReceived() if (retryCount == 10) { + NX_PRINT << "Cloudfuse was not able to successfully mount" << std::endl; return error(ErrorCode::internalError, "Cloudfuse was not able to successfully mount"); } } From 18ddd3b47d72ae96a862054d45239b5fb40300f9 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 2 Aug 2024 12:52:18 -0600 Subject: [PATCH 02/20] added NX_PRINT lines for general info --- src/plugin/settings/engine.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 271a830..fed6667 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -235,6 +235,7 @@ Result Engine::settingsReceived() BIO_get_mem_ptr(b64, &bptr); passphrase = std::string(bptr->data, bptr->length); + NX_PRINT << "Generated passphrase for config file" << std::endl; } else { @@ -245,6 +246,7 @@ Result Engine::settingsReceived() std::error_code errCode; // Create mount directory if it does not exist + NX_PRINT << "Creating mount directory if it does not exist" << std::endl; if (fs::exists(mountDir)) { // Unmmount before mounting @@ -252,6 +254,7 @@ Result Engine::settingsReceived() #if defined(__linux__) // On Linux we need to check the folder has the correct permissions + NX_PRINT << "checking " + mountDir + "has the correct permissions" << std::endl; fs::file_status s = fs::status(mountDir); if ((s.permissions() & fs::perms::all) != fs::perms::all) { @@ -269,6 +272,7 @@ Result Engine::settingsReceived() { #if defined(__linux__) // On Linux we need to create the folder if it does not yet exist + NX_PRINT << "creating the folder if it does not yet exist" << std::endl; if (!fs::create_directory(mountDir, errCode)) { NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; @@ -286,6 +290,7 @@ Result Engine::settingsReceived() } // Create file cache if it does not exist + NX_PRINT << "creating file cache if it does not exist" << std::endl; if (fs::exists(fileCacheDir)) { fs::file_status s = fs::status(fileCacheDir); @@ -324,8 +329,10 @@ Result Engine::settingsReceived() } #if defined(__linux__) + NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) + NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(keyId, secretKey, endpointRegion, endpointUrl, bucketName, passphrase); #endif @@ -337,8 +344,10 @@ Result Engine::settingsReceived() } #if defined(__linux__) + NX_PRINT << "spawning process from dryRun" << std::endl; const processReturn dryRunRet = cfManager.dryRun(keyId, secretKey, passphrase); #elif defined(_WIN32) + NX_PRINT << "spawning process from dryRun" << std::endl; const processReturn dryRunRet = cfManager.dryRun(passphrase); #endif @@ -391,8 +400,10 @@ Result Engine::settingsReceived() } #if defined(__linux__) + NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); #elif defined(_WIN32) +NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(passphrase); #endif From 1924124b3b1ba4674ecb5be08bf7cf615cedd003 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 2 Aug 2024 12:55:46 -0600 Subject: [PATCH 03/20] added another error NX_PRINT line before return --- src/plugin/settings/engine.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index fed6667..2a2e82d 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -403,7 +403,7 @@ Result Engine::settingsReceived() NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); #elif defined(_WIN32) -NX_PRINT << "spawning process from mount" << std::endl; + NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(passphrase); #endif @@ -432,8 +432,11 @@ NX_PRINT << "spawning process from mount" << std::endl; NX_PRINT << "Settings have not changed." << std::endl; } - if (!processActiveSettings(&model, &values)) + if (!processActiveSettings(&model, &values)) + { + NX_PRINT << "Unable to process the active settings section" << std::endl; return error(ErrorCode::internalError, "Unable to process the active settings section"); + } auto settingsResponse = new SettingsResponse(); settingsResponse->setModel(makePtr(Json(model).dump())); From 01765cabcb09ec62f90c60c8b817d59289972876 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:15:05 -0600 Subject: [PATCH 04/20] Removed "generated passphrase" print --- src/plugin/settings/engine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 2a2e82d..37bdc11 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -235,7 +235,6 @@ Result Engine::settingsReceived() BIO_get_mem_ptr(b64, &bptr); passphrase = std::string(bptr->data, bptr->length); - NX_PRINT << "Generated passphrase for config file" << std::endl; } else { From 460197b79b044c86b481b8502f8d50a05590d78c Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:17:00 -0600 Subject: [PATCH 05/20] dropped checking mountDir has correct permissions print --- src/plugin/settings/engine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 37bdc11..80b89da 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -253,7 +253,6 @@ Result Engine::settingsReceived() #if defined(__linux__) // On Linux we need to check the folder has the correct permissions - NX_PRINT << "checking " + mountDir + "has the correct permissions" << std::endl; fs::file_status s = fs::status(mountDir); if ((s.permissions() & fs::perms::all) != fs::perms::all) { From 0f82967ed7d0a96e6690cac26869ae41d5b28eae Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:19:10 -0600 Subject: [PATCH 06/20] added "the mount directory does not exist" to print --- src/plugin/settings/engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 80b89da..814a018 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -273,7 +273,7 @@ Result Engine::settingsReceived() NX_PRINT << "creating the folder if it does not yet exist" << std::endl; if (!fs::create_directory(mountDir, errCode)) { - NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; + NX_PRINT << "The mount directory does not exist. Unable to create mount directory with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } From d7177ab45a82f0484563b67e013b979f4d0929b8 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:22:24 -0600 Subject: [PATCH 07/20] moved print to else block and modified it to "creating file cache since it does not exist" --- src/plugin/settings/engine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 814a018..f8a1470 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -288,7 +288,7 @@ Result Engine::settingsReceived() } // Create file cache if it does not exist - NX_PRINT << "creating file cache if it does not exist" << std::endl; + if (fs::exists(fileCacheDir)) { fs::file_status s = fs::status(fileCacheDir); @@ -305,6 +305,7 @@ Result Engine::settingsReceived() } else { + NX_PRINT << "creating file cache since it does not exist" << std::endl; if (!fs::create_directories(fileCacheDir, errCode)) { NX_PRINT << "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message() << std::endl; From 5dcbc8528841b5b3e28b3554518f7100bea64dd8 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:24:25 -0600 Subject: [PATCH 08/20] moved spawn prococess prints out of platform specific conditional code blocks --- src/plugin/settings/engine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index f8a1470..fb9cc45 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -327,11 +327,10 @@ Result Engine::settingsReceived() return error(ErrorCode::internalError, "Cloudfuse is not installed"); } +NX_PRINT << "spawning process from genS3Config" << std::endl; #if defined(__linux__) - NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) - NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(keyId, secretKey, endpointRegion, endpointUrl, bucketName, passphrase); #endif From 3b703eaba960f36fd8df26b7243b2c0c50c6cd25 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Tue, 13 Aug 2024 16:25:38 -0600 Subject: [PATCH 09/20] added print for error on active settings --- src/plugin/settings/engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index fb9cc45..39c16f8 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -465,6 +465,7 @@ void Engine::doGetSettingsOnActiveSettingChange(Result Date: Wed, 14 Aug 2024 16:53:49 -0600 Subject: [PATCH 10/20] adjusted mount directory error print --- src/plugin/settings/engine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 39c16f8..2dfefee 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -270,10 +270,9 @@ Result Engine::settingsReceived() { #if defined(__linux__) // On Linux we need to create the folder if it does not yet exist - NX_PRINT << "creating the folder if it does not yet exist" << std::endl; + NX_PRINT << "creating the folder since it does not yet exist" << std::endl; if (!fs::create_directory(mountDir, errCode)) { - NX_PRINT << "The mount directory does not exist. Unable to create mount directory with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } From d7a1bfcbf0d9a76d9a4cd958b62bb84253c51e57 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 10:34:27 -0600 Subject: [PATCH 11/20] added error logging for mounting dir --- src/plugin/settings/engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 2dfefee..0ffc8cd 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -273,6 +273,7 @@ Result Engine::settingsReceived() NX_PRINT << "creating the folder since it does not yet exist" << std::endl; if (!fs::create_directory(mountDir, errCode)) { + NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } From 4f9c63aba5c0c2ac684cc08cad75ada737643820 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 10:36:45 -0600 Subject: [PATCH 12/20] moved Print into if code block --- src/plugin/settings/engine.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 0ffc8cd..beff29a 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -325,10 +325,9 @@ Result Engine::settingsReceived() { NX_PRINT << "Cloudfuse is not installed" << std::endl; return error(ErrorCode::internalError, "Cloudfuse is not installed"); - } - -NX_PRINT << "spawning process from genS3Config" << std::endl; + } #if defined(__linux__) + NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) const processReturn dryGenConfig = From a5f551a3f709aeaf5750312f90fd115a19170b5e Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 10:39:56 -0600 Subject: [PATCH 13/20] corrected print location above if condtion and in function scope --- src/plugin/settings/engine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index beff29a..6bb9270 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -326,8 +326,8 @@ Result Engine::settingsReceived() NX_PRINT << "Cloudfuse is not installed" << std::endl; return error(ErrorCode::internalError, "Cloudfuse is not installed"); } + NX_PRINT << "spawning process from genS3Config" << std::endl; #if defined(__linux__) - NX_PRINT << "spawning process from genS3Config" << std::endl; const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) const processReturn dryGenConfig = @@ -395,7 +395,7 @@ Result Engine::settingsReceived() return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } - + NX_PRINT << "spawning process from genS3Config" << std::endl; #if defined(__linux__) NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); From 9ccf1659ddacb48bac24e64f27313c609ae1dad4 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 10:42:27 -0600 Subject: [PATCH 14/20] pulled print out from platform flags --- src/plugin/settings/engine.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 6bb9270..9002fda 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -395,12 +395,10 @@ Result Engine::settingsReceived() return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } - NX_PRINT << "spawning process from genS3Config" << std::endl; + NX_PRINT << "spawning process from mount" << std::endl; #if defined(__linux__) - NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); #elif defined(_WIN32) - NX_PRINT << "spawning process from mount" << std::endl; const processReturn mountRet = cfManager.mount(passphrase); #endif From 1c25782b090166240e51c21952287a87453db7e9 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 10:52:29 -0600 Subject: [PATCH 15/20] pulled print out of platform flags for dryRun --- src/plugin/settings/engine.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 9002fda..2c7e4c5 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -339,12 +339,10 @@ Result Engine::settingsReceived() NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output << std::endl; return error(ErrorCode::internalError, "Unable to generate config file with error: " + dryGenConfig.output); } - + NX_PRINT << "spawning process from dryRun" << std::endl; #if defined(__linux__) - NX_PRINT << "spawning process from dryRun" << std::endl; const processReturn dryRunRet = cfManager.dryRun(keyId, secretKey, passphrase); #elif defined(_WIN32) - NX_PRINT << "spawning process from dryRun" << std::endl; const processReturn dryRunRet = cfManager.dryRun(passphrase); #endif From 20f938d2be31fc48476a24e6f5febc092c272459 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 11:11:37 -0600 Subject: [PATCH 16/20] ran clang-format on file --- src/plugin/settings/engine.cpp | 50 ++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index d6d9d07..11bb6fa 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -263,7 +263,8 @@ Result Engine::settingsReceived() fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() + << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -277,14 +278,14 @@ Result Engine::settingsReceived() NX_PRINT << "creating the folder since it does not yet exist" << std::endl; if (!fs::create_directory(mountDir, errCode)) { - NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permissions with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to set mount directory permissions with error: " + errCode.message() << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permissions with error: " + errCode.message()); } @@ -292,7 +293,7 @@ Result Engine::settingsReceived() } // Create file cache if it does not exist - + if (fs::exists(fileCacheDir)) { fs::file_status s = fs::status(fileCacheDir); @@ -301,7 +302,8 @@ Result Engine::settingsReceived() fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() + << std::endl; return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -312,14 +314,17 @@ Result Engine::settingsReceived() NX_PRINT << "creating file cache since it does not exist" << std::endl; if (!fs::create_directories(fileCacheDir, errCode)) { - NX_PRINT << "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to create file cache directory " + fileCacheDir + + " with error: " + errCode.message() + << std::endl; return error(ErrorCode::internalError, "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message()); } fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set file cache directory permissions with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to set file cache directory permissions with error: " + errCode.message() + << std::endl; return error(ErrorCode::internalError, "Unable to set file cache directory permissions with error: " + errCode.message()); } @@ -327,10 +332,10 @@ Result Engine::settingsReceived() if (!cfManager.isInstalled()) { - NX_PRINT << "Cloudfuse is not installed" << std::endl; + NX_PRINT << "Cloudfuse is not installed" << std::endl; return error(ErrorCode::internalError, "Cloudfuse is not installed"); - } - NX_PRINT << "spawning process from genS3Config" << std::endl; + } + NX_PRINT << "spawning process from genS3Config" << std::endl; #if defined(__linux__) const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) @@ -340,10 +345,10 @@ Result Engine::settingsReceived() if (dryGenConfig.errCode != 0) { - NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output << std::endl; + NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output << std::endl; return error(ErrorCode::internalError, "Unable to generate config file with error: " + dryGenConfig.output); } - NX_PRINT << "spawning process from dryRun" << std::endl; + NX_PRINT << "spawning process from dryRun" << std::endl; #if defined(__linux__) const processReturn dryRunRet = cfManager.dryRun(keyId, secretKey, passphrase); #elif defined(_WIN32) @@ -357,7 +362,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Bucket Error", "Error with provided cloud bucket: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output)); } @@ -366,7 +371,9 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent( IPluginDiagnosticEvent::Level::error, "Plugin Credential or Endpoint Error", "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Error with cloud credentials or incorrect endpoint: " + + parseCloudfuseError(dryRunRet.output) + << std::endl; return error(ErrorCode::otherError, "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -375,7 +382,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Endpoint Error", "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -384,7 +391,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Secret Error", "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; return error(ErrorCode::otherError, "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); } @@ -393,11 +400,12 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Error", "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output) + << std::endl; return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } - NX_PRINT << "spawning process from mount" << std::endl; + NX_PRINT << "spawning process from mount" << std::endl; #if defined(__linux__) const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); #elif defined(_WIN32) @@ -406,7 +414,7 @@ Result Engine::settingsReceived() if (mountRet.errCode != 0) { - NX_PRINT << "Unable to launch mount with error: " + mountRet.output << std::endl; + NX_PRINT << "Unable to launch mount with error: " + mountRet.output << std::endl; return error(ErrorCode::internalError, "Unable to launch mount with error: " + mountRet.output); } @@ -420,7 +428,7 @@ Result Engine::settingsReceived() if (retryCount == 10) { - NX_PRINT << "Cloudfuse was not able to successfully mount" << std::endl; + NX_PRINT << "Cloudfuse was not able to successfully mount" << std::endl; return error(ErrorCode::internalError, "Cloudfuse was not able to successfully mount"); } } @@ -429,7 +437,7 @@ Result Engine::settingsReceived() NX_PRINT << "Settings have not changed." << std::endl; } - if (!processActiveSettings(&model, &values)) + if (!processActiveSettings(&model, &values)) { NX_PRINT << "Unable to process the active settings section" << std::endl; return error(ErrorCode::internalError, "Unable to process the active settings section"); From 458089db43d123d4c1713870f57df1ff32fdfcea Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 11:13:50 -0600 Subject: [PATCH 17/20] ran clang-format on file in question for github action --- src/lib/cloudfuse/child_process_windows.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cloudfuse/child_process_windows.cpp b/src/lib/cloudfuse/child_process_windows.cpp index d5ddf9b..e651896 100644 --- a/src/lib/cloudfuse/child_process_windows.cpp +++ b/src/lib/cloudfuse/child_process_windows.cpp @@ -72,7 +72,7 @@ CloudfuseMngr::CloudfuseMngr() { std::string systemName = getSystemName(); // NOTE: increment the version number when the config template changes - templateVersionString= "template-version: 0.1"; + templateVersionString = "template-version: 0.1"; std::string config_template = templateVersionString + R"( allow-other: true logging: From a160f05e023c928c7ef9f6343c0ea757d3343c06 Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 11:30:21 -0600 Subject: [PATCH 18/20] removed std:endl on all NX_PRINT lines --- src/plugin/settings/engine.cpp | 59 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 11bb6fa..9472f87 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -43,7 +43,7 @@ using namespace nx::kit; Engine::Engine(Plugin *plugin) : nx::sdk::analytics::Engine(NX_DEBUG_ENABLE_OUTPUT, plugin->instanceId()), m_plugin(plugin), cfManager() { - NX_PRINT << "cloudfuse Engine::Engine" << std::endl; + NX_PRINT << "cloudfuse Engine::Engine"; for (const auto &entry : kActiveSettingsRules) { const ActiveSettingsBuilder::ActiveSettingKey key = entry.first; @@ -61,18 +61,17 @@ Engine::Engine(Plugin *plugin) Engine::~Engine() { - NX_PRINT << "cloudfuse Engine::~Engine unmount cloudfuse" << std::endl; + NX_PRINT << "cloudfuse Engine::~Engine unmount cloudfuse"; const processReturn unmountRet = cfManager.unmount(); if (unmountRet.errCode != 0) { - NX_PRINT << "cloudfuse Engine::~Engine failed to unmount cloudfuse with error: " + unmountRet.output - << std::endl; + NX_PRINT << "cloudfuse Engine::~Engine failed to unmount cloudfuse with error: " + unmountRet.output; } } void Engine::doObtainDeviceAgent(Result *outResult, const IDeviceInfo *deviceInfo) { - NX_PRINT << "cloudfuse Engine::doObtainDeviceAgent" << std::endl; + NX_PRINT << "cloudfuse Engine::doObtainDeviceAgent"; *outResult = new DeviceAgent(this, deviceInfo); } @@ -92,7 +91,7 @@ static std::string buildCapabilities() std::string Engine::manifestString() const { - NX_PRINT << "cloudfuse Engine::manifestString" << std::endl; + NX_PRINT << "cloudfuse Engine::manifestString"; std::string result = /*suppress newline*/ 1 + (const char *)R"json( { "capabilities": ")json" + @@ -109,7 +108,7 @@ std::string Engine::manifestString() const bool Engine::processActiveSettings(Json::object *model, std::map *values, const std::vector &settingIdsToUpdate) const { - NX_PRINT << "cloudfuse Engine::processActiveSettings" << std::endl; + NX_PRINT << "cloudfuse Engine::processActiveSettings"; Json::array items = (*model)[kItems].array_items(); auto activeSettingsGroupBoxIt = std::find_if(items.begin(), items.end(), [](Json &item) { @@ -196,7 +195,7 @@ bool Engine::settingsChanged() Result Engine::settingsReceived() { - NX_PRINT << "cloudfuse Engine::settingsReceived" << std::endl; + NX_PRINT << "cloudfuse Engine::settingsReceived"; std::string parseError; Json::object model = Json::parse(kEngineSettingsModel, parseError).object_items(); @@ -208,7 +207,7 @@ Result Engine::settingsReceived() updatePrevSettings(values); if (mountRequired) { - NX_PRINT << "Values changed" << std::endl; + NX_PRINT << "Values changed"; const std::string keyId = values[kKeyIdTextFieldId]; const std::string secretKey = values[kSecretKeyPasswordFieldId]; const std::string endpointUrl = values[kEndpointUrlTextFieldId]; @@ -238,14 +237,14 @@ Result Engine::settingsReceived() } else { - NX_PRINT << "OpenSSL Error: Unable to generate secure passphrase" << std::endl; + NX_PRINT << "OpenSSL Error: Unable to generate secure passphrase"; return error(ErrorCode::internalError, "OpenSSL Error: Unable to generate secure passphrase"); } std::error_code errCode; // Create mount directory if it does not exist - NX_PRINT << "Creating mount directory if it does not exist" << std::endl; + NX_PRINT << "Creating mount directory if it does not exist"; if (fs::exists(mountDir)) { // Unmount before mounting @@ -275,17 +274,17 @@ Result Engine::settingsReceived() { #if defined(__linux__) // On Linux we need to create the folder if it does not yet exist - NX_PRINT << "creating the folder since it does not yet exist" << std::endl; + NX_PRINT << "creating the folder since it does not yet exist"; if (!fs::create_directory(mountDir, errCode)) { - NX_PRINT << "Unable to create mount directory with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to create mount directory with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to create mount directory with error: " + errCode.message()); } fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permissions with error: " + errCode.message() << std::endl; + NX_PRINT << "Unable to set mount directory permissions with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to set mount directory permissions with error: " + errCode.message()); } @@ -311,7 +310,7 @@ Result Engine::settingsReceived() } else { - NX_PRINT << "creating file cache since it does not exist" << std::endl; + NX_PRINT << "creating file cache since it does not exist"; if (!fs::create_directories(fileCacheDir, errCode)) { NX_PRINT << "Unable to create file cache directory " + fileCacheDir + @@ -332,10 +331,10 @@ Result Engine::settingsReceived() if (!cfManager.isInstalled()) { - NX_PRINT << "Cloudfuse is not installed" << std::endl; + NX_PRINT << "Cloudfuse is not installed"; return error(ErrorCode::internalError, "Cloudfuse is not installed"); } - NX_PRINT << "spawning process from genS3Config" << std::endl; + NX_PRINT << "spawning process from genS3Config"; #if defined(__linux__) const processReturn dryGenConfig = cfManager.genS3Config(endpointRegion, endpointUrl, bucketName, passphrase); #elif defined(_WIN32) @@ -345,10 +344,10 @@ Result Engine::settingsReceived() if (dryGenConfig.errCode != 0) { - NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output << std::endl; + NX_PRINT << "Unable to generate config file with error: " + dryGenConfig.output; return error(ErrorCode::internalError, "Unable to generate config file with error: " + dryGenConfig.output); } - NX_PRINT << "spawning process from dryRun" << std::endl; + NX_PRINT << "spawning process from dryRun"; #if defined(__linux__) const processReturn dryRunRet = cfManager.dryRun(keyId, secretKey, passphrase); #elif defined(_WIN32) @@ -362,7 +361,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Bucket Error", "Error with provided cloud bucket: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output); return error(ErrorCode::otherError, "Unable to authenticate with bucket: " + parseCloudfuseError(dryRunRet.output)); } @@ -382,7 +381,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Endpoint Error", "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output); return error(ErrorCode::otherError, "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -391,7 +390,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Secret Error", "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output) << std::endl; + NX_PRINT << "Error with provided endpoint: " + parseCloudfuseError(dryRunRet.output); return error(ErrorCode::otherError, "Secret key provided is incorrect: " + parseCloudfuseError(dryRunRet.output)); } @@ -405,7 +404,7 @@ Result Engine::settingsReceived() return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } - NX_PRINT << "spawning process from mount" << std::endl; + NX_PRINT << "spawning process from mount"; #if defined(__linux__) const processReturn mountRet = cfManager.mount(keyId, secretKey, passphrase); #elif defined(_WIN32) @@ -414,7 +413,7 @@ Result Engine::settingsReceived() if (mountRet.errCode != 0) { - NX_PRINT << "Unable to launch mount with error: " + mountRet.output << std::endl; + NX_PRINT << "Unable to launch mount with error: " + mountRet.output; return error(ErrorCode::internalError, "Unable to launch mount with error: " + mountRet.output); } @@ -428,18 +427,18 @@ Result Engine::settingsReceived() if (retryCount == 10) { - NX_PRINT << "Cloudfuse was not able to successfully mount" << std::endl; + NX_PRINT << "Cloudfuse was not able to successfully mount"; return error(ErrorCode::internalError, "Cloudfuse was not able to successfully mount"); } } else { - NX_PRINT << "Settings have not changed." << std::endl; + NX_PRINT << "Settings have not changed."; } if (!processActiveSettings(&model, &values)) { - NX_PRINT << "Unable to process the active settings section" << std::endl; + NX_PRINT << "Unable to process the active settings section"; return error(ErrorCode::internalError, "Unable to process the active settings section"); } @@ -452,7 +451,7 @@ Result Engine::settingsReceived() void Engine::getPluginSideSettings(Result *outResult) const { - NX_PRINT << "cloudfuse Engine::getPluginSideSettings" << std::endl; + NX_PRINT << "cloudfuse Engine::getPluginSideSettings"; auto settingsResponse = new SettingsResponse(); settingsResponse->setValue(kEnginePluginSideSetting, kEnginePluginSideSettingValue); @@ -462,7 +461,7 @@ void Engine::getPluginSideSettings(Result *outResult) void Engine::doGetSettingsOnActiveSettingChange(Result *outResult, const IActiveSettingChangedAction *activeSettingChangedAction) { - NX_PRINT << "cloudfuse Engine::doGetSettingsOnActiveSettingChange" << std::endl; + NX_PRINT << "cloudfuse Engine::doGetSettingsOnActiveSettingChange"; std::string parseError; Json::object model = Json::parse(activeSettingChangedAction->settingsModel(), parseError).object_items(); @@ -472,7 +471,7 @@ void Engine::doGetSettingsOnActiveSettingChange(Result Date: Fri, 16 Aug 2024 11:35:47 -0600 Subject: [PATCH 19/20] removed remaining std::endl of NX_PRINT lines --- src/plugin/settings/engine.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 9472f87..8cb704b 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -262,8 +262,7 @@ Result Engine::settingsReceived() fs::permissions(mountDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() - << std::endl; + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -301,8 +300,7 @@ Result Engine::settingsReceived() fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message() - << std::endl; + NX_PRINT << "Unable to set mount directory permission with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to set mount directory permission with error: " + errCode.message()); } @@ -314,16 +312,14 @@ Result Engine::settingsReceived() if (!fs::create_directories(fileCacheDir, errCode)) { NX_PRINT << "Unable to create file cache directory " + fileCacheDir + - " with error: " + errCode.message() - << std::endl; + " with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to create file cache directory " + fileCacheDir + " with error: " + errCode.message()); } fs::permissions(fileCacheDir, fs::perms::all, fs::perm_options::add, errCode); if (errCode) { - NX_PRINT << "Unable to set file cache directory permissions with error: " + errCode.message() - << std::endl; + NX_PRINT << "Unable to set file cache directory permissions with error: " + errCode.message(); return error(ErrorCode::internalError, "Unable to set file cache directory permissions with error: " + errCode.message()); } @@ -371,8 +367,7 @@ Result Engine::settingsReceived() IPluginDiagnosticEvent::Level::error, "Plugin Credential or Endpoint Error", "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); NX_PRINT << "Error with cloud credentials or incorrect endpoint: " + - parseCloudfuseError(dryRunRet.output) - << std::endl; + parseCloudfuseError(dryRunRet.output); return error(ErrorCode::otherError, "Error with cloud credentials or incorrect endpoint: " + parseCloudfuseError(dryRunRet.output)); } @@ -399,8 +394,7 @@ Result Engine::settingsReceived() Engine::pushPluginDiagnosticEvent(IPluginDiagnosticEvent::Level::error, "Plugin Error", "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); - NX_PRINT << "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output) - << std::endl; + NX_PRINT << "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output); return error(ErrorCode::otherError, "Unable to validate credentials with error: " + parseCloudfuseError(dryRunRet.output)); } From dbdbb4ce45fa43878fa6efe660a57de262e4e38e Mon Sep 17 00:00:00 2001 From: David Habinsky Date: Fri, 16 Aug 2024 11:42:49 -0600 Subject: [PATCH 20/20] removed empty line --- src/plugin/settings/engine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugin/settings/engine.cpp b/src/plugin/settings/engine.cpp index 8cb704b..20f438a 100644 --- a/src/plugin/settings/engine.cpp +++ b/src/plugin/settings/engine.cpp @@ -291,7 +291,6 @@ Result Engine::settingsReceived() } // Create file cache if it does not exist - if (fs::exists(fileCacheDir)) { fs::file_status s = fs::status(fileCacheDir);