Changeset 9220

Timestamp:

Sep 29, 2009, 3:02:44 AM (13 years ago)

Author:

livings124

Message:

getting closer to re-adding "add tracker" functionality

Location:

trunk/macosx

Files:

• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (12 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (4 diffs)
• TrackerNode.h (modified) (1 diff)
• TrackerNode.m (modified) (1 diff)
• TrackerTableView.m (modified) (2 diffs)

trunk/macosx/InfoWindowController.h

@@ -54 +54 @@
     IBOutlet NSButton * fRevealDataButton;
     
-    NSArray * fTrackers;
+    NSMutableArray * fTrackers;
     IBOutlet TrackerTableView * fTrackerTable;
     TrackerCell * fTrackerCell;

trunk/macosx/InfoWindowController.m

@@ -91 +91 @@
 - (BOOL) canQuickLookFile: (FileListNode *) item;
 
-#warning lookie
-/*- (void) addTrackers;
-- (void) removeTrackers;*/
+- (void) addTrackers;
+- (void) removeTrackers;
 
 @end
@@ -383 +382 @@
         fTrackers = nil;
         
+        [fTrackerTable setTrackers: fTrackers];
         [fTrackerTable reloadData];
-        [fTrackerTable setTrackers: nil];
         
         [fTrackerAddRemoveControl setEnabled: NO forSegment: TRACKER_ADD_TAG];
@@ -906 +905 @@
     if (tableView == fTrackerTable)
     {
-        const BOOL group = [[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]];
-        return group ? [tableColumn dataCellForRow: row] : fTrackerCell;
+        const BOOL tracker = [[fTrackers objectAtIndex: row] isKindOfClass: [TrackerNode class]];
+        return tracker ? fTrackerCell : [tableColumn dataCellForRow: row];
     }
     
@@ -1073 +1072 @@
 }
 
-#warning fix!
-#if 0
 - (void) tableView: (NSTableView *) tableView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn
     row: (NSInteger) row
@@ -1081 +1078 @@
         return;
     
-    [fTrackers replaceObjectAtIndex: row withObject: object];
-    
     Torrent * torrent= [fTorrents objectAtIndex: 0];
-    if (![torrent updateAllTrackersForAdd: fTrackers])
+    if (![torrent addTrackerToNewTier: object])
         NSBeep();
     
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackers: YES] retain];
-    [fTrackerTable deselectAll: self];
+    fTrackers = [[torrent allTrackerStats] retain];
     
     [fTrackerTable setTrackers: fTrackers];
     [fTrackerTable reloadData];
-}
-#endif
+    [fTrackerTable deselectAll: self];
+}
 
 - (void) addRemoveTracker: (id) sender
 {
-/*    //don't allow add/remove when currently adding - it leads to weird results
+    //don't allow add/remove when currently adding - it leads to weird results
     if ([fTrackerTable editedRow] != -1)
         return;
@@ -1106 +1100 @@
         [self removeTrackers];
     else
-        [self addTrackers];*/
+        [self addTrackers];
 }
 
 #warning what?!
-- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
+/*- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
 {
     if (tableView != fTrackerTable)
@@ -1119 +1113 @@
     
     return [[fTrackers objectAtIndex: i] intValue] == 0;
-}
+}*/
 
 - (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel
@@ -1445 +1439 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
+    #warning still update unselected rows
     //get update tracker stats
-    [fTrackers release];
-    fTrackers = [[torrent allTrackerStats] retain];
-    
-    [fTrackerTable setTrackers: fTrackers];
-    [fTrackerTable reloadData];
+    if ([fTrackerTable editedRow] == -1)
+    {
+        [fTrackers release];
+        fTrackers = [[torrent allTrackerStats] retain];
+        
+        [fTrackerTable setTrackers: fTrackers];
+        [fTrackerTable reloadData];
+    }
 }
 
@@ -1679 +1677 @@
 }
 
-#if 0
-
 #warning doesn't like blank addresses
 - (void) addTrackers
@@ -1686 +1682 @@
     [[self window] makeKeyWindow];
     
-    NSUInteger tierCount = 0;
-    for (id trackerObject in fTrackers)
-        if ([trackerObject isKindOfClass: [NSNumber class]])
-            tierCount++;
-    
-    [fTrackers addObject: [NSNumber numberWithInt: tierCount+1]];
+    [fTrackers addObject: [NSNumber numberWithInt: [(TrackerNode *)[fTrackers lastObject] tier]+1]];
     [fTrackers addObject: @""];
     
+    [fTrackerTable setTrackers: fTrackers];
     [fTrackerTable reloadData];
     [fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: [fTrackers count]-1] byExtendingSelection: NO];
@@ -1783 +1775 @@
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackers: YES] retain];
+    fTrackers = [[torrent allTrackerStats] retain];
     
     [fTrackerTable setTrackers: fTrackers];
@@ -1789 +1781 @@
 }
 
-#endif
-
 @end

trunk/macosx/Torrent.h

@@ -133 +133 @@
 - (uint64_t) sizeLeft;
 
-- (NSArray *) allTrackerStats;
-- (NSArray *) allTrackersFlat; //used by GroupRules
-/*- (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers;
-- (void) updateAllTrackersForRemove: (NSMutableArray *) trackers;*/
+- (NSMutableArray *) allTrackerStats;
+- (NSMutableArray *) allTrackersFlat; //used by GroupRules
+- (BOOL) addTrackerToNewTier: (NSString *) tracker;
+- (void) updateAllTrackersForRemove: (NSMutableArray *) trackers;
 
 - (NSString *) comment;

trunk/macosx/Torrent.m

@@ -673 +673 @@
 }
 
-- (NSArray *) allTrackerStats
+- (NSMutableArray *) allTrackerStats
 {
     int count;
@@ -698 +698 @@
 }
 
-- (NSArray *) allTrackersFlat
+- (NSMutableArray *) allTrackersFlat
 {
     NSMutableArray * allTrackers = [NSMutableArray arrayWithCapacity: fInfo->trackerCount];
@@ -708 +708 @@
 }
 
-/*- (BOOL) updateAllTrackersForAdd: (NSMutableArray *) trackers
-{
-    NSString * tracker = [trackers lastObject];
+- (BOOL) addTrackerToNewTier: (NSString *) tracker
+{
     tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     
     if ([tracker rangeOfString: @"://"].location == NSNotFound)
-    {
         tracker = [@"http://" stringByAppendingString: tracker];
-        [trackers replaceObjectAtIndex: [trackers count]-1 withObject: tracker];
-    }
     
     if (!tr_httpIsValidURL([tracker UTF8String]))
         return NO;
     
+    //recreate the tracker structure
+    const int oldTrackerCount = fInfo->trackerCount;
+    tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, oldTrackerCount+1);
+    for (NSInteger i=0; i < oldTrackerCount; ++i)
+        trackerStructs[i] = fInfo->trackers[i];
+    
+    trackerStructs[oldTrackerCount].announce = (char *)[tracker UTF8String];
+    trackerStructs[oldTrackerCount].tier = trackerStructs[oldTrackerCount-1].tier + 1;
+    
+    tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
+    tr_free(trackerStructs);
+    
+    return YES;
+}
+
+#warning this doesn't work
+- (void) updateAllTrackersForRemove: (NSMutableArray *) trackers
+{
     [self updateAllTrackers: trackers];
-    
-    return YES;
-}
-
-- (void) updateAllTrackersForRemove: (NSMutableArray *) trackers
-{
-    [self updateAllTrackers: trackers];
-}*/
+}
 
 - (NSString *) comment
@@ -1800 +1807 @@
 }
 
+#warning needs to be removed
 - (void) updateAllTrackers: (NSMutableArray *) trackers
 {

trunk/macosx/TrackerNode.h

@@ -36 +36 @@
 - (NSString *) fullAnnounceAddress;
 
+- (NSInteger) tier;
+
 - (NSInteger) totalSeeders;
 - (NSInteger) totalLeechers;

trunk/macosx/TrackerNode.m

@@ -53 +53 @@
 {
     return [NSString stringWithUTF8String: fStat.announce];
+}
+
+- (NSInteger) tier
+{
+    return fStat.tier;
 }
 

trunk/macosx/TrackerTableView.m

@@ -57 +57 @@
     }
     
-    NSString * text = [addresses componentsJoinedByString: @"\n"];;
+    NSString * text = [addresses componentsJoinedByString: @"\n"];
     
     NSPasteboard * pb = [NSPasteboard generalPasteboard];
@@ -74 +74 @@
 - (BOOL) validateMenuItem: (NSMenuItem *) menuItem
 {
-    SEL action = [menuItem action];
+    const SEL action = [menuItem action];
     
     if (action == @selector(copy:))