Changeset 11194

Timestamp:

Sep 3, 2010, 4:30:43 AM (13 years ago)

Author:

charles

Message:

(trunk) revert the RPC behavior of rateUpload, rateDownload, rateToClient, and rateToPeer as discussed with Longinus00

Location:

trunk

Files:

• extras/rpc-spec.txt (modified) (3 diffs)
• libtransmission/announcer.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (2 diffs)
• qt/torrent.cc (modified) (2 diffs)
• qt/torrent.h (modified) (1 diff)

trunk/extras/rpc-spec.txt

@@ -183 +183 @@
    pieceSize                   | number                      | tr_info
    priorities                  | array (see below)           | n/a
-   rateDownload (KBps)         | double                      | tr_stat
-   rateUpload (KBps)           | double                      | tr_stat
+   rateDownload (B/s)          | number                      | tr_stat
+   rateUpload (B/s)            | number                      | tr_stat
    recheckProgress             | double                      | tr_stat
    seedIdleLimit               | number                      | tr_torrent
@@ -236 +236 @@
                       | port                    | number     | tr_peer_stat
                       | progress                | double     | tr_peer_stat
-                      | rateToClient (KBps)     | double     | tr_peer_stat
-                      | rateToPeer (KBps)       | double     | tr_peer_stat
+                      | rateToClient (B/s)      | number     | tr_peer_stat
+                      | rateToPeer (B/s)        | number     | tr_peer_stat
    -------------------+--------------------------------------+
    peersFrom          | an object containing:                |
@@ -625 +625 @@
          |         | yes       | torrent-set    | new arg "seedIdleLimit"
          |         | yes       | torrent-set    | new arg "seedIdleMode"
-         |         |        NO | torrent-get    | units for "rateDownload" changed from B to KB
-         |         |        NO | torrent-get    | units for "rateUpload" changed from B to KB

trunk/libtransmission/announcer.c

@@ -1994 +1994 @@
             tr_strlcpy( st->host, tracker->host->name, sizeof( st->host ) );
             tr_strlcpy( st->announce, tracker->announce, sizeof( st->announce ) );
-            tr_strlcpy( st->scrape, tracker->scrape, sizeof( st->scrape ) );
             st->tier = i;
             st->isBackup = tracker != tier->currentTracker;
             st->lastScrapeStartTime = tier->lastScrapeStartTime;
+            if( tracker->scrape )
+                tr_strlcpy( st->scrape, tracker->scrape, sizeof( st->scrape ) );
+            else
+                st->scrape[0] = '\0';
 
             st->seederCount = tracker->seederCount;

trunk/libtransmission/rpcimpl.c

@@ -444 +444 @@
         tr_bencDictAddInt ( d, "port", peer->port );
         tr_bencDictAddReal( d, "progress", peer->progress );
-        tr_bencDictAddReal( d, "rateToClient", peer->rateToClient_KBps );
-        tr_bencDictAddReal( d, "rateToPeer", peer->rateToPeer_KBps );
+        tr_bencDictAddInt ( d, "rateToClient", toSpeedBytes( peer->rateToClient_KBps ) );
+        tr_bencDictAddInt ( d, "rateToPeer", toSpeedBytes( peer->rateToPeer_KBps ) );
     }
 
@@ -571 +571 @@
     }
     else if( tr_streq( key, keylen, "rateDownload" ) )
-        tr_bencDictAddReal( d, key, st->pieceDownloadSpeed_KBps );
+        tr_bencDictAddInt( d, key, toSpeedBytes( st->pieceDownloadSpeed_KBps ) );
     else if( tr_streq( key, keylen, "rateUpload" ) )
-        tr_bencDictAddReal( d, key, st->pieceUploadSpeed_KBps );
+        tr_bencDictAddInt( d, key, toSpeedBytes( st->pieceUploadSpeed_KBps ) );
     else if( tr_streq( key, keylen, "recheckProgress" ) )
         tr_bencDictAddReal( d, key, st->recheckProgress );

trunk/qt/torrent.cc

@@ -56 +56 @@
 {
     { ID, "id", QVariant::Int, INFO, },
-    { UPLOAD_SPEED, "rateUpload", QVariant::Double, STAT } /* KBps */,
-    { DOWNLOAD_SPEED, "rateDownload", QVariant::Double, STAT }, /* KBps */
+    { UPLOAD_SPEED, "rateUpload", QVariant::ULongLong, STAT } /* Bps */,
+    { DOWNLOAD_SPEED, "rateDownload", QVariant::ULongLong, STAT }, /* Bps */
     { DOWNLOAD_DIR, "downloadDir", QVariant::String, STAT },
     { ACTIVITY, "status", QVariant::Int, STAT },
@@ -663 +663 @@
             if( tr_bencDictFindReal( child, "progress", &d ) )
                 peer.progress = d;
-            if( tr_bencDictFindReal( child, "rateToClient", &d ) )
-                peer.rateToClient = Speed::fromKBps( d );
-            if( tr_bencDictFindReal( child, "rateToPeer", &d ) )
-                peer.rateToPeer = Speed::fromKBps( d );
+            if( tr_bencDictFindInt( child, "rateToClient", &i ) )
+                peer.rateToClient = Speed::fromBps( i );
+            if( tr_bencDictFindInt( child, "rateToPeer", &i ) )
+                peer.rateToPeer = Speed::fromBps( i );
             peerList << peer;
         }

trunk/qt/torrent.h

@@ -284 +284 @@
         int connectedPeers( ) const { return getInt( PEERS_CONNECTED ); }
         int connectedPeersAndWebseeds( ) const { return connectedPeers( ) + getInt( WEBSEEDS_SENDING_TO_US ); }
-        Speed downloadSpeed( ) const { return Speed::fromKBps( getDouble( DOWNLOAD_SPEED ) ); }
-        Speed uploadSpeed( ) const { return Speed::fromKBps( getDouble( UPLOAD_SPEED ) ); }
+        Speed downloadSpeed( ) const { return Speed::fromBps( getSize( DOWNLOAD_SPEED ) ); }
+        Speed uploadSpeed( ) const { return Speed::fromBps( getSize( UPLOAD_SPEED ) ); }
         double getVerifyProgress( ) const { return getDouble( PERCENT_VERIFIED ); }
         bool hasFileSubstring( const QString& substr ) const;