Changeset 9277

Timestamp:

Oct 10, 2009, 7:55:47 PM (13 years ago)

Author:

livings124

Message:

update for the new tracker verification changes, and use a set instead of an array for removing trackers

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (2 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (5 diffs)

trunk/macosx/InfoWindowController.m

@@ -1440 +1440 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    #warning still update unselected rows
     //get update tracker stats
     if ([fTrackerTable editedRow] == -1)
@@ -1705 +1704 @@
 {
     const NSInteger oldCount = [fTrackers count] - [(TrackerNode *)[fTrackers lastObject] tier];
-    NSMutableArray * addresses = [NSMutableArray arrayWithCapacity: oldCount];
+    NSMutableSet * addresses = [NSMutableSet setWithCapacity: oldCount];
     
     NSIndexSet * indexes = [fTrackerTable selectedRowIndexes];

trunk/macosx/Torrent.h

@@ -133 +133 @@
 - (NSMutableArray *) allTrackersFlat; //used by GroupRules
 - (BOOL) addTrackerToNewTier: (NSString *) tracker;
-- (void) removeTrackersWithAnnounceAddresses: (NSArray *) trackers;
+- (void) removeTrackersWithAnnounceAddresses: (NSSet *) trackers;
 
 - (NSString *) comment;

trunk/macosx/Torrent.m

@@ -706 +706 @@
 }
 
-#warning check for duplicates?
 - (BOOL) addTrackerToNewTier: (NSString *) tracker
 {
@@ -713 +712 @@
     if ([tracker rangeOfString: @"://"].location == NSNotFound)
         tracker = [@"http://" stringByAppendingString: tracker];
-    
-    if (!tr_httpIsValidURL([tracker UTF8String]))
-        return NO;
     
     //recreate the tracker structure
@@ -726 +722 @@
     trackerStructs[oldTrackerCount].tier = trackerStructs[oldTrackerCount-1].tier + 1;
     
-    tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
+    const tr_announce_list_err result = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
     tr_free(trackerStructs);
     
-    return YES;
-}
-
-- (void) removeTrackersWithAnnounceAddresses: (NSArray *) trackers
+    return result == TR_ANNOUNCE_LIST_OK;
+}
+
+- (void) removeTrackersWithAnnounceAddresses: (NSSet *) trackers
 {
     //recreate the tracker structure
@@ -741 +737 @@
     for (NSInteger oldIndex = 0; oldIndex < oldTrackerCount; ++newCount, ++oldIndex)
     {
-        if (![trackers containsObject: [NSString stringWithUTF8String: fInfo->trackers[oldIndex].announce]])
+        if (![trackers member: [NSString stringWithUTF8String: fInfo->trackers[oldIndex].announce]])
             trackerStructs[newCount] = fInfo->trackers[oldIndex];
         else
@@ -747 +743 @@
     }
     
-    tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
+    const tr_announce_list_err result = tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
+    NSAssert1(result == TR_ANNOUNCE_LIST_OK, @"Removing tracker addresses resulted in error: %d", result);
+    
     tr_free(trackerStructs);
 }