Changeset 10967 for trunk/daemon/remote.c

Timestamp:

Jul 7, 2010, 5:53:16 PM (12 years ago)

Author:

charles

Message:

(trunk daemon) #3400 "transmission-remote does not show running torrents" -- fixed.

File:

• trunk/daemon/remote.c (modified) (6 diffs)

trunk/daemon/remote.c

@@ -822 +822 @@
             if( tr_bencDictFindInt( t, "eta", &i ) )
                 printf( "  ETA: %s\n", tr_strltime( buf, i, sizeof( buf ) ) );
-            if( tr_bencDictFindInt( t, "rateDownload", &i ) )
-                printf( "  Download Speed: %s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
-            if( tr_bencDictFindInt( t, "rateUpload", &i ) )
-                printf( "  Upload Speed: %s\n", tr_formatter_speed_KBps( buf, i, sizeof( buf ) ) );
+            if( tr_bencDictFindReal( t, "rateDownload", &d ) )
+                printf( "  Download Speed: %s\n", tr_formatter_speed_KBps( buf, d, sizeof( buf ) ) );
+            if( tr_bencDictFindReal( t, "rateUpload", &d ) )
+                printf( "  Upload Speed: %s\n", tr_formatter_speed_KBps( buf, d, sizeof( buf ) ) );
             if( tr_bencDictFindInt( t, "haveUnchecked", &i )
               && tr_bencDictFindInt( t, "haveValid", &j ) )
@@ -1283 +1283 @@
     {
         int i, n;
-        int64_t total_up = 0, total_down = 0, total_size = 0;
+        int64_t total_size=0;
+        double total_up=0, total_down=0;
         char haveStr[32];
 
@@ -1292 +1293 @@
         for( i = 0, n = tr_bencListSize( list ); i < n; ++i )
         {
-            int64_t      id, eta, status, up, down;
+            int64_t      id, eta, status;
             int64_t      sizeWhenDone, leftUntilDone;
-            double       ratio;
+            double       ratio, up, down;
             const char * name;
             tr_benc *   d = tr_bencListChild( list, i );
@@ -1301 +1302 @@
               && tr_bencDictFindInt( d, "leftUntilDone", &leftUntilDone )
               && tr_bencDictFindStr( d, "name", &name )
-              && tr_bencDictFindInt( d, "rateDownload", &down )
-              && tr_bencDictFindInt( d, "rateUpload", &up )
+              && tr_bencDictFindReal( d, "rateDownload", &down )
+              && tr_bencDictFindReal( d, "rateUpload", &up )
               && tr_bencDictFindInt( d, "sizeWhenDone", &sizeWhenDone )
               && tr_bencDictFindInt( d, "status", &status )
@@ -1335 +1336 @@
                     haveStr,
                     etaStr,
-                    up / (double)SPEED_K,
-                    down / (double)SPEED_K,
+                    up,
+                    down,
                     strlratio2( ratioStr, ratio, sizeof( ratioStr ) ),
                     getStatusString( d, statusStr, sizeof( statusStr ) ),
@@ -1349 +1350 @@
         printf( "Sum:         %9s            %6.1f  %6.1f\n",
                 strlsize( haveStr, total_size, sizeof( haveStr ) ),
-                total_up / (double)SPEED_K,
-                total_down / (double)SPEED_K );
+                total_up,
+                total_down );
     }
 }