From 0a9fe8f4f887a85fe1e44c0846c4eb3a8ba3dcd3 Mon Sep 17 00:00:00 2001 From: bartfaik04 Date: Sat, 7 Jun 2025 11:21:51 +0200 Subject: [PATCH] Fix replacement --- src/configfilemanager.h | 1 + src/main.cpp | 2 +- src/usermanager.cpp | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/configfilemanager.h b/src/configfilemanager.h index d9e671a..4487ef2 100644 --- a/src/configfilemanager.h +++ b/src/configfilemanager.h @@ -29,6 +29,7 @@ public: while(!is.eof()) { std::getline(is, tmp); + std::cout << tmp << std::endl; if (tmp.at(0) == '#') // ignore comments continue; diff --git a/src/main.cpp b/src/main.cpp index a8b5894..60e7691 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,10 +14,10 @@ #include "usermanager.h" #include "configfilemanager.h" +configfilemanager cfm; userManager manager; std::condition_variable cv; std::mutex mtx; -configfilemanager cfm; std::vector splitString(const std::string& str, char delimiter = '|') { diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 86d4ace..163d5b2 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -5,6 +5,7 @@ std::string userManager::getScanCommandFromUser(const std::string &user, configf std::string contname = cfm.at("NEXTCLOUD_CONTAINER_NAME"); std::string baseCommand; std::string userCommand; + std::string placeholder("%1%"); if (user.find("__groupfolder") != std::string::npos) { @@ -18,8 +19,8 @@ std::string userManager::getScanCommandFromUser(const std::string &user, configf } size_t pos = 0; - while ((pos = baseCommand.find("%1%", pos)) != std::string::npos) { - baseCommand.replace(pos, contname.length(), contname); + while ((pos = baseCommand.find(placeholder, pos)) != std::string::npos) { + baseCommand.replace(pos, placeholder.length(), contname); pos += contname.length(); // Move past the replacement }