Changeset 7505

Timestamp:

Dec 26, 2008, 12:16:19 AM (12 years ago)

Author:

livings124

Message:

reuse existing TorrentGroup? object instead of recreating constantly (fixes #1415)

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• NSStringAdditions.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -2114 +2114 @@
     if (groupRows)
     {
+        NSArray * oldTorrentGroups = nil;
+        if ([fDisplayedTorrents count] > 0 && [[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
+            oldTorrentGroups = [NSArray arrayWithArray: fDisplayedTorrents];
+        
         [fDisplayedTorrents removeAllObjects];
         
@@ -2120 +2124 @@
         
         NSMutableArray * groupTorrents;
-        for (NSInteger i = 0, oldGroupValue = -2; i < [allTorrents count]; i++)
-        {
-            torrent = [allTorrents objectAtIndex: i];
+        NSInteger lastGroupValue = -2, currentOldGroupIndex = 0;
+        NSEnumerator * enumerator = [allTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+        {
             NSInteger groupValue = [torrent groupValue];
-            if (groupValue != oldGroupValue)
+            if (groupValue != lastGroupValue)
             {
-                TorrentGroup * group = [[TorrentGroup alloc] initWithGroup: groupValue];
+                TorrentGroup * group = nil;
+                
+                //try to see if the group already exists
+                for (; oldTorrentGroups && currentOldGroupIndex < [oldTorrentGroups count]; currentOldGroupIndex++)
+                {
+                    TorrentGroup * currentGroup = [oldTorrentGroups objectAtIndex: currentOldGroupIndex];
+                    if ([currentGroup groupIndex] == groupValue)
+                    {
+                        group = currentGroup;
+                        [[currentGroup torrents] removeAllObjects];
+                        break;
+                    }
+                }
+                
+                if (!group)
+                    group = [[[TorrentGroup alloc] initWithGroup: groupValue] autorelease];
+                [fDisplayedTorrents addObject: group];
+                
                 groupTorrents = [group torrents];
                 
-                [fDisplayedTorrents addObject: group];
-                [group release];
-                
-                oldGroupValue = groupValue;
+                lastGroupValue = groupValue;
             }
             

trunk/macosx/NSStringAdditions.m

@@ -148 +148 @@
 - (NSComparisonResult) compareFinder: (NSString *) string
 {
-    NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSCaseInsensitiveSearch | NSNumericSearch
-                                                            | NSWidthInsensitiveSearch | NSForcedOrderingSearch)
-                                                        : (NSCaseInsensitiveSearch | NSNumericSearch);
+    const NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter]
+                                ? (NSCaseInsensitiveSearch | NSNumericSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch)
+                                : (NSCaseInsensitiveSearch | NSNumericSearch);
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }
@@ -156 +156 @@
 - (NSComparisonResult) compareNumeric: (NSString *) string
 {
-    NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
+    const NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }