Changeset 2942

Timestamp:

04/26/06 21:01:22 (3 years ago)

Author:

madcat

Message:

Experimental support for passing Object's through cgcomm.
Experimental support for server list in user interface.

Files:

• hydranode/hnbase/fwd.h (modified) (1 diff)
• hydranode/hnbase/object.cpp (modified) (5 diffs)
• hydranode/hnbase/object.h (modified) (2 diffs)
• hydranode/hncgcomm/cgcomm.cpp (modified) (3 diffs)
• hydranode/hncgcomm/cgcomm.h (modified) (3 diffs)
• hydranode/hncgcomm/fwd.h (modified) (2 diffs)
• hydranode/hncore/cgcomm/opcodes.h (modified) (2 diffs)
• hydranode/hncore/cgcomm/sub_modules.cpp (modified) (3 diffs)
• hydranode/hncore/cgcomm/sub_modules.h (modified) (1 diff)
• hydranode/hncore/ed2k/ed2k.cpp (modified) (1 diff)
• hydranode/hncore/ed2k/ed2k.h (modified) (1 diff)
• hydranode/hncore/ed2k/server.cpp (modified) (1 diff)
• hydranode/hncore/ed2k/server.h (modified) (1 diff)
• hydranode/hncore/ed2k/serverlist.cpp (modified) (2 diffs)
• hydranode/hncore/ed2k/serverlist.h (modified) (1 diff)
• hydranode/hncore/fileslist.cpp (modified) (1 diff)
• hydranode/hncore/fileslist.h (modified) (1 diff)
• hydranode/hngui/Jamfile (modified) (1 diff)
• hydranode/hngui/home_homeactions.ui (modified) (1 diff)
• hydranode/hngui/hometabs.cpp (modified) (4 diffs)
• hydranode/hngui/hometabs.h (modified) (4 diffs)
• hydranode/hngui/myhydra.cpp (modified) (7 diffs)
• hydranode/hngui/myhydra.h (modified) (2 diffs)
• hydranode/hngui/plugins (added)
• hydranode/hngui/plugins/donkeypage.cpp (added)
• hydranode/hngui/plugins/donkeypage.h (added)
• hydranode/hngui/plugins/donkeypage_ui.ui (added)

hydranode/hnbase/fwd.h

@@ -35 +35 @@
-class UDPSocket;
-class IPV4Address;
+class Object;
-template<typename Impl, typename _ImplPtr> class Scheduler;
-template<typename T> class Range;

hydranode/hnbase/object.cpp

@@ -87 +87 @@
-        return m_name;
-}
-8
-
-
-8
+32
+
+
+32
-        logTrace(
-                TRACE_OBJECT,
@@ -97 +97 @@
-        return std::string();
-}
-8
+32
-        logTrace(
-                TRACE_OBJECT,
@@ -105 +105 @@
-        return std::string();
-}
-8
+32
-void Object::getValueChoices(std::vector<std::string>*) const {}
-8
-
-
-8
+32
+
+
+32
-        logTrace(TRACE_OBJECT,
-                boost::format("%s: Object does not have operations.") % m_name
@@ -126 +126 @@
-        );
-}
-8
+32
-        logTrace(
-                TRACE_OBJECT,
@@ -218 +218 @@
-                m_children = 0;
-        }
+        notify(child->m_id, OBJ_REMOVED);
-        // Virtual function call
-        onChildRemoved(child->m_id);

hydranode/hnbase/object.h

@@ -128 +128 @@
-        OBJ_MODIFIED = 0x01, //!< This object's data has been modified
-        OBJ_ADDED,           //!< An object has been added to this container
-si
+is
-        OBJ_DESTROY          //!< This object has been destroyed
-};
@@ -180 +180 @@
-        //@{
-        //! Retrieve the number of data fields within this object
-8
+32
-        //! Retrieve the data at specific field
-8
+32
-        //! Retrieve the data field name
-8
+32
-        //! Retrieve the data type of the field
-8
+32
-        //! Fill the passed vector with possible values for this field.
-        //! Generally used in conjuction with FieldType OFT_CHOICE
-        virtual void getValueChoices(std::vector<std::string> *cont) const;
-        //! Retrieve the number of operations for this object
-8
+32
-        //! Retrieve a specific operation description
-8
+32
-        //! Perform an operation with this object
-        virtual void doOper(const Operation &oper);
-        //! Modify the data at specific field
-8
+32
-        //@}
-

hydranode/hncgcomm/cgcomm.cpp

@@ -903 +903 @@
-}
-
+Object::Object(Modules *parent) : m_parentList(parent), m_id() {}
+
+void Object::doOper(
+        const std::string &opName,
+        const std::map<std::string, std::string> &args
+) {
+        m_parentList->doObjectOper(shared_from_this(), opName, args);
+}
+
+void Object::setData(uint8_t num, const std::string &newValue) {
+        m_parentList->setObjectData(shared_from_this(), num, newValue);
+}
+
+void Object::update(ObjectPtr obj) {
+        m_data     = obj->m_data;
+        m_childIds = obj->m_childIds;
+        m_name     = obj->m_name;
+        m_id       = obj->m_id;
+}
+
+void Object::findChildren() {
+        m_children.clear();
+        std::set<uint32_t>::iterator i = m_childIds.begin();
+        while (i != m_childIds.end()) {
+                ObjectPtr tmp = m_parentList->findObject(*i);
+                if (tmp) {
+                        m_children[*i] = tmp;
+                        tmp->m_parent = shared_from_this();
+                        tmp->findChildren();
+                }
+                ++i;
+        }
+}
+
+void Object::destroy() {
+        for (CIter i = begin(); i != end(); ++i) {
+                i->second->destroy();
+                m_children.erase(i->second->getId());
+                m_childIds.erase(i->second->getId());
+        }
+        onDestroyed(shared_from_this());
+}
+
-Modules::Modules(Main *parent) : SubSysBase(parent, SUB_MODULES) {}
-
@@ -941 +984 @@
-                        break;
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -988 +1117 @@
-void Modules::getList() {
-        std::ostringstream tmp;
+        Utils::putVal<uint8_t>(tmp, OC_LIST);
+        sendPacket(tmp.str());
+}
+
+void Modules::monitor(uint32_t interval) {
+        std::ostringstream tmp;
+        Utils::putVal<uint8_t>(tmp, OC_MONITOR);
+        Utils::putVal<uint32_t>(tmp, 0);
+        Utils::putVal<uint32_t>(tmp, interval);
+        sendPacket(tmp.str());
+}
+
+void Modules::getObject(ModulePtr mod, const std::string &name, bool recurse) {
+        std::ostringstream tmp;
-        Utils::putVal<uint8_t>(tmp, OC_GET);
-
-
-
-
+
+
+
+
+
+
+
+
-        std::ostringstream tmp;
-        Utils::putVal<uint8_t>(tmp, OC_MONITOR);
+        Utils::putVal<uint32_t>(tmp, obj->getId());
-        Utils::putVal<uint32_t>(tmp, interval);
-        sendPacket(tmp.str());
-}
-
+void Modules::doObjectOper(
+        ObjectPtr obj, const std::string &opName,
+        const std::map<std::string, std::string> &args
+) {
+        std::ostringstream tmp;
+        Utils::putVal<uint8_t>(tmp, OC_DOOPER);
+        Utils::putVal<uint32_t>(tmp, obj->getId());
+        Utils::putVal<uint16_t>(tmp, opName.size());
+        Utils::putVal(tmp, opName, opName.size());
+        Utils::putVal<uint16_t>(tmp, args.size());
+        std::map<std::string, std::string>::const_iterator i(args.begin());
+        while (i != args.end()) {
+                Utils::putVal<uint16_t>(tmp, i->first.size());
+                Utils::putVal(tmp, i->first, i->first.size());
+                Utils::putVal<uint16_t>(tmp, i->second.size());
+                Utils::putVal(tmp, i->second, i->second.size());
+                ++i;
+        }
+        sendPacket(tmp.str());
+}
+
+void Modules::setObjectData(ObjectPtr obj, uint8_t dNum, const std::string &v) {
+        std::ostringstream tmp;
+        Utils::putVal<uint8_t>(tmp, OC_SET);
+        Utils::putVal<uint32_t>(tmp, obj->getId());
+        Utils::putVal<uint8_t>(tmp, dNum);
+        Utils::putVal<uint16_t>(tmp, v.size());
+        Utils::putVal(tmp, v, v.size());
+        sendPacket(tmp.str());
+}
+
-} // end namespace Engine

hydranode/hncgcomm/cgcomm.h

@@ -488 +488 @@
-        };
-
+        class DLLEXPORT Object : public boost::enable_shared_from_this<Object> {
+        public:
+                typedef std::vector<std::string>::const_iterator DIter;
+                typedef std::map<uint32_t, ObjectPtr>::const_iterator CIter;
+
+                std::string getName()   const { return m_name;   }
+                uint32_t    getId()     const { return m_id;     }
+                ObjectPtr   getParent() const { return m_parent; }
+
+                size_t      dataCount()       const { return m_data.size();  }
+                std::string getData(size_t n) const { return m_data.at(n);   }
+                DIter       dbegin()          const { return m_data.begin(); }
+                DIter       dend()            const { return m_data.end();   }
+
+                size_t childCount() const { return m_children.size();  }
+                CIter  begin()      const { return m_children.begin(); }
+                CIter  end()        const { return m_children.end();   }
+
+                void doOper(
+                        const std::string &opName,
+                        const std::map<std::string, std::string> &args
+                );
+                void setData(uint8_t num, const std::string &newValue);
+
+                boost::signal<void (ObjectPtr, ObjectPtr)> childAdded;
+                boost::signal<void (ObjectPtr, ObjectPtr)> childRemoved;
+                boost::signal<void (ObjectPtr)> onDestroyed;
+        private:
+                friend class Modules;
+
+                ObjectPtr m_parent;
+                Modules *m_parentList;
+                std::vector<std::string> m_data;
+                std::map<uint32_t, ObjectPtr> m_children;
+                std::set<uint32_t> m_childIds;
+                std::string m_name;
+                uint32_t m_id;
+
+                void update(ObjectPtr obj);
+                void findChildren();
+                void destroy();
+
+                Object(Modules *parent);
+                Object(const Object&);
+                Object& operator=(const Object&);
+        };
+
-        class DLLEXPORT Modules : public SubSysBase {
-        public:
-                Modules(Main *parent);
+
+                // modules specific
-                void getList();
-                void monitor(uint32_t interval);
@@ -501 +550 @@
-                typedef std::map<uint32_t, ModulePtr>::const_iterator CIter;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        protected:
-                virtual void handle(std::istream &i);
@@ -508 +613 @@
-                std::map<uint32_t, ModulePtr> m_list;
-
+                std::map<uint32_t, ObjectPtr> m_objects;
+
-                ModulePtr readModule(std::istream &i);
+                ObjectPtr readObject(std::istream &i);
-        };
-

hydranode/hncgcomm/fwd.h

@@ -38 +38 @@
-        class Module;
-        class Modules;
+        class Object;
-
-        typedef boost::shared_ptr<SearchResult> SearchResultPtr;
@@ -43 +44 @@
-        typedef boost::shared_ptr<SharedFile>   SharedFilePtr;
-        typedef boost::shared_ptr<Module>       ModulePtr;
+        typedef boost::shared_ptr<Object>       ObjectPtr;
-
-        enum FileType {

hydranode/hncore/cgcomm/opcodes.h

@@ -62 +62 @@
-        OC_LINKS    = 0x18,  //!< Get/Send human-readable links (http, ed2k etc)
-        OC_GETLINK  = 0x19,  //!< Start a download from a link
-
+
+
+
+
+
+
+
-};
-
@@ -167 +173 @@
-
-enum {
-
+
+
+
-};
-

hydranode/hncore/cgcomm/sub_modules.cpp

@@ -40 +40 @@
-        uint8_t oc = Utils::getVal<uint8_t>(i);
-        switch (oc) {
-
-
+
+
+
+
+
-                default: break;
-        }
@@ -72 +75 @@
-
-void Modules::monitor(std::istream &i) {
+        uint32_t id = Utils::getVal<uint32_t>(i);
-        uint32_t timer = Utils::getVal<uint32_t>(i);
-
+ && id
-                Utils::timedCallback(
-                        boost::bind(&Modules::sendList, this, OC_UPDATE), timer
-                );
+        } else if (id) {
+                Object *obj = Object::findObject(id);
+                if (!obj) {
+                        sendNotFound(id);
+                } else {
+//                      obj->addHandler(
+//                              boost::bind(&Modules::objUpdated, this, _1)
+//                      );
+                }
-        }
-        m_monitorTimer = timer;
@@ -120 +133 @@
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

hydranode/hncore/cgcomm/sub_modules.h

@@ -33 +33 @@
-        virtual void handle(std::istream &i);
-private:
+        void getObject(std::istream &i);
+        void monitor(std::istream &i);
+        void doOper(std::istream &i);
+        void setData(std::istream &i);
+
+        uint32_t sendObject(Object *obj, bool recurse, std::ostream &tmp);
+        void sendNotFound(uint32_t id);
+        void objUpdated(Object *obj);
+        std::set<Object*> m_dirty;
+
-        void sendList(uint8_t oc = OC_LIST);
-        void monitor(std::istream &i);
-        void onLoaded(ModuleBase *mod);
-        void onUnloaded(ModuleBase *mod);

hydranode/hncore/ed2k/ed2k.cpp

@@ -402 +402 @@
-}
-
-8
+32
-        return ServerList::instance().getOperCount();
-}
-8
+32
-        return ServerList::instance().getOper(n);
-}

hydranode/hncore/ed2k/ed2k.h

@@ -109 +109 @@
-         */
-        //@{
-8
-8
+32
+32
-        virtual void doOper(const Object::Operation &op);
-        //@}

hydranode/hncore/ed2k/server.cpp

@@ -245 +245 @@
-MSVC_ONLY(;)
-
+uint32_t Server::getDataCount() const { return 17; }
+
+std::string Server::getData(uint32_t num) const {
+        using boost::lexical_cast;
+        switch (num) {
+                case  0: return m_name;
+                case  1: return m_addr.getStr();
+                case  2: return m_desc;
+                case  3: return boost::lexical_cast<std::string>(m_users);
+                case  4: return boost::lexical_cast<std::string>(m_files);
+                case  5: return m_dynip;
+                case  6: return m_version;
+                case  7: return boost::lexical_cast<std::string>(m_failedCount);
+                case  8: return boost::lexical_cast<std::string>(m_preference);
+                case  9: return boost::lexical_cast<std::string>(m_ping);
+                case 10: return boost::lexical_cast<std::string>(m_lastPing);
+                case 11: return boost::lexical_cast<std::string>(m_maxUsers);
+                case 12: return boost::lexical_cast<std::string>(m_softLimit);
+                case 13: return boost::lexical_cast<std::string>(m_hardLimit);
+                case 14: return boost::lexical_cast<std::string>(m_udpFlags);
+                case 15: return boost::lexical_cast<std::string>(m_tcpFlags);
+                case 16: return boost::lexical_cast<std::string>(m_lowIdUsers);
+                default: return std::string();
+        }
+}
+
+std::string Server::getFieldName(uint32_t num) const {
+        switch (num) {
+                case  0: return "Name";
+                case  1: return "Address";
+                case  2: return "Description";
+                case  3: return "Users";
+                case  4: return "Files";
+                case  5: return "Dynamic IP";
+                case  6: return "Version";
+                case  7: return "Failed count";
+                case  8: return "Preference";
+                case  9: return "Ping";
+                case 10: return "Last ping";
+                case 11: return "Max users";
+                case 12: return "Soft file limit";
+                case 13: return "Hard file limit";
+                case 14: return "UDP flags";
+                case 15: return "TCP flags";
+                case 16: return "Low ID users";
+                default: return std::string();
+        }
+}
+
-} // namespace Detail
-} // end namespace Donkey

hydranode/hncore/ed2k/server.h

@@ -123 +123 @@
-        void setCurrentSearch(SearchPtr p)    { m_globSearch = p;      }
-        //@}
+
+        virtual uint32_t getDataCount() const;
+        virtual std::string getData(uint32_t num) const;
+        virtual std::string getFieldName(uint32_t num) const;
-private:
-        friend class ::Donkey::ServerList;

hydranode/hncore/ed2k/serverlist.cpp

@@ -1188 +1188 @@
-}
-
-8
+32
-#ifndef NDEBUG
-        return 5; 
@@ -1196 +1196 @@
-}
-
-8
+32
-        if (n == 0) {
-                Operation op("connect", true);

hydranode/hncore/ed2k/serverlist.h

@@ -308 +308 @@
-        //! @name Various operations
-        //@{
-8
-8
+32
+32
-        virtual void doOper(const Object::Operation &op);
-        //@}

hydranode/hncore/fileslist.cpp

@@ -388 +388 @@
-
-// Customization virtual functions
-8
+32
-        return 1;
-}
-
-8
+32
-        switch (n) {
-                case 0: {

hydranode/hncore/fileslist.h

@@ -313 +313 @@
-        //! @name Make operations/data available for Object hierarcy
-        //@{
-8
-8
+32
+32
-        virtual void doOper(const Operation &oper);
-        //@}

hydranode/hngui/Jamfile

@@ -37 +37 @@
-           /qt4//QtGui /qt4//QtNetwork /qt4//QtXml
-          ../extra//boost_signals ../extra//boost_date_time
+        
+        # plugins (built-in currently due to lack of support for plugin loading)
+          plugins/donkeypage.cpp plugins/donkeypage.h plugins/donkeypage_ui.ui
-        : <include>. 
-  &