Changeset 1544

Timestamp:

Mar 8, 2007, 4:45:37 AM (15 years ago)

Author:

livings124

Message:

get the pex branch compiling on mac

Location:

branches/pex

Files:

• libtransmission/transmission.h (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (1 diff)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (2 diffs)

branches/pex/libtransmission/transmission.h

@@ -52 +52 @@
 #define TR_DEFAULT_PORT   9090
 
+#define TR_PEER_FROM__MAX       4
 #define TR_PEER_FROM_INCOMING   0 /* connections made to the listening port */
 #define TR_PEER_FROM_TRACKER    1 /* peers received from a tracker */
 #define TR_PEER_FROM_CACHE      2 /* peers read from the peer cache */
 #define TR_PEER_FROM_PEX        3 /* peers discovered via PEX */
-#define TR_PEER_FROM__MAX       4
 
 /***********************************************************************

branches/pex/macosx/InfoWindowController.m

@@ -667 +667 @@
     {
         NSDictionary * peerDic = [fPeers objectAtIndex: row];
+        
+        NSString * fromString;
+        int from = [[peerDic objectForKey: @"From"] intValue];
+        if (from == TR_PEER_FROM_INCOMING)
+            fromString = NSLocalizedString(@"incoming connection", "Inspector -> Peers tab -> table row tooltip");
+        else if (from == TR_PEER_FROM_CACHE)
+            fromString = NSLocalizedString(@"cache", "Inspector -> Peers tab -> table row tooltip");
+        else if (from == TR_PEER_FROM_PEX)
+            fromString = NSLocalizedString(@"PEX", "Inspector -> Peers tab -> table row tooltip");
+        else
+            fromString = NSLocalizedString(@"tracker", "Inspector -> Peers tab -> table row tooltip");
+        
         return [NSString stringWithFormat: NSLocalizedString(@"Progress: %.1f%%"
                     "\nPort: %@"
-                    "\nFrom %@ connection", "Inspector -> Peers tab -> table row tooltip"),
+                    "\nFrom %@", "Inspector -> Peers tab -> table row tooltip"),
                     [[peerDic objectForKey: @"Progress"] floatValue] * 100.0,
-                    [peerDic objectForKey: @"Port"],
-                    [[peerDic objectForKey: @"Incoming"] boolValue]
-                        ? NSLocalizedString(@"incoming", "Inspector -> Peers tab -> table row tooltip")
-                        : NSLocalizedString(@"outgoing", "Inspector -> Peers tab -> table row tooltip")];
+                    [peerDic objectForKey: @"Port"], fromString];
     }
     return nil;

branches/pex/macosx/Torrent.h

@@ -160 +160 @@
 - (int) leechers;
 - (int) completedFromTracker;
+
 - (int) totalPeers;
+- (int) totalPeersTracker;
 - (int) totalPeersIncoming;
-- (int) totalPeersOutgoing;
+- (int) totalPeersCache;
+- (int) totalPeersPex;
+
 - (int) peersUploading;
 - (int) peersDownloading;

branches/pex/macosx/Torrent.m

@@ -933 +933 @@
         dic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
             [NSNumber numberWithBool: peer->isConnected], @"Connected",
-            [NSNumber numberWithBool: peer->isIncoming], @"Incoming",
+            [NSNumber numberWithInt: peer->from], @"From",
             [NSString stringWithCString: (char *) peer->addr encoding: NSUTF8StringEncoding], @"IP",
             [NSString stringWithCString: (char *) peer->client encoding: NSUTF8StringEncoding], @"Client",
@@ -994 +994 @@
 }
 
+- (int) totalPeersTracker
+{
+    return fStat->peersFrom[TR_PEER_FROM_TRACKER];
+}
+
 - (int) totalPeersIncoming
 {
-    return fStat->peersIncoming;
-}
-
-- (int) totalPeersOutgoing
-{
-    return [self totalPeers] - [self totalPeersIncoming];
+    return fStat->peersFrom[TR_PEER_FROM_INCOMING];
+}
+
+- (int) totalPeersCache
+{
+    return fStat->peersFrom[TR_PEER_FROM_CACHE];
+}
+
+- (int) totalPeersPex
+{
+    return fStat->peersFrom[TR_PEER_FROM_PEX];
 }