update(Client): Refactor ClientManager class

MasterLaplace · Jan 8, 2024 · 0d22af7 · 0d22af7
1 parent 11d1587
commit 0d22af7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/Flakkari/Server/Client/ClientManager.cpp b/Flakkari/Server/Client/ClientManager.cpp
@@ -11,9 +11,11 @@
 
 namespace Flakkari {
 
+
 std::shared_ptr<ClientManager> ClientManager::_instance = nullptr;
 
-std::shared_ptr<ClientManager> ClientManager::getInstance() {
+std::shared_ptr<ClientManager> ClientManager::getInstance()
+{
     if (!_instance)
         _instance = std::make_shared<ClientManager>();
     return _instance;
@@ -24,16 +26,17 @@ void ClientManager::addClient(std::shared_ptr<Network::Address> client)
     auto &clients = getInstance()->_clients;
     if (clients.find(client->toString().value_or("")) == clients.end()) {
         clients[client->toString().value_or("")] = std::make_shared<Client>(client);
-        FLAKKARI_LOG_LOG("Client " + client->toString().value_or("") + " connected");
+        FLAKKARI_LOG_LOG("Client " + client->toString().value_or("Unknown") + " connected");
     } else
         clients[client->toString().value_or("")]->keepAlive();
 }
 
 void ClientManager::removeClient(std::shared_ptr<Network::Address> client)
 {
     auto &clients = getInstance()->_clients;
-    if (clients.find(client->toString().value_or("")) != clients.end())
+    if (clients.find(client->toString().value_or("")) != clients.end()) {
         clients.erase(client->toString().value_or(""));
+    }
 }
 
 void ClientManager::checkInactiveClients()
@@ -49,6 +52,10 @@ void ClientManager::checkInactiveClients()
     }
 }
 
+std::shared_ptr<Client> ClientManager::getClient(std::shared_ptr<Network::Address> client) {
+    return getInstance()->_clients[client->toString().value_or("")];
+}
+
 std::shared_ptr<Client> ClientManager::getClient(std::string ip) {
     return getInstance()->_clients[ip];
 }

diff --git a/Flakkari/Server/Client/ClientManager.hpp b/Flakkari/Server/Client/ClientManager.hpp
@@ -40,9 +40,8 @@ namespace Flakkari {
  * @code
  * #include "ClientManager.hpp"
  *
- * Flakkari::ClientManager clientManager;
- * clientManager.addClient(std::make_shared<Flakkari::Network::Address>("...")>);
- * clientManager.checkInactiveClients();
+ * Flakkari::ClientManager::addClient(std::make_shared<Flakkari::Network::Address>("...")>);
+ * Flakkari::ClientManager::checkInactiveClients();
  * @endcode
  */
 class ClientManager {
@@ -102,6 +101,14 @@ class ClientManager {
          */
         static void checkInactiveClients();
 
+        /**
+         * @brief Get the Client object
+         *
+         * @param client  The client's address
+         * @return std::shared_ptr<Client>  The client object
+         */
+        static std::shared_ptr<Client> getClient(std::shared_ptr<Network::Address> client);
+
         /**
          * @brief Get the Client object
          *