Changeset 7794

Timestamp:

Jan 24, 2009, 7:07:25 PM (12 years ago)

Author:

livings124

Message:

determine queue order solely on order in the fTorrent array - this gets around potential problems when relaunching with less torrents

Location:

trunk/macosx

Files:

• Controller.m (modified) (10 diffs)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (8 diffs)

trunk/macosx/Controller.m

@@ -842 +842 @@
     if (add)
     {
-        [torrent setOrderValue: [fTorrents count]]; //ensure that queue order is always sequential
-        
         [torrent update];
         [fTorrents addObject: torrent];
@@ -1217 +1215 @@
     [fTorrents removeObjectsInArray: torrents];
     
-    NSInteger lowestOrderValue = NSIntegerMax;
     for (Torrent * torrent in torrents)
     {
@@ -1228 +1225 @@
             [torrent trashTorrent];
         
-        lowestOrderValue = MIN(lowestOrderValue, [torrent orderValue]);
-        
         [torrent closeRemoveTorrent];
     }
     
     [torrents release];
-
-    //reset the order values if necessary
-    if (lowestOrderValue < [fTorrents count])
-    {
-        for (NSInteger i = lowestOrderValue; i < [fTorrents count]; i++)
-            [[fTorrents objectAtIndex: i] setOrderValue: i];
-    }
     
     [fTableView deselectAll: nil];
@@ -1723 +1711 @@
 {
     NSMutableArray * history = [NSMutableArray arrayWithCapacity: [fTorrents count]];
-
+    
     for (Torrent * torrent in fTorrents)
         [history addObject: [torrent history]];
-
+    
     [history writeToFile: [NSHomeDirectory() stringByAppendingPathComponent: SUPPORT_FOLDER] atomically: YES];
 }
@@ -1797 +1785 @@
     const BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
     
-    NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"orderValue" ascending: asc] autorelease];
-    
-    NSArray * descriptors;
-    if ([sortType isEqualToString: SORT_ORDER])
-        descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
-    else if ([sortType isEqualToString: SORT_NAME])
+    NSArray * descriptors = nil;
+    if ([sortType isEqualToString: SORT_NAME])
     {
         NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"name" ascending: asc
                                                 selector: @selector(compareFinder:)] autorelease];
         
-        descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, orderDescriptor, nil];
+        descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, nil];
     }
     else if ([sortType isEqualToString: SORT_STATE])
@@ -1818 +1802 @@
         
         descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, progressDescriptor, ratioDescriptor,
-                                                            nameDescriptor, orderDescriptor, nil];
+                                                            nameDescriptor, nil];
     }
     else if ([sortType isEqualToString: SORT_PROGRESS])
@@ -1830 +1814 @@
         
         descriptors = [[NSArray alloc] initWithObjects: progressDescriptor, ratioProgressDescriptor, ratioDescriptor,
-                                                            nameDescriptor, orderDescriptor, nil];
+                                                            nameDescriptor, nil];
     }
     else if ([sortType isEqualToString: SORT_TRACKER])
@@ -1839 +1823 @@
                                                 selector: @selector(localizedCaseInsensitiveCompare:)] autorelease];
         
-        descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, orderDescriptor, nil];
+        descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, nil];
     }
     else if ([sortType isEqualToString: SORT_ACTIVITY])
@@ -1847 +1831 @@
                                                     autorelease];
         
-        descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, orderDescriptor, nil];
-    }
-    else
+        descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, nil];
+    }
+    else if ([sortType isEqualToString: SORT_DATE])
     {
         NSSortDescriptor * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateAdded" ascending: asc] autorelease];
     
-        descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, orderDescriptor, nil];
-    }
+        descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nil];
+    }
+    else; //no need to sort by queue order
     
     //actually sort
-    if ([fDefaults boolForKey: @"SortByGroup"])
-    {
-        for (TorrentGroup * group in fDisplayedTorrents)
-            [[group torrents] sortUsingDescriptors: descriptors];
-    }
-    else
-        [fDisplayedTorrents sortUsingDescriptors: descriptors];
-    
-    [descriptors release];
+    if (descriptors)
+    {
+        if ([fDefaults boolForKey: @"SortByGroup"])
+        {
+            for (TorrentGroup * group in fDisplayedTorrents)
+                [[group torrents] sortUsingDescriptors: descriptors];
+        }
+        else
+            [fDisplayedTorrents sortUsingDescriptors: descriptors];
+        
+        [descriptors release];
+    }
     
     [fTableView reloadData];
@@ -2719 +2707 @@
             NSIndexSet * insertIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(insertIndex, [movingTorrents count])];
             [fTorrents insertObjects: movingTorrents atIndexes: insertIndexes];
-            
-            //redo order values
-            for (NSInteger i = 0; i < [fTorrents count]; i++)
-                [[fTorrents objectAtIndex: i] setOrderValue: i];
         }
         

trunk/macosx/Torrent.h

@@ -70 +70 @@
     BOOL fFinishedSeeding, fWaitToStart, fStalled;
     
-    NSInteger fOrderValue, fGroupValue;
+    NSInteger fGroupValue;
     
     BOOL fAddedTrackers;
@@ -231 +231 @@
 - (CGFloat) swarmSpeed;
 
-- (NSInteger) orderValue;
-- (void) setOrderValue: (NSInteger) orderValue;
-
 - (NSInteger) groupValue;
 - (void) setGroupValue: (NSInteger) groupValue;

trunk/macosx/Torrent.m

@@ -37 +37 @@
         ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
         waitToStart: (NSNumber *) waitToStart
-        orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers;
+        groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers;
 
 - (BOOL) shouldUseIncompleteFolderForName: (NSString *) name;
@@ -83 +83 @@
             useIncompleteFolder: nil incompleteFolder: nil
             ratioSetting: nil ratioLimit: nil
-            waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil];
+            waitToStart: nil groupValue: nil addedTrackers: nil];
     
     if (self)
@@ -108 +108 @@
             useIncompleteFolder: nil incompleteFolder: nil
             ratioSetting: nil ratioLimit: nil
-            waitToStart: nil orderValue: nil groupValue: nil addedTrackers: nil];
+            waitToStart: nil groupValue: nil addedTrackers: nil];
     
     return self;
@@ -124 +124 @@
                 ratioLimit: [history objectForKey: @"RatioLimit"]
                 waitToStart: [history objectForKey: @"WaitToStart"]
-                orderValue: [history objectForKey: @"OrderValue"]
                 groupValue: [history objectForKey: @"GroupValue"]
                 addedTrackers: [history objectForKey: @"AddedTrackers"]];
@@ -161 +160 @@
                     [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
                     [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
-                    [NSNumber numberWithInt: fOrderValue], @"OrderValue",
                     [NSNumber numberWithInt: fGroupValue], @"GroupValue",
                     [NSNumber numberWithBool: fAddedTrackers], @"AddedTrackers", nil];
@@ -1366 +1364 @@
 }
 
-- (NSInteger) orderValue
-{
-    return fOrderValue;
-}
-
-- (void) setOrderValue: (NSInteger) orderValue
-{
-    fOrderValue = orderValue;
-}
-
 - (NSInteger) groupValue
 {
@@ -1617 +1605 @@
         ratioSetting: (NSNumber *) ratioSetting ratioLimit: (NSNumber *) ratioLimit
         waitToStart: (NSNumber *) waitToStart
-        orderValue: (NSNumber *) orderValue groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers
+        groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers
 {
     if (!(self = [super init]))
@@ -1708 +1696 @@
     [self createFileList];
         
-    fOrderValue = orderValue ? [orderValue intValue] : tr_sessionCountTorrents(lib) - 1;
     fGroupValue = groupValue ? [groupValue intValue] : [[GroupsController groups] groupIndexForTorrent: self];