Ticket #1715: session_stats.patch

libtransmission/rpcimpl.c

@@ -22 +22 @@
 #include "session.h"
 #include "torrent.h"
 #include "utils.h"
+#include "stats.h"
 
 #define TR_N_ELEMENTS( ary ) ( sizeof( ary ) / sizeof( *ary ) )
 
@@ -691 +692 @@
 {
     int running = 0;
     int total = 0;
+    tr_benc * d; 
+    tr_session_stats currentstats = { 0.0f, 0, 0, 0, 0, 0 };
+    tr_session_stats cumulativestats = { 0.0f, 0, 0, 0, 0, 0 };
     tr_torrent * tor = NULL;
 
     while(( tor = tr_torrentNext( session, tor ))) {
@@ -699 +703 @@
             ++running;
     }
 
+    tr_sessionGetStats( session, &currentstats );
+    tr_sessionGetCumulativeStats( session, &cumulativestats );
+
     tr_bencDictAddInt( args_out, "activeTorrentCount", running );
     tr_bencDictAddInt( args_out, "downloadSpeed", (int)( tr_sessionGetPieceSpeed( session, TR_DOWN ) * 1024 ) );
     tr_bencDictAddInt( args_out, "pausedTorrentCount", total - running );
     tr_bencDictAddInt( args_out, "torrentCount", total );
     tr_bencDictAddInt( args_out, "uploadSpeed", (int)( tr_sessionGetPieceSpeed( session, TR_UP ) * 1024 ) );
+
+    d = tr_bencDictAddDict( args_out, "cumulative-stats", 5 ); 
+    tr_bencDictAddInt( d, "uploadedBytes", cumulativestats.uploadedBytes );
+    tr_bencDictAddInt( d, "downloadedBytes", cumulativestats.downloadedBytes );
+    tr_bencDictAddInt( d, "filesAdded", cumulativestats.filesAdded );
+    tr_bencDictAddInt( d, "sessionCount", cumulativestats.sessionCount );
+    tr_bencDictAddInt( d, "secondsActive", cumulativestats.secondsActive );
+
+    d = tr_bencDictAddDict( args_out, "current-stats", 5 ); 
+    tr_bencDictAddInt( d, "uploadedBytes", currentstats.uploadedBytes );
+    tr_bencDictAddInt( d, "downloadedBytes", currentstats.downloadedBytes );
+    tr_bencDictAddInt( d, "filesAdded", currentstats.filesAdded );
+    tr_bencDictAddInt( d, "sessionCount", currentstats.sessionCount );
+    tr_bencDictAddInt( d, "secondsActive", currentstats.secondsActive );
+
     return NULL;
 }
 

doc/rpc-spec.txt

@@ -362 +362 @@
    "pausedTorrentCount"       | number
    "torrentCount"             | number
    "uploadSpeed"              | number
+   ---------------------------+-------------------------------+
+   "cumulative-stats"         | object, containing:           |
+                              +------------------+------------+
+                              | uploadedBytes    | number     | tr_session_stats
+                              | downloadedBytes  | number     | tr_session_stats
+                              | filesAdded       | number     | tr_session_stats
+                              | sessionCount     | number     | tr_session_stats
+                              | secondsActive    | number     | tr_session_stats
+   ---------------------------+-------------------------------+
+   "current-stats"            | object, containing:           |
+                              +------------------+------------+
+                              | uploadedBytes    | number     | tr_session_stats
+                              | downloadedBytes  | number     | tr_session_stats
+                              | filesAdded       | number     | tr_session_stats
+                              | sessionCount     | number     | tr_session_stats
+                              | secondsActive    | number     | tr_session_stats
    
 
 5.0.  Protocol Versions
@@ -382 +398 @@
    ------+---------+-----------+----------------+-------------------------------
    4     | 1.50    | yes       | session-get    | new arg "rpc-version"
          |         |           | session-get    | new arg "rpc-version-minimum"
+         |         |           | session-stats  | added "cumulative-stats"
+         |         |           | session-stats  | added "current-stats"
          |         |           | torrent-get    | new arg "downloadDir"
    ------+---------+-----------+----------------+-------------------------------