Changeset 2957

Timestamp:

04/27/06 17:11:29 (3 years ago)

Author:

madcat

Message:

Support for object updates over cgcomm. Serverlist is now properly in sync with core (1s update rate).

Files:

• hydranode/hncgcomm/cgcomm.cpp (modified) (5 diffs)
• hydranode/hncgcomm/cgcomm.h (modified) (2 diffs)
• hydranode/hncore/cgcomm/sub_modules.cpp (modified) (5 diffs)
• hydranode/hncore/cgcomm/sub_modules.h (modified) (2 diffs)
• hydranode/hngui/plugins/donkeypage.cpp (modified) (4 diffs)
• hydranode/hngui/plugins/donkeypage.h (modified) (3 diffs)

hydranode/hncgcomm/cgcomm.cpp

@@ -1008 +1008 @@
-                                if (found) {
-                                        found->update(obj);
+                                        updatedObject(found);
-                                        obj = found;
-                                } else {
@@ -1014 +1015 @@
-                                lastObject = obj;
-                        }
-
-
+
+
+
+
-                        break;
-                }
@@ -1024 +1027 @@
-                        if (found) {
-                                found->update(child);
+                                updatedObject(found);
-                                child = found;
-                        } else {
@@ -1135 +1139 @@
-        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());
-}
-
-
+
+
+
-        std::ostringstream tmp;
-        Utils::putVal<uint8_t>(tmp, OC_GET);
@@ -1147 +1152 @@
-        Utils::putVal(tmp, name, name.size());
-        Utils::putVal<uint8_t>(tmp, recurse);
+        Utils::putVal<uint32_t>(tmp, timer);
-        sendPacket(tmp.str());
-}

hydranode/hncgcomm/cgcomm.h

@@ -559 +559 @@
-                 * Request an object to be sent
-                 *
-
-
-
+
+
+
+
-                 */
-                void getObject(
-                        ModulePtr mod, const std::string &name, 
-
+, uint32_t monitorTimer = 0
-                );
-                /**
@@ -608 +609 @@
-                 */
-                boost::signal<void (ObjectPtr)> updatedObject;
+
+                boost::signal<void (ObjectPtr)> addedObject;
+                boost::signal<void (ObjectPtr)> removedObject;
-        protected:
-                virtual void handle(std::istream &i);

hydranode/hncore/cgcomm/sub_modules.cpp

@@ -28 +28 @@
-Modules::Modules(
-        boost::function<void (const std::string&)> sendFunc
-
+, m_monitorObjTimer()
-        ModManager::instance().onModuleLoaded.connect(
-                boost::bind(&Modules::onLoaded, this, _1)
@@ -75 +75 @@
-
-void Modules::monitor(std::istream &i) {
-        uint32_t id = Utils::getVal<uint32_t>(i);
-        uint32_t timer = Utils::getVal<uint32_t>(i);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        m_monitorTimer = timer;
@@ -138 +129 @@
-        std::string name    = Utils::getVal<std::string>(i, len);
-        bool        recurse = Utils::getVal<uint8_t>(i);
+        uint32_t    timer   = Utils::getVal<uint32_t>(i);
-
-        logDebug("Received request for object " + name);
@@ -143 +135 @@
-        if (!obj) {
-                sendNotFound(id);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
@@ -238 +243 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

hydranode/hncore/cgcomm/sub_modules.h

@@ -40 +40 @@
-        uint32_t sendObject(Object *obj, bool recurse, std::ostream &tmp);
-        void sendNotFound(uint32_t id);
-
+
+
-        std::set<Object*> m_dirty;
-
@@ -48 +49 @@
-        std::string writeModule(ModuleBase *mod);
-
-
+, m_monitorObjTimer
-};
-

hydranode/hngui/plugins/donkeypage.cpp

@@ -124 +124 @@
-        while (i != p->end()) {
-                if (i->second->getName() == "ed2k") {
-
+, 1500
-                        break;
-                }
@@ -131 +131 @@
-        p->receivedObject.connect(
-                boost::bind(&DonkeyPage::gotServers, this, _1)
+        );
+        p->updatedObject.connect(
+                boost::bind(&DonkeyPage::updateObject, this, _1)
+        );
+        p->addedObject.connect(
+                boost::bind(&DonkeyPage::addObject, this, _1)
+        );
+        p->removedObject.connect(
+                boost::bind(&DonkeyPage::delObject, this, _1)
-        );
-}
@@ -141 +150 @@
-        Engine::Object::CIter i = obj->begin();
-        while (i != obj->end()) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                for (int j = 3; j < m_ui->serverList->columnCount(); ++j) {
-                        it->setTextAlignment(j, Qt::AlignRight);
@@ -147 +182 @@
-                it->setIcon(0, QIcon(":/transfer/icons/clear16"));
-
-i->second
+obj
-                int n = 0;
-i->second
+obj
-                        it->setText(n++, QString::fromStdString(*j));
-                        ++j;
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

hydranode/hngui/plugins/donkeypage.h

@@ -22 +22 @@
-#include <QWidget>
-#include <QTreeWidgetItem>
+#include <QMap>
-#include <hncgcomm/fwd.h>
-#include "htreewidget.h"
@@ -28 +29 @@
-        class DonkeyPage;
-}
-
-class DonkeyPage : public QWidget {
-        Q_OBJECT
-public:
-        DonkeyPage(QWidget *parent, Engine::Modules *p);
-private:
-        void gotServers(Engine::ObjectPtr obj);
-
-        Ui::DonkeyPage  *m_ui;
-        Engine::Modules *m_modules;
-};
-
-class ServerList : public HTreeWidget {
@@ -54 +44 @@
-};
-
+class DonkeyPage : public QWidget {
+        Q_OBJECT
+public:
+        DonkeyPage(QWidget *parent, Engine::Modules *p);
+private:
+        void gotServers(Engine::ObjectPtr obj);
+        void updateObject(Engine::ObjectPtr obj);
+        void addObject(Engine::ObjectPtr obj);
+        void delObject(Engine::ObjectPtr obj);
+
+        Ui::DonkeyPage  *m_ui;
+        Engine::Modules *m_modules;
+        QMap<quint32, ServerListItem*> m_list;
+};
-
-#endif