Changeset 9902

Timestamp:

Jan 10, 2010, 2:34:00 AM (13 years ago)

Author:

livings124

Message:

add an identifier to trackers, for use by the ui's (this should hopefully fix the problem for removing trackers with "invisible" trackers)

Location:

trunk

Files:

• libtransmission/announcer.c (modified) (6 diffs)
• libtransmission/metainfo.c (modified) (5 diffs)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (2 diffs)
• macosx/InfoWindowController.m (modified) (4 diffs)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (3 diffs)
• macosx/TrackerNode.h (modified) (1 diff)
• macosx/TrackerNode.m (modified) (1 diff)

trunk/libtransmission/announcer.c

@@ -296 +296 @@
     int downloadCount;
     int downloaderCount;
+    
+    uint32_t identifier;
 
     /* sent as the "key" argument in tracker requests
@@ -320 +322 @@
 trackerNew( tr_announcer  * announcer,
             const char    * announce,
-            const char    * scrape )
+            const char    * scrape,
+            uint32_t      identifier )
 {
     tr_tracker_item * tracker = tr_new0( tr_tracker_item, 1  );
@@ -326 +329 @@
     tracker->announce = tr_strdup( announce );
     tracker->scrape = tr_strdup( scrape );
+    tracker->identifier = identifier;
     generateKeyParam( tracker->key_param, KEYLEN );
     tracker->seederCount = -1;
@@ -449 +453 @@
                 tr_tier      * tier,
                 const char   * announce,
-                const char   * scrape )
-{
-    tr_tracker_item * tracker = trackerNew( announcer, announce, scrape );
+                const char   * scrape,
+                uint32_t     identifier )
+{
+    tr_tracker_item * tracker = trackerNew( announcer, announce, scrape, identifier );
 
     tr_ptrArrayAppend( &tier->trackers, tracker );
@@ -772 +777 @@
             }
 
-            tierAddTracker( announcer, tier, info->announce, info->scrape );
+            tierAddTracker( announcer, tier, info->announce, info->scrape, info->identifier );
         }
     }
@@ -1750 +1755 @@
             tr_tracker_stat * st = ret + out++;
 
+            st->identifier = tracker->identifier;
             tr_strlcpy( st->host, tracker->host->name, sizeof( st->host ) );
             tr_strlcpy( st->announce, tracker->announce, sizeof( st->announce ) );

trunk/libtransmission/metainfo.c

@@ -272 +272 @@
         int       i, j, validTiers;
         const int numTiers = tr_bencListSize( tiers );
+        uint32_t  trackerId = 0;
 
         n = 0;
@@ -278 +279 @@
 
         trackers = tr_new0( tr_tracker_info, n );
-        trackerCount = 0;
 
         for( i = 0, validTiers = 0; i < numTiers; ++i )
@@ -292 +292 @@
                     if( tr_httpIsValidURL( url ) )
                     {
-                        tr_tracker_info * t = trackers + trackerCount++;
+                        tr_tracker_info * t = trackers + trackerCount;
                         t->tier = validTiers;
                         t->announce = tr_strdup( url );
                         t->scrape = tr_convertAnnounceToScrape( url );
+                        t->identifier = trackerCount;
 
                         anyAdded = TRUE;
+                        ++trackerCount;
                     }
                     tr_free( url );
@@ -325 +327 @@
             trackers[trackerCount].tier = 0;
             trackers[trackerCount].announce = tr_strdup( url );
-            trackers[trackerCount++].scrape = tr_convertAnnounceToScrape( url );
+            trackers[trackerCount].scrape = tr_convertAnnounceToScrape( url );
+            trackers[trackerCount].identifier = 0;
+            trackerCount++;
             /*fprintf( stderr, "single announce: [%s]\n", url );*/
         }
@@ -597 +601 @@
             inf->trackers[i].announce = tr_strdup( url );
             inf->trackers[i].scrape = tr_convertAnnounceToScrape( url );
+            inf->trackers[i].identifier = i;
         }
     }

trunk/libtransmission/rpcimpl.c

@@ -364 +364 @@
         tr_bencDictAddStr( d, "scrape", t->scrape );
         tr_bencDictAddInt( d, "tier", t->tier );
+        tr_bencDictAddInt( d, "id", t->identifier );
     }
 }

trunk/libtransmission/transmission.h

@@ -1201 +1201 @@
 **/
 
+
 /** @brief a part of tr_info that represents a single tracker */
 typedef struct tr_tracker_info
 {
-    int     tier;
-    char *  announce;
-    char *  scrape;
+    int      tier;
+    char *   announce;
+    char *   scrape;
+    uint32_t identifier; /* used to match to a tr_tracker_stat */
 }
 tr_tracker_info;
-
 
 /**
@@ -1459 +1460 @@
     /* which tier this tracker is in */
     int tier;
+    
+    /* used to match to a tr_tracker_info */
+    uint32_t identifier;
 }
 tr_tracker_stat;

trunk/macosx/InfoWindowController.m

@@ -1742 +1742 @@
 - (void) removeTrackers
 {
-    NSMutableIndexSet * removeIndexes = [NSMutableIndexSet indexSet];
+    NSMutableIndexSet * removeIdentifiers = [NSMutableIndexSet indexSet];
     
     NSIndexSet * selectedIndexes = [fTrackerTable selectedRowIndexes];
-    NSLog(@"%@", fTrackers);
-    NSLog(@"selected: %@", selectedIndexes);
     BOOL groupSelected = NO;
     for (NSUInteger i = 0, trackerIndex = 0; i < [fTrackers count]; ++i)
@@ -1759 +1757 @@
         {
             if (groupSelected || [selectedIndexes containsIndex: i])
-            {
-                [removeIndexes addIndex: trackerIndex];
-                NSLog(@"adding for remove %d (%d): %@", trackerIndex, i, [fTrackers objectAtIndex: i]);
-            }
+                [removeIdentifiers addIndex: [(TrackerNode *)[fTrackers objectAtIndex: i] identifier]];
             ++trackerIndex;
         }
     }
     
-    NSLog(@"%@", removeIndexes);
-    
-    NSAssert([removeIndexes count] > 0, @"Trying to remove no trackers.");
+    NSLog(@"%@", removeIdentifiers);
+    
+    NSAssert([removeIdentifiers count] > 0, @"Trying to remove no trackers.");
     
     if ([[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveTrackers"])
@@ -1775 +1770 @@
         NSAlert * alert = [[NSAlert alloc] init];
         
-        if ([removeIndexes count] > 1)
+        if ([removeIdentifiers count] > 1)
         {
             [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d trackers?",
-                                                                "Remove trackers alert -> title"), [removeIndexes count]]];
+                                                                "Remove trackers alert -> title"), [removeIdentifiers count]]];
             [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact them."
                                         " This cannot be undone.", "Remove trackers alert -> message")];
@@ -1804 +1799 @@
     
     Torrent * torrent = [fTorrents objectAtIndex: 0];
-    [torrent removeTrackersAtIndexes: removeIndexes];
+    [torrent removeTrackersWithIdentifiers: removeIdentifiers];
     
     //reset table with either new or old value

trunk/macosx/Torrent.h

@@ -132 +132 @@
 - (NSArray *) allTrackersFlat; //used by GroupRules
 - (BOOL) addTrackerToNewTier: (NSString *) tracker;
-- (void) removeTrackersAtIndexes: (NSIndexSet *) removeIndexes;
+- (void) removeTrackersWithIdentifiers: (NSIndexSet *) removeIdentifiers;
 
 - (NSString *) comment;

trunk/macosx/Torrent.m

@@ -588 +588 @@
     int count;
     tr_tracker_stat * stats = tr_torrentTrackers(fHandle, &count);
-    NSLog(@"count from tr_torrentTrackers: %d", count);
     
     NSMutableArray * trackers = [NSMutableArray arrayWithCapacity: (count > 0 ? count + stats[count-1].tier : 0)];
@@ -630 +629 @@
     const int oldTrackerCount = fInfo->trackerCount;
     tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, oldTrackerCount+1);
-    for (NSInteger i=0; i < oldTrackerCount; ++i)
+    for (NSUInteger i=0; i < oldTrackerCount; ++i)
+    {
         trackerStructs[i] = fInfo->trackers[i];
+        trackerStructs[i].identifier = i;
+    }
     
     trackerStructs[oldTrackerCount].announce = (char *)[tracker UTF8String];
     trackerStructs[oldTrackerCount].tier = trackerStructs[oldTrackerCount-1].tier + 1;
+    trackerStructs[oldTrackerCount].identifier = trackerStructs[oldTrackerCount-1].identifier + 1;
     
     const BOOL success = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
@@ -642 +645 @@
 }
 
-- (void) removeTrackersAtIndexes: (NSIndexSet *) removeIndexes
-{
-    NSAssert([removeIndexes lastIndex] < fInfo->trackerCount, @"Trying to remove trackers outside the tracker count.");
-    
-    NSMutableIndexSet * indexes = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fInfo->trackerCount)];
-    [indexes removeIndexes: removeIndexes];
-    
+- (void) removeTrackersWithIdentifiers: (NSIndexSet *) removeIdentifiers
+{
     //recreate the tracker structure
-    tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, [indexes count]);
-    NSLog(@"count from fInfo: %d", fInfo->trackerCount);
-    
-    int newCount = 0;
-    for (NSUInteger oldIndex = [indexes firstIndex]; oldIndex != NSNotFound; oldIndex = [indexes indexGreaterThanIndex: oldIndex])
-    {
-        NSLog(@"oldIndex: %d %s", oldIndex, fInfo->trackers[oldIndex].announce);
-        trackerStructs[newCount++] = fInfo->trackers[oldIndex];
+    tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, fInfo->trackerCount);
+    
+    NSUInteger newCount = 0;
+    for (NSUInteger i = 0; i < fInfo->trackerCount; i++)
+    {
+        if (![removeIdentifiers containsIndex: fInfo->trackers[i].identifier])
+        {
+            trackerStructs[newCount] = fInfo->trackers[i];
+            trackerStructs[newCount].identifier = newCount++;
+        }
     }
     

trunk/macosx/TrackerNode.h

@@ -38 +38 @@
 - (NSInteger) tier;
 
+- (NSUInteger) identifier;
+
 - (NSInteger) totalSeeders;
 - (NSInteger) totalLeechers;

trunk/macosx/TrackerNode.m

@@ -63 +63 @@
 {
     return fStat.tier;
+}
+
+- (NSUInteger) identifier
+{
+    return fStat.identifier;
 }