Changeset 9125

Timestamp:

Sep 17, 2009, 12:33:39 AM (13 years ago)

Author:

livings124

Message:

remove distinction between built-in trackers and custom-added trackers; add trackers to the end of the list instead of the beginning

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (3 diffs)
• NSStringAdditions.m (modified) (1 diff)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (11 diffs)

trunk/macosx/InfoWindowController.m

@@ -1103 +1103 @@
         return NO;
     
-    //only allow modification of custom-added trackers
-    if ([[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]] || ![[fTorrents objectAtIndex: 0] hasAddedTrackers])
-        return NO;
-    
     NSUInteger i;
     for (i = row-1; ![[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]; i--);
@@ -1732 +1728 @@
     [[self window] makeKeyWindow];
     
-    NSUInteger index = 1;
-    if ([fTrackers count] > 0 && [[fTorrents objectAtIndex: 0] hasAddedTrackers])
-    {
-        for (; index < [fTrackers count]; index++)
-            if ([[fTrackers objectAtIndex: index] isKindOfClass: [NSNumber class]])
-                break;
-    }
-    else
-        [fTrackers insertObject: [NSNumber numberWithInt: 0] atIndex: 0];
-    
-    [fTrackers insertObject: @"" atIndex: index];
+    NSUInteger tierCount = 0;
+    for (id trackerObject in fTrackers)
+        if ([trackerObject isKindOfClass: [NSNumber class]])
+            tierCount++;
+    
+    [fTrackers addObject: [NSNumber numberWithInt: tierCount+1]];
+    [fTrackers addObject: @""];
+    
     [fTrackerTable reloadData];
-    [fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: index] byExtendingSelection: NO];
-    [fTrackerTable editColumn: 0 row: index withEvent: nil select: YES];
+    [fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: [fTrackers count]-1] byExtendingSelection: NO];
+    [fTrackerTable editColumn: 0 row: [fTrackers count]-1 withEvent: nil select: YES];
 }
 
@@ -1799 +1792 @@
     
     //determine if removing trackers built into the torrent
-    if (numberBuiltIn > 0 && [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveBuiltInTracker"])
+    #warning remove?
+    if (NO && numberBuiltIn > 0 && [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveBuiltInTracker"])
     {
         NSAlert * alert = [[NSAlert alloc] init];

trunk/macosx/NSStringAdditions.m

@@ -141 +141 @@
 }
 
+//also used in InfoWindow.xib
 - (NSComparisonResult) compareFinder: (NSString *) string
 {

trunk/macosx/Torrent.h

@@ -59 +59 @@
     NSInteger fGroupValue;
     
-    BOOL fAddedTrackers;
-    
     NSDictionary * fQuickPauseDict;
 }
@@ -148 +146 @@
 - (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers;
 - (void) updateAllTrackersForRemove: (NSMutableArray *) trackers;
-- (BOOL) hasAddedTrackers;
 
 - (NSString *) comment;

trunk/macosx/Torrent.m

@@ -35 +35 @@
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
         waitToStart: (NSNumber *) waitToStart
-        groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers;
+        groupValue: (NSNumber *) groupValue;
 
 - (BOOL) shouldUseIncompleteFolderForName: (NSString *) name;
@@ -84 +84 @@
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
-            waitToStart: nil groupValue: nil addedTrackers: nil];
+            waitToStart: nil groupValue: nil];
     
     if (self)
@@ -99 +99 @@
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
-            waitToStart: nil groupValue: nil addedTrackers: nil];
+            waitToStart: nil groupValue: nil];
     
     return self;
@@ -113 +113 @@
                 incompleteFolder: [history objectForKey: @"IncompleteFolder"]
                 waitToStart: [history objectForKey: @"WaitToStart"]
-                groupValue: [history objectForKey: @"GroupValue"]
-                addedTrackers: [history objectForKey: @"AddedTrackers"]];
+                groupValue: [history objectForKey: @"GroupValue"]];
     
     if (self)
@@ -162 +161 @@
                     [NSNumber numberWithBool: [self isActive]], @"Active",
                     [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
-                    [NSNumber numberWithInt: fGroupValue], @"GroupValue",
-                    [NSNumber numberWithBool: fAddedTrackers], @"AddedTrackers", nil];
+                    [NSNumber numberWithInt: fGroupValue], @"GroupValue", nil];
     
     if (fIncompleteFolder)
@@ -749 +747 @@
         {
             tier = fInfo->trackers[i].tier;
-            [allTrackers addObject: [NSNumber numberWithInt: fAddedTrackers ? tier : tier + 1]];
+            [allTrackers addObject: [NSNumber numberWithInteger: tier + 1]];
         }
         
@@ -765 +763 @@
 - (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers
 {
-    //find added tracker at end of first tier
-    NSInteger i;
-    for (i = 1; i < [trackers count]; i++)
-        if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
-            break;
-    i--;
-    
-    NSString * tracker = [trackers objectAtIndex: i];
-    
+    NSString * tracker = [trackers lastObject];
     tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     
@@ -779 +769 @@
     {
         tracker = [@"http://" stringByAppendingString: tracker];
-        [trackers replaceObjectAtIndex: i withObject: tracker];
+        [trackers replaceObjectAtIndex: [trackers count]-1 withObject: tracker];
     }
     
@@ -787 +777 @@
     [self updateAllTrackers: trackers];
     
-    fAddedTrackers = YES;
     return YES;
 }
 
+#warning needed?
 - (void) updateAllTrackersForRemove: (NSMutableArray *) trackers
 {
-    //check if no user-added groups
-    if ([trackers count] == 0 || [[trackers objectAtIndex: 0] intValue] != 0)
-        fAddedTrackers = NO;
-    
     [self updateAllTrackers: trackers];
-}
-
-- (BOOL) hasAddedTrackers
-{
-    return fAddedTrackers;
 }
 
@@ -1568 +1549 @@
         useIncompleteFolder: (NSNumber *) useIncompleteFolder incompleteFolder: (NSString *) incompleteFolder
         waitToStart: (NSNumber *) waitToStart
-        groupValue: (NSNumber *) groupValue addedTrackers: (NSNumber *) addedTrackers
+        groupValue: (NSNumber *) groupValue
 {
     if (!(self = [super init]))
@@ -1651 +1632 @@
     [self createFileList];
         
-    fGroupValue = groupValue ? [groupValue intValue] : [[GroupsController groups] groupIndexForTorrent: self];
-    
-    fAddedTrackers = addedTrackers ? [addedTrackers boolValue] : NO;    
+    fGroupValue = groupValue ? [groupValue intValue] : [[GroupsController groups] groupIndexForTorrent: self]; 
     
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(checkGroupValueForRemoval:)