Changeset 18

Timestamp:

10/05/08 12:57:50 (16 years ago)

Author:

jon

Message:

Re-implemented caching in a less stupid way. Still want to get it intercepting content updates before I declare #2 closed, though. Also did some modest refactoring.

Location:

Trunk

Files:

• ABSortByLogSizePlugin.m (modified) (1 diff)
• AILogSizeSort.h (modified) (1 diff)
• AILogSizeSort.m (modified) (7 diffs)
• Info.plist (modified) (3 diffs)

Trunk/ABSortByLogSizePlugin.m

@@ -46 +46 @@
 - (NSString *)pluginVersion
 {
-        return @"1.0";
+        return @"1.1";
 }
 

Trunk/AILogSizeSort.h

@@ -27 +27 @@
 @interface AILogSizeSort : AISortController
 {
+        NSMutableDictionary *logSizeCache;
 }
 
-+(unsigned long long)getContactLogSize:(AIListContact *)listObject;
+-(unsigned long long)getCachedLogSize:(AIListContact *)listContact;
++(unsigned long long)getContactLogSize:(AIListContact *)listContact;
 
 @end

Trunk/AILogSizeSort.m

@@ -32 +32 @@
 #import <Adium/AIMetaContact.h>
 
+#import <Adium/ESDebugAILog.h>
+
 @implementation AILogSizeSort
 
@@ -41 +43 @@
 - (void)didBecomeActiveFirstTime
 {
+        AILog(@"Sort by log size controller became active for first time.");
+        logSizeCache = [[NSMutableDictionary alloc] init];
+        AILog(@"%@", logSizeCache);
 }
 
@@ -105 +110 @@
 
 /*!
- * Allow users to manually sort groups.
+ * @brief Allow users to manually sort groups
  */
 -(BOOL)canSortManually
@@ -112 +117 @@
 }
 
-/**
+-(unsigned long long)getCachedLogSize:(AIListContact *)listContact
+{
+        AILogWithSignature(@"Getting cached log size for %@/%@.", [[listContact account] explicitFormattedUID], [listContact UID]);
+        
+        if([logSizeCache valueForKey:[[listContact account] explicitFormattedUID]] == nil)
+        {
+                [logSizeCache setValue:[[NSMutableDictionary alloc] init] forKey:[[listContact account] explicitFormattedUID]];
+        }
+        
+        NSMutableDictionary *accountDictionary = [logSizeCache valueForKey:[[listContact account] explicitFormattedUID]];
+        
+        if([accountDictionary valueForKey:[listContact UID]] == nil)
+        {
+                AILogWithSignature(@"\tNo cache hit.");
+                [accountDictionary setValue:[NSNumber numberWithUnsignedLongLong:[AILogSizeSort getContactLogSize:listContact]] forKey: [listContact UID]];
+        }
+        
+        AILogWithSignature(@"\tLog file size: %@", [accountDictionary valueForKey:[listContact UID]]);
+        return [[accountDictionary valueForKey:[listContact UID]] unsignedLongLongValue];
+}
+
+/*!
+ * @brief Returns the total aggregate log size for a contact
+ *
  * Returns the total aggregate log size for a contact.  For meta-contacts, the
  * total log file size of all sub-contacts is returned.  If no log exists or if
  * something else goes wrong, 0 is returned.
  *
- * @param listObject an AIListContact for which to retrieve a total log file size
+ * @param listContact an AIListContact for which to retrieve a total log file size
  * @return the total log file size in bytes or 0 if an error occurred
  */
-+(unsigned long long)getContactLogSize:(AIListContact *)listObject
++(unsigned long long)getContactLogSize:(AIListContact *)listContact
 {
         NSFileManager *fileManager = [NSFileManager defaultManager];
         
-        if([listObject isMemberOfClass:[AIMetaContact class]])
+        if([listContact isMemberOfClass:[AIMetaContact class]])
         {
                 // Recurse through all sub-contacts
-                
                 id contact;
                 unsigned long long size = 0;
                 
-                NSEnumerator *contactEnumerator = [[listObject listContacts] objectEnumerator];
+                NSEnumerator *contactEnumerator = [[(AIMetaContact *)listContact listContacts] objectEnumerator];
 
                 while(contact = [contactEnumerator nextObject])
@@ -143 +170 @@
         {
                 // Find the path to the directory containing the log files for this contact
-                NSString *path = [[AILoggerPlugin logBasePath] stringByAppendingPathComponent:[AILoggerPlugin relativePathForLogWithObject:[listObject UID] onAccount: [listObject account]]];
+                NSString *path = [[AILoggerPlugin logBasePath] stringByAppendingPathComponent:[AILoggerPlugin relativePathForLogWithObject:[listContact UID] onAccount: [listContact account]]];
                 
                 // Grab an enumerator for all log files for this contact
@@ -171 +198 @@
 #pragma mark Sorting
 /*!
- * @brief Alphabetical sort
+ * @brief Sort by log size
  */
 int logSizeSort(id objectA, id objectB, BOOL groups)
@@ -188 +215 @@
         }
         
-        unsigned long long sizeA = [AILogSizeSort getContactLogSize:objectA];
-        unsigned long long sizeB = [AILogSizeSort getContactLogSize:objectB];
-        
+        // Get a reference to one and only AILogSizeSort instance.  If this sorting method is being
+        // called, it should always be the case that AILogSizeSort is the active sort controller.
+        AISortController *sortController = [[adium contactController] activeSortController];
+        
+        unsigned long long sizeA = 0;
+        unsigned long long sizeB = 0;
+        
+        if([sortController isMemberOfClass:[AILogSizeSort class]])
+        {
+                sizeA = [(AILogSizeSort *)sortController getCachedLogSize:objectA];
+                sizeB = [(AILogSizeSort *)sortController getCachedLogSize:objectB];
+        }
+        else
+        {
+                sizeA = [AILogSizeSort getContactLogSize:objectA];
+                sizeB = [AILogSizeSort getContactLogSize:objectB];
+        }
+
         if(sizeB == sizeA)
         {

Trunk/Info.plist

@@ -3 +3 @@
 <plist version="1.0">
 <dict>
+        <key>AIMinimumAdiumVersionRequirement</key>
+        <string>1.3</string>
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
@@ -10 +12 @@
         <string></string>
         <key>CFBundleIdentifier</key>
-        <string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+        <string>com.eatthepath.${PRODUCT_NAME:identifier}</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
@@ -20 +22 @@
         <string>AdIM</string>
         <key>CFBundleVersion</key>
-        <string>1.0</string>
+        <string>1.1</string>
         <key>NSPrincipalClass</key>
         <string>ABSortByLogSizePlugin</string>
-        <key>AIMinimumAdiumVersionRequirement</key>
-        <string>1.3</string>
 </dict>
 </plist>