Changeset 10873

Timestamp:

Jun 26, 2010, 5:48:57 PM (13 years ago)

Author:

Longinus00

Message:

(2.0x qt) #3286:Use flagStr in the status field of the peer list

Location:

branches/2.0x

Files:

• doc/rpc-spec.txt (modified) (1 diff)
• qt/details.cc (modified) (2 diffs)
• qt/torrent.cc (modified) (1 diff)
• qt/torrent.h (modified) (1 diff)

branches/2.0x/doc/rpc-spec.txt

@@ -217 +217 @@
                       | clientIsChoked          | boolean    | tr_peer_stat
                       | clientIsInterested      | boolean    | tr_peer_stat
+                      | flagStr                 | string     | tr_peer_stat
                       | isDownloadingFrom       | boolean    | tr_peer_stat
                       | isEncrypted             | boolean    | tr_peer_stat

branches/2.0x/qt/details.cc

@@ -824 +824 @@
             }
 
-            QString code;
-            if( peer.isDownloadingFrom )                           { code += 'D'; }
-            else if( peer.clientIsInterested )                     { code += 'd'; }
-            if( peer.isUploadingTo )                               { code += 'U'; }
-            else if( peer.peerIsInterested )                       { code += 'u'; }
-            if( !peer.clientIsChoked && !peer.clientIsInterested ) { code += 'K'; }
-            if( !peer.peerIsChoked && !peer.peerIsInterested )     { code += '?'; }
-            if( peer.isEncrypted )                                 { code += 'E'; }
-            if( peer.isIncoming )                                  { code += 'I'; }
+            const QString code = peer.flagStr;
             item->setStatus( code );
             item->refresh( peer );
@@ -848 +840 @@
                     case '?': txt = tr( "We unchoked this peer, but they're not interested" ); break;
                     case 'E': txt = tr( "Encrypted connection" ); break;
+                    case 'H': txt = tr( "Peer was discovered through DHT" ); break;
                     case 'X': txt = tr( "Peer was discovered through Peer Exchange (PEX)" ); break;
                     case 'I': txt = tr( "Peer is an incoming connection" ); break;

branches/2.0x/qt/torrent.cc

@@ -636 +636 @@
             if( tr_bencDictFindBool( child, "clientIsInterested", &b ) )
                 peer.clientIsInterested = b;
+            if( tr_bencDictFindStr( child, "flagStr", &str ) )
+                peer.flagStr = QString::fromUtf8( str );
             if( tr_bencDictFindBool( child, "isDownloadingFrom", &b ) )
                 peer.isDownloadingFrom = b;

branches/2.0x/qt/torrent.h

@@ -43 +43 @@
     bool clientIsChoked;
     bool clientIsInterested;
+    QString flagStr;
     bool isDownloadingFrom;
     bool isEncrypted;