Changeset 629

Timestamp:

03/11/07 01:03:36 (18 months ago)

Author:

daelstorm

Message:

Send StatusMessages? to clients when browsed or userinfo is requested; connected theReloadShares interface message; changed debug message types in direntry to 'museek.direntry'; added buddy shares instance

Location:

branches/newnet/museekd/museekd

Files:

• direntry.cpp (modified) (7 diffs)
• ifacemanager.cpp (modified) (3 diffs)
• ifacemanager.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• museekd.cpp (modified) (2 diffs)
• museekd.h (modified) (1 diff)
• peersocket.cpp (modified) (3 diffs)
• peersocket.h (modified) (1 diff)

branches/newnet/museekd/museekd/direntry.cpp

@@ -45 +45 @@
 
 void DirEntry::fold(DirEntry* folded) {
-        NNLOG("museek.debug", "fold %s", folded->path.c_str());
+        NNLOG("museek.direntry", "fold %s", folded->path.c_str());
         
         if (! fake) {
@@ -125 +125 @@
 
 queue<unsigned char> DirEntry::pack() {
-        NNLOG("museek.debug", "pack");
+        NNLOG("museek.direntry", "pack");
         
         queue<unsigned char> data;
@@ -158 +158 @@
 
 void DirEntry::save(const string& fn) {
-        NNLOG("museek.debug", "save %s", fn.c_str());
+        NNLOG("museek.direntry", "save %s", fn.c_str());
         
         queue<unsigned char> data = pack();
@@ -178 +178 @@
 
 void DirEntry::unpack(queue<unsigned char>& data) {
-        NNLOG("museek.debug", "unpack %d", data.size());
+        NNLOG("museek.direntry", "unpack %d", data.size());
         
         for(map<string, DirEntry*>::iterator it = folders.begin(); it != folders.end(); ++it)
@@ -211 +211 @@
 
 void DirEntry::load(const string& fn) {
-        NNLOG("museek.debug", "load %s", fn.c_str());
+        NNLOG("museek.direntry", "load %s", fn.c_str());
         
         struct stat s;
@@ -237 +237 @@
 
 void DirEntry::network_pack(queue<unsigned char>& data) {
-        NNLOG("museek.debug", "network pack <...>");
+        NNLOG("museek.direntry", "network pack <...>");
         
         _pack(data, (uint32)folders.size());
@@ -261 +261 @@
 
 void DirEntry::flatten(map<string, FileEntry>& filemap) {
-        NNLOG("museek.debug", "flatten <...>");
+        NNLOG("museek.direntry", "flatten <...>");
         
         map<string, DirEntry*>::iterator dit = folders.begin();

branches/newnet/museekd/museekd/ifacemanager.cpp

@@ -244 +244 @@
   socket->connectToServerEvent.connect(this, &IfaceManager::onIfaceConnectToServer);
   socket->disconnectFromServerEvent.connect(this, &IfaceManager::onIfaceDisconnectFromServer);
-
+  socket->reloadSharesEvent.connect(this, &IfaceManager::onIfaceReloadShares);
   // Send the login challenge
   socket->setChallenge(challenge());
@@ -522 +522 @@
 }
 
+
+void
+Museek::IfaceManager::onIfaceReloadShares(const IReloadShares * message)
+{
+  museekd()->LoadShares();
+}
+
 void
 Museek::IfaceManager::onServerLoggedInStateChanged(bool loggedIn)
@@ -775 +782 @@
   m_PendingShares.erase(it);
 }
+
+void
+Museek::IfaceManager::sendStatusMessage(bool type, std::string message)
+{
+  SEND_ALL(IStatusMessage(type, message));
+}

branches/newnet/museekd/museekd/ifacemanager.h

@@ -45 +45 @@
   {
   public:
+    void sendStatusMessage(bool type, std::string message);
     enum
     {
@@ -106 +107 @@
     void onIfaceConnectToServer(const IConnectServer * message);
     void onIfaceDisconnectFromServer(const IDisconnectServer * message);
+    void onIfaceReloadShares(const IReloadShares * message);
 
     // Server event handlers:

branches/newnet/museekd/museekd/main.cpp

@@ -55 +55 @@
   NNLOG.enable("museek.note");
   NNLOG.enable("museek.debug");
+//   NNLOG.enable("museek.direntry");
   NNLOG.enable("museek.messages.iface");
   NNLOG.enable("museek.messages.server");

branches/newnet/museekd/museekd/museekd.cpp

@@ -51 +51 @@
   m_Ifaces = new IfaceManager(this);
   m_Shares = new SharesDatabase(this);
+  m_BuddyShares = new SharesDatabase(this);
   
 }
@@ -58 +59 @@
   std::string shares = m_Config->get("shares", "database");
   if (! shares.empty())
-    m_Shares->load(m_Config->get("shares", "database"), "normal");
+    m_Shares->load(shares, "normal");
+  std::string bshares = m_Config->get("buddyshares", "database");
+  if (! bshares.empty())
+    m_Shares->load(bshares, "buddy");
 }
 

branches/newnet/museekd/museekd/museekd.h

@@ -101 +101 @@
       return m_Shares;
     }
+    
+    SharesDatabase * buddyshares() const
+    {
+      return m_BuddyShares;
+    }
+    
     void LoadShares();
   private:

branches/newnet/museekd/museekd/peersocket.cpp

@@ -25 +25 @@
 #include "servermanager.h"
 #include "peermanager.h"
+#include "ifacemanager.h"
 #include "downloadmanager.h"
 #include "sharesdatabase.h"
@@ -220 +221 @@
   PInfoReply reply(text, imgdata, 0, 0, false);
   sendMessage(reply.make_network_packet());
+  m_Museekd->ifaces()->sendStatusMessage(true, std::string ("User Info sent to: ") + m_User );
 }
 
@@ -225 +227 @@
 Museek::PeerSocket::onSharesRequested(const PSharesRequest *)
 {
-  
-//   std::vector<uchar> vdata(4, (uchar)0);
-//   PSharesReply reply(vdata);
   PSharesReply reply(m_Museekd->shares()->shares());
   sendMessage(reply.make_network_packet());
   
+  m_Museekd->ifaces()->sendStatusMessage(true, std::string ("Shares sent to: ") + m_User );
 }
 

branches/newnet/museekd/museekd/peersocket.h

@@ -28 +28 @@
 {
   class Museekd;
+  class IfaceManager;
   class HandshakeSocket;