Changeset 1256

Timestamp:

Dec 18, 2006, 6:25:40 AM (16 years ago)

Author:

livings124

Message:

display actual upload/download rate in inspector for individual peers

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (2 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/InfoWindowController.h

@@ -32 +32 @@
     NSArray * fTorrents;
     NSMutableArray * fPeers, * fFiles;
-    NSImage * fAppIcon, * fDotGreen, * fDotRed, * fCheckImage;
+    NSImage * fAppIcon, * fDotGreen, * fDotRed;
     
     IBOutlet NSTabView * fTabView;

trunk/macosx/InfoWindowController.m

@@ -68 +68 @@
         fDotGreen = [NSImage imageNamed: @"GreenDot.tiff"];
         fDotRed = [NSImage imageNamed: @"RedDot.tiff"];
-        fCheckImage = [NSImage imageNamed: @"NSMenuCheckmark"];    
     }
     return self;
@@ -541 +540 @@
             return [peer objectForKey: @"Progress"];
         else if ([ident isEqualToString: @"UL To"])
-            return [[peer objectForKey: @"UL To"] boolValue] ? fCheckImage : nil;
+            return [[peer objectForKey: @"UL To"] boolValue]
+                    ? [NSString stringForSpeedAbbrev: [[peer objectForKey: @"UL To Rate"] floatValue]] : @"";
         else if ([ident isEqualToString: @"DL From"])
-            return [[peer objectForKey: @"DL From"] boolValue] ? fCheckImage : nil;
+            return [[peer objectForKey: @"DL From"] boolValue]
+                    ? [NSString stringForSpeedAbbrev: [[peer objectForKey: @"DL From Rate"] floatValue]] : @"";
         else
             return [peer objectForKey: @"IP"];

trunk/macosx/Torrent.m

@@ -840 +840 @@
     
     NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers];
-    tr_peer_stat_t peer;
+    NSMutableDictionary * dic;
+    
+    tr_peer_stat_t * peer;
     NSString * client;
     for (i = 0; i < totalPeers; i++)
     {
-        peer = peers[i];
-        [peerDics addObject: [NSDictionary dictionaryWithObjectsAndKeys:
-            [NSNumber numberWithBool: peer.isConnected], @"Connected",
-            [NSNumber numberWithBool: peer.isIncoming], @"Incoming",
-            [NSString stringWithCString: (char *) peer.addr encoding: NSUTF8StringEncoding], @"IP",
-            [NSString stringWithCString: (char *) peer.client encoding: NSUTF8StringEncoding], @"Client",
-            [NSNumber numberWithFloat: peer.progress], @"Progress",
-            [NSNumber numberWithBool: peer.isDownloading], @"UL To",
-            [NSNumber numberWithBool: peer.isUploading], @"DL From",
-            [NSNumber numberWithInt: peer.port], @"Port", nil]];
+        peer = &peers[i];
+        
+        dic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithBool: peer->isConnected], @"Connected",
+            [NSNumber numberWithBool: peer->isIncoming], @"Incoming",
+            [NSString stringWithCString: (char *) peer->addr encoding: NSUTF8StringEncoding], @"IP",
+            [NSString stringWithCString: (char *) peer->client encoding: NSUTF8StringEncoding], @"Client",
+            [NSNumber numberWithFloat: peer->progress], @"Progress",
+            [NSNumber numberWithBool: peer->isDownloading], @"UL To",
+            [NSNumber numberWithBool: peer->isUploading], @"DL From",
+            [NSNumber numberWithInt: peer->port], @"Port", nil];
+        
+        if (peer->isDownloading)
+            [dic setObject: [NSNumber numberWithFloat: peer->uploadToRate] forKey: @"UL To Rate"];
+        if (peer->isUploading)
+            [dic setObject: [NSNumber numberWithFloat: peer->downloadFromRate] forKey: @"DL From Rate"];
+        
+        [peerDics addObject: dic];
     }