From 4dc9ea3acb25ed1522c7bafdcd5ed6212f8db249 Mon Sep 17 00:00:00 2001 From: bartfaik04 Date: Sat, 7 Jun 2025 14:41:31 +0200 Subject: [PATCH] Import groupfolders from configfile --- configs/ncsambawatcher.config.default | 3 ++- src/main.cpp | 1 + src/usermanager.h | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configs/ncsambawatcher.config.default b/configs/ncsambawatcher.config.default index ab252ea..d3ef548 100644 --- a/configs/ncsambawatcher.config.default +++ b/configs/ncsambawatcher.config.default @@ -1,2 +1,3 @@ NEXTCLOUD_CONTAINER_NAME=nextcloud -NEXTCLOUD_USERS=username1 username2 username3 \ No newline at end of file +NEXTCLOUD_USERS=username1 username2 username3 +NEXTCLOUD_GROUPFOLDER_IDS=1 2 3 4 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 1f29e15..4918ec7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -107,6 +107,7 @@ void scannerThreadFunc() int main() { manager.tryAddUsersFromConfig(cfm); + manager.tryAddGroupIDsFromConfig(cfm); std::thread readingThread(readingThreadFunc); std::thread scannerThread(scannerThreadFunc); diff --git a/src/usermanager.h b/src/usermanager.h index 4067ef7..adbccb9 100644 --- a/src/usermanager.h +++ b/src/usermanager.h @@ -136,6 +136,23 @@ public: std::cerr << "No user added from configuration file" << std::endl; } } + + void tryAddGroupIDsFromConfig(configfilemanager &cfm) + { + try + { + std::vector allids = splitString(cfm.at("NEXTCLOUD_GROUPFOLDER_IDS"), ' '); + + for (const std::string& id : allids) + { + addUser("__groupfolder/" + id); + } + } + catch (std::exception e) + { + std::cerr << "No groupfolder added from configuration file" << std::endl; + } + } }; #endif // _USERMAN_H \ No newline at end of file