Ticket #429: sorting.2.diff

macosx/Torrent.h

@@ -191 +191 @@
 
 - (float) downloadRate;
 - (float) uploadRate;
+- (float) totalRate;
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;
 - (uint64_t) downloadedTotal;

macosx/Torrent.m

@@ -1111 +1111 @@
     return fStat->rateUpload;
 }
 
+- (float) totalRate
+{
+    return fStat->rateDownload + fStat->rateUpload;
+}
+
 - (uint64_t) haveVerified
 {
     return fStat->haveValid;
@@ -1472 +1477 @@
                 fDateCompleted = [dateCompleted retain];
     if (dateActivity)
                 fDateActivity = [dateActivity retain];
+    else
+        fDateActivity = [fDateAdded copy];
         
     fRatioSetting = ratioSetting ? [ratioSetting intValue] : NSMixedState;
     fRatioLimit = ratioLimit ? [ratioLimit floatValue] : [fDefaults floatForKey: @"RatioLimit"];

macosx/Controller.m

@@ -1632 +1632 @@
         descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
     else if ([sortType isEqualToString: SORT_ACTIVITY])
     {
-        NSSortDescriptor * activityDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateActivityOrAdd" ascending: !asc]
-                                                    autorelease];
+        NSSortDescriptor * addedDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateAdded" ascending: !asc]
+                                                 autorelease];
         
-        descriptors = [[NSArray alloc] initWithObjects: activityDescriptor, orderDescriptor, nil];
+        NSSortDescriptor * activityAmountDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc]
+                                              autorelease];
+        
+        NSSortDescriptor * stalledDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"stalledMinutes" ascending: !asc]
+                                                       autorelease];
+        
+        descriptors = [[NSArray alloc] initWithObjects: activityAmountDescriptor, addedDescriptor, orderDescriptor, nil];
     }
     else
     {