Changeset 6282 for trunk/licq/src/icqd-srv.cpp

Timestamp:

06/14/08 03:45:40 (7 months ago)

Author:

flynd

Message:

Rewrote group handling to be full objects instead of just two lists. New groups have persistant ids that doesn't change when groups are added, removed or resorted.

Files:

• trunk/licq/src/icqd-srv.cpp (modified) (7 diffs)

trunk/licq/src/icqd-srv.cpp

@@ -118 +118 @@
 {
   // Export groups
-  GroupList groups;
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  GroupIDList *gID = gUserManager.LockGroupIDList(LOCK_R);
-
-  for (unsigned int i = 0; i < gID->size(); i++)
-  {
-    if ((*gID)[i] == 0)
-    {
-      groups.push_back((*g)[i]);
-    }
-  }
-
-  gUserManager.UnlockGroupList();
-  gUserManager.UnlockGroupIDList();
-
-  if (groups.size())
+  GroupNameMap groups;
+  FOR_EACH_GROUP_START(LOCK_R)
+  {
+    if (pGroup->icqGroupId() == 0)
+      groups[pGroup->id()] = pGroup->name();
+  }
+  FOR_EACH_GROUP_END
+
+  if (groups.size() > 0)
     icqExportGroups(groups);
 
@@ -224 +217 @@
   if (!UseServerContactList())  return;
   CSrvPacketTcp *pReply;
-  
+
   pReply = new CPU_UpdateToServerList("", ICQ_ROSTxGROUP, 0);
   addToModifyUsers(pReply->SubSequence(), "");
   gLog.Info(tr("%sUpdating top level group.\n"), L_SRVxSTR);
   SendExpectEvent_Server(0, pReply, NULL);
- 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  GroupIDList *gID = gUserManager.LockGroupIDList(LOCK_R);
-
-  for (unsigned int i = 0; i < gID->size(); i++)
-  {
-    if ((*gID)[i])
-    {
-      pReply = new CPU_UpdateToServerList((*g)[i], ICQ_ROSTxGROUP,
-        (*gID)[i]);
-      gLog.Info(tr("%sUpdating group %s.\n"), L_SRVxSTR, (*g)[i]);   
+
+  FOR_EACH_GROUP_START(LOCK_R)
+  {
+    unsigned int gid = pGroup->icqGroupId();
+    if (gid != 0)
+    {
+      const char* gname = pGroup->name().c_str();
+      pReply = new CPU_UpdateToServerList(gname, ICQ_ROSTxGROUP, gid);
+      gLog.Info(tr("%sUpdating group %s.\n"), L_SRVxSTR, gname);
       addToModifyUsers(pReply->SubSequence(), "");
       SendExpectEvent_Server(0, pReply, NULL);
     }
   }
-
-  gUserManager.UnlockGroupList();
-  gUserManager.UnlockGroupIDList();       
+  FOR_EACH_GROUP_END
 }
 
@@ -310 +299 @@
 
 //-----icqExportGroups----------------------------------------------------------
-void CICQDaemon::icqExportGroups(GroupList &groups)
+void CICQDaemon::icqExportGroups(const GroupNameMap& groups)
 {
   if (!UseServerContactList()) return;
@@ -4283 +4272 @@
                 }
               }
-              
+
               u->SetIgnoreList(nType == ICQ_ROSTxIGNORE);
-              
+
               if (!isOnList)
               {
@@ -4292 +4281 @@
               }
 
+              // Save GSID, SID and group memberships
+              u->SaveLicqInfo();
+
               PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_GENERAL,
                 u->IdString(), u->PPID()));
@@ -4314 +4306 @@
           {
             if (!UseServerContactList()) break; 
-                      
+
             if (szId[0] != '\0' && nTag != 0)
             {
               // Rename the group if we have it already or else add it
               unsigned short nGroup = gUserManager.GetGroupFromID(nTag);
-              if (nGroup == gUserManager.NumGroups())
+              if (nGroup == 0)
               {
                 if (!gUserManager.AddGroup(szUnicodeName, nTag))
@@ -4532 +4524 @@
 
 
-              GroupList *g = gUserManager.LockGroupList(LOCK_R);
+              LicqGroup* group = gUserManager.FetchGroup(n, LOCK_R);
               std::string groupName;
-              if (e->ExtraInfo() == 0)
+              if (e->ExtraInfo() == 0 || group == NULL)
                 groupName = ""; // top level
               else
-                groupName = (*g)[n-1];
-              gUserManager.UnlockGroupList();
+                groupName = group->name();
+              if (group != NULL)
+                gUserManager.DropGroup(group);
 
               // Start editing server list