X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8141c8c568b83be890c8d8d3953e976ad0ad8ad1..f4333737c7e347efe9258ccf85c1237e03be619c:/projects/stargazer/admins_impl.h?ds=sidebyside

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index a1ca0f98..9c443a77 100644
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -22,68 +22,62 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
- /*
- $Revision: 1.10 $
- $Date: 2010/10/04 20:17:12 $
- $Author: faust $
- */
-
-#ifndef ADMINS_IMPL_H
-#define ADMINS_IMPL_H
-
-#include <pthread.h>
-
-#include <list>
-#include <map>
-#include <string>
+#pragma once
 
 #include "stg/admins.h"
 #include "stg/admin.h"
-#include "stg/locker.h"
 #include "stg/store.h"
-#include "stg/noncopyable.h"
 #include "stg/logger.h"
-#include "admin_impl.h"
 
-class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
-public:
-    ADMINS_IMPL(STORE * st);
-    virtual ~ADMINS_IMPL() {}
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <mutex>
+
+namespace STG
+{
+
+class AdminsImpl : public Admins
+{
+    public:
+        explicit AdminsImpl(Store& st);
+
+        AdminsImpl(const AdminsImpl&) = delete;
+        AdminsImpl& operator=(const AdminsImpl&) = delete;
 
-    int           Add(const std::string & login, const ADMIN * admin);
-    int           Del(const std::string & login, const ADMIN * admin);
-    int           Change(const ADMIN_CONF & ac, const ADMIN * admin);
-    void          PrintAdmins() const;
-    const ADMIN * GetSysAdmin() const { return &stg; }
-    const ADMIN * GetNoAdmin() const { return &noAdmin; }
-    bool          Find(const std::string & l, ADMIN ** admin);
-    bool          Exists(const std::string & login) const;
-    bool          Correct(const std::string & login,
-                          const std::string & password,
-                          ADMIN ** admin);
-    const std::string & GetStrError() const { return strError; }
+        int          add(const std::string& login, const Admin& admin) override;
+        int          del(const std::string& login, const Admin& admin) override;
+        int          change(const AdminConf& ac, const Admin& admin) override;
+        const Admin& sysAdmin() const override { return m_stg; }
+        const Admin& noAdmin() const override { return m_noAdmin; }
+        bool         find(const std::string& login, Admin** admin) override;
+        bool         exists(const std::string& login) const override;
+        bool         correct(const std::string& login,
+                             const std::string& password,
+                             Admin** admin) override;
 
-    size_t        Count() const { return data.size(); }
+        const std::string& strError() const override { return m_strError; }
 
-    int OpenSearch() const;
-    int SearchNext(int, ADMIN_CONF * ac) const;
-    int CloseSearch(int) const;
+        size_t       count() const override { return m_data.size(); }
 
-private:
-    typedef list<ADMIN_IMPL>::iterator admin_iter;
-    typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
+        void fmap(std::function<void (const Admin&)> callback) const
+        {
+            for (const auto& admin : m_data)
+                callback(admin);
+        }
 
-    int             Read();
+    private:
+        void         read();
+        auto         find(const std::string& login) { return std::find(m_data.begin(), m_data.end(), Admin(Priv(0), login, "")); }
+        auto         find(const std::string& login) const { return std::find(m_data.begin(), m_data.end(), Admin(Priv(0), login, "")); }
 
-    ADMIN_IMPL              stg;
-    ADMIN_IMPL              noAdmin;
-    std::list<ADMIN_IMPL>   data;
-    STORE *                 store;
-    STG_LOGGER &            WriteServLog;
-    mutable std::map<int, const_admin_iter> searchDescriptors;
-    mutable unsigned int    handle;
-    mutable pthread_mutex_t mutex;
-    std::string             strError;
+        Admin              m_stg;
+        Admin              m_noAdmin;
+        std::vector<Admin> m_data;
+        Store&             m_store;
+        Logger&            WriteServLog;
+        mutable std::mutex m_mutex;
+        std::string        m_strError;
 };
 
-#endif
+}