Changeset 1006

Timestamp:

Oct 13, 2006, 6:58:12 PM (16 years ago)

Author:

livings124

Message:

in info show the number of incoming connections next to total connections

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• libtransmission/transmission.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/InfoWindowController.m (modified) (1 diff)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -287 +287 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };

trunk/libtransmission/transmission.c

@@ -495 +495 @@
 
     s->peersTotal       = 0;
+    s->peersIncoming    = 0;
     s->peersUploading   = 0;
     s->peersDownloading = 0;
@@ -505 +506 @@
         {
             (s->peersTotal)++;
+            
+            if( tr_peerIsIncoming( peer ) )
+            {
+                (s->peersIncoming)++;
+            }
+            
+            if( tr_peerIsUploading( peer ) )
+            {
+                (s->peersUploading)++;
+            }
+            
             if( tr_peerIsUploading( peer ) )
             {

trunk/libtransmission/transmission.h

@@ -359 +359 @@
     int                 eta;
     int                 peersTotal;
+    int                 peersIncoming;
     int                 peersUploading;
     int                 peersDownloading;

trunk/macosx/InfoWindowController.m

@@ -273 +273 @@
         BOOL active = [torrent isActive];
         
-        [fConnectedPeersField setStringValue: active ? [NSString stringWithInt: [torrent totalPeers]] : @""];
+        [fConnectedPeersField setStringValue: active ? [NSString stringWithFormat: @"%d (%d incoming)",
+                                                        [torrent totalPeers], [torrent totalPeersIncoming]]: @""];
         [fDownloadingFromField setStringValue: active ? [NSString stringWithInt: [torrent peersUploading]] : @""];
         [fUploadingToField setStringValue: active ? [NSString stringWithInt: [torrent peersDownloading]] : @""];

trunk/macosx/Torrent.h

@@ -135 +135 @@
 - (int) leechers;
 - (int) totalPeers;
+- (int) totalPeersIncoming;
+- (int) totalPeersOutgoing;
 - (int) peersUploading;
 - (int) peersDownloading;

trunk/macosx/Torrent.m

@@ -682 +682 @@
 {
     return fStat->peersTotal;
+}
+
+- (int) totalPeersIncoming
+{
+    return fStat->peersIncoming;
+}
+
+- (int) totalPeersOutgoing
+{
+    return [self totalPeers] - [self totalPeersIncoming];
 }