Changeset 6003

Timestamp:

Jun 2, 2008, 7:42:14 PM (14 years ago)

Author:

livings124

Message:

for now don't allow modification of non-user added trackers

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (4 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (3 diffs)

trunk/macosx/InfoWindowController.m

@@ -934 +934 @@
     
     Torrent * torrent= [fTorrents objectAtIndex: 0];
-    if (![torrent updateAllTrackers: fTrackers forAdd: YES])
+    if (![torrent updateAllTrackersForAdd: fTrackers])
         NSBeep();
     
@@ -960 +960 @@
 - (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
 {
-    return ![[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]];
+    if (tableView != fTrackerTable)
+        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--);
+    
+    return [[fTrackers objectAtIndex: i] intValue] == 0;
 }
 
@@ -1501 +1511 @@
     if (numberBuiltIn > 0 && [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveBuiltInTracker"])
     {
-        #warning pluralize?
         NSAlert * alert = [[NSAlert alloc] init];
         
@@ -1540 +1549 @@
     [fTrackers removeObjectsAtIndexes: indexes];
     
-    if (![torrent updateAllTrackers: fTrackers forAdd: NO])
+    if (![torrent updateAllTrackersForRemove: fTrackers])
         NSBeep();
     else

trunk/macosx/Torrent.h

@@ -152 +152 @@
 
 - (NSMutableArray *) allTrackers: (BOOL) separators;
-- (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add;
+- (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers;
+- (BOOL) updateAllTrackersForRemove: (NSMutableArray *) trackers;
 - (BOOL) hasAddedTrackers;
 

trunk/macosx/Torrent.m

@@ -54 +54 @@
 
 - (NSString *) etaString: (int) eta;
+
+- (BOOL) updateAllTrackers: (NSMutableArray *) trackers;
 
 - (void) trashFile: (NSString *) path;
@@ -804 +806 @@
 }
 
-- (BOOL) updateAllTrackers: (NSMutableArray *) trackers forAdd: (BOOL) add
-{
-    #warning break up into methods
-    if (add)
-    {
-        //find added tracker at end of first tier
-        int i;
-        for (i = 1; i < [trackers count]; i++)
-            if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
-                break;
-        i--;
-        
-        NSString * tracker = [trackers objectAtIndex: i];
-        if ([tracker rangeOfString: @"://"].location == NSNotFound)
-        {
-            tracker = [@"http://" stringByAppendingString: tracker];
-            [trackers replaceObjectAtIndex: i withObject: tracker];
-        }
-        
-        if (!tr_httpIsValidURL([tracker UTF8String]))
-            return NO;
-        
-        fAddedTrackers = YES;
-    }
-    else
-    {
-        //check if any user-added groups
-        if ([[trackers objectAtIndex: 0] intValue] != 0)
-            fAddedTrackers = NO;
-    }
-    
-    //get count
-    int count = 0;
-    NSEnumerator * enumerator = [trackers objectEnumerator];
-    id object;
-    while ((object = [enumerator nextObject]))
-        if (![object isKindOfClass: [NSNumber class]])
-            count++;
-    
-    //recreate the tracker structure
-    tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count);
-    int tier = 0;
-    int i = 0;
-    enumerator = [trackers objectEnumerator];
-    while ((object = [enumerator nextObject]))
-    {
-        if (![object isKindOfClass: [NSNumber class]])
-        {
-            trackerStructs[i].tier = tier;
-            trackerStructs[i].announce = (char *)[object UTF8String];
-            i++;
-        }
-        else
-            tier++;
-    }
-    
-    tr_torrentSetAnnounceList(fHandle, trackerStructs, count);
-    tr_free(trackerStructs);
-    
-    return YES;
+- (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers
+{
+    //find added tracker at end of first tier
+    int i;
+    for (i = 1; i < [trackers count]; i++)
+        if ([[trackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
+            break;
+    i--;
+    
+    NSString * tracker = [trackers objectAtIndex: i];
+    if ([tracker rangeOfString: @"://"].location == NSNotFound)
+    {
+        tracker = [@"http://" stringByAppendingString: tracker];
+        [trackers replaceObjectAtIndex: i withObject: tracker];
+    }
+    
+    if (!tr_httpIsValidURL([tracker UTF8String]))
+        return NO;
+    
+    fAddedTrackers = YES;
+    
+    return [self updateAllTrackers: trackers];
+}
+
+- (BOOL) updateAllTrackersForRemove: (NSMutableArray *) trackers
+{
+    //check if any user-added groups
+    if ([[trackers objectAtIndex: 0] intValue] != 0)
+        fAddedTrackers = NO;
+    
+    return [self updateAllTrackers: trackers];
 }
 
@@ -1930 +1903 @@
 }
 
+- (BOOL) updateAllTrackers: (NSMutableArray *) trackers
+{
+    //get count
+    int count = 0;
+    NSEnumerator * enumerator = [trackers objectEnumerator];
+    id object;
+    while ((object = [enumerator nextObject]))
+        if (![object isKindOfClass: [NSNumber class]])
+            count++;
+    
+    //recreate the tracker structure
+    tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count);
+    int tier = 0;
+    int i = 0;
+    enumerator = [trackers objectEnumerator];
+    while ((object = [enumerator nextObject]))
+    {
+        if (![object isKindOfClass: [NSNumber class]])
+        {
+            trackerStructs[i].tier = tier;
+            trackerStructs[i].announce = (char *)[object UTF8String];
+            i++;
+        }
+        else
+            tier++;
+    }
+    
+    tr_torrentSetAnnounceList(fHandle, trackerStructs, count);
+    tr_free(trackerStructs);
+    
+    return YES;
+}
+
 - (void) trashFile: (NSString *) path
 {