Changeset 7 for Trunk/AILogSizeSort.m

Timestamp:

09/28/08 23:47:08 (16 years ago)

Author:

jon

Message:

Victory! Abandoned caching in favor of direct comparison since the comparator method doesn't get called in the context of an AISortController instance. Looks like it's working great, though.

Files:

• Trunk/AILogSizeSort.m (modified) (2 diffs)

Trunk/AILogSizeSort.m

@@ -30 +30 @@
 - (void)didBecomeActiveFirstTime
 {
-        logSizeCache = [NSMutableDictionary dictionaryWithCapacity:64];
-        
-        NSEnumerator *groupEnumerator = [[[[adium contactController] contactList] listContacts] objectEnumerator];
-        
-        id group, contact;
-        
-    while(group = [groupEnumerator nextObject])
-        {
-                NSEnumerator *contactEnumerator = [[group listContacts] objectEnumerator];
-                
-                NSMutableDictionary *sizes = [NSMutableDictionary dictionaryWithCapacity:64];
-                
-                while(contact = [contactEnumerator nextObject])
-                {
-                        [sizes setValue:[NSNumber numberWithUnsignedLongLong:[AILogSizeSort getContactLogSize:contact]] forKey:[contact UID]];
-                }
-
-                [logSizeCache setValue:sizes forKey:[group UID]];
-    }
-        
-        AILog(@"Log size cache:");
-        AILog(@"%@", logSizeCache);
 }
 
@@ -121 +99 @@
 int logSizeSort(id objectA, id objectB, BOOL groups)
 {
-        return NSOrderedAscending;
+        if(groups)
+        {
+                // Keep groups in manual order (borrowed from ESStatusSort)
+                if ([objectA orderIndex] > [objectB orderIndex])
+                {
+                        return NSOrderedDescending;
+                }
+                else
+                {
+                        return NSOrderedAscending;
+                }
+        }
+        
+        
+        NSNumber *sizeA = [NSNumber numberWithUnsignedLongLong:[AILogSizeSort getContactLogSize:objectA]];
+        NSNumber *sizeB = [NSNumber numberWithUnsignedLongLong:[AILogSizeSort getContactLogSize:objectB]];
+        
+        if([sizeB compare:sizeA] == NSOrderedSame)
+        {
+                return [[objectA displayName] compare:[objectB displayName]];
+        }
+        else
+        {
+                return [sizeB compare:sizeA];
+        }
 }