Changeset 8105

Timestamp:

Mar 29, 2009, 6:45:35 PM (14 years ago)

Author:

charles

Message:

(trunk rpc) add "seed ratio" feature to RPC

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (4 diffs)
• libtransmission/bencode.c (modified) (2 diffs)
• libtransmission/bencode.h (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (5 diffs)

trunk/doc/rpc-spec.txt

@@ -108 +108 @@
    "priority-low"                    | array      indices of low-priority file(s)
    "priority-normal"                 | array      indices of normal-priority file(s)
+   "seedRatioLimit"                  | 'double'   session seeding ratio
+   "seedRatioLimited"                | 'boolean'  true if "seedRatioLimit" is honored
    "uploadLimit"                     | number     maximum upload speed (in K/s)
    "uploadLimited"                   | 'boolean'  true if "uploadLimit" is honored
@@ -185 +187 @@
    scrapeURL                       | string                      | tr_stat
    seeders                         | number                      | tr_stat
+   seedRatioLimit                  | 'double'                    | tr_torrent
+   seedRatioMode                   | number                      | tr_ratiolimit
    sizeWhenDone                    | number                      | tr_stat
    startDate                       | number                      | tr_stat
@@ -439 +443 @@
          |         | yes       | torrent-set    | new arg "downloadLimited"
          |         | yes       | torrent-set    | new arg "uploadLimited"
-         |         | yes       | torrent-set    | new arg "honorsSessionLImits"
+         |         | yes       | torrent-set    | new arg "honorsSessionLimits"
+         |         | yes       | session-get    | new arg "seedRatioLimit"
+         |         | yes       | session-get    | new arg "seedRatioLimited"
          |         | yes       | session-get    | new arg "alt-speed-enabled"
          |         | yes       | session-get    | new arg "alt-speed-time-enabled"
@@ -449 +455 @@
          |         | yes       | session-get    | new arg "blocklist-size"
          |         | yes       | session-get    | new arg "peer-limit-per-torrent"
+         |         | yes       | torrent-get    | new arg "seedRatioLimit"
+         |         | yes       | torrent-get    | new arg "seedRatioMode"
          |         | yes       | torrent-get    | new ids option "recently-active"
          |         | yes       |                | new method "torrent-reannounce"

trunk/libtransmission/bencode.c

@@ -447 +447 @@
 
 tr_bool
+tr_bencDictFindBool( tr_benc * dict, const char * key, tr_bool * setme )
+{
+    int64_t i = 0;
+    const tr_bool found = tr_bencDictFindInt( dict, key, &i ); 
+    *setme = i!=0;
+    return found;
+}
+
+tr_bool
 tr_bencDictFindDouble( tr_benc * dict, const char * key, double * setme )
 {
@@ -698 +707 @@
 
     return child;
+}
+
+tr_benc*
+tr_bencDictAddBool( tr_benc * dict, const char * key, tr_bool val )
+{
+    assert( tr_isBool( val ) );
+
+    return tr_bencDictAddInt( dict, key, val );
 }
 

trunk/libtransmission/bencode.h

@@ -131 +131 @@
 tr_benc * tr_bencDictAddInt( tr_benc *, const char * key, int64_t );
 
+tr_benc * tr_bencDictAddBool( tr_benc *, const char * key, tr_bool );
+
 tr_benc * tr_bencDictAddStr( tr_benc *, const char * key, const char * );
 
@@ -149 +151 @@
 
 tr_bool   tr_bencDictFindDouble( tr_benc *, const char * key, double * setme );
+
+tr_bool   tr_bencDictFindBool( tr_benc *, const char * key, tr_bool * setme );
 
 tr_bool   tr_bencDictFindStr( tr_benc *, const char * key, const char ** setme );

trunk/libtransmission/rpcimpl.c

@@ -501 +501 @@
     else if( !strcmp( key, "seeders" ) )
         tr_bencDictAddInt( d, key, st->seeders );
+    else if( !strcmp( key, "seedRatioLimit" ) )
+        tr_bencDictAddDouble( d, key, tr_torrentGetRatioLimit( tor ) );
+    else if( !strcmp( key, "seedRatioMode" ) )
+        tr_bencDictAddInt( d, key, tr_torrentGetRatioMode( tor ) );
     else if( !strcmp( key, "sizeWhenDone" ) )
         tr_bencDictAddInt( d, key, st->sizeWhenDone );
@@ -700 +704 @@
         if( tr_bencDictFindInt( args_in, "ratio-limit-mode", &tmp ) )
             tr_torrentSetRatioMode( tor, tmp );
+        if( tr_bencDictFindDouble( args_in, "seedRatioLimit", &d ) )
+            tr_torrentSetRatioLimit( tor, d );
+        if( tr_bencDictFindInt( args_in, "seedRatioMode", &tmp ) )
+            tr_torrentSetRatioMode( tor, tmp );
         notify( session, TR_RPC_TORRENT_CHANGED, tor );
     }
@@ -855 +863 @@
             struct tr_rpc_idle_data  * idle_data )
 {
+    tr_bool      b;
     int64_t      i;
     double       d;
@@ -887 +896 @@
     if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_PORT_FORWARDING, &i ) )
         tr_sessionSetPortForwardingEnabled( session, i );
+    if( tr_bencDictFindDouble( args_in, "seedRatioLimit", &d ) )
+        tr_sessionSetRatioLimit( session, d );
+    if( tr_bencDictFindBool( args_in, "seedRatioLimited", &b ) )
+        tr_sessionSetRatioLimited( session, b );
     if( tr_bencDictFindInt( args_in, "speed-limit-down", &i ) )
         tr_sessionSetSpeedLimit( session, TR_DOWN, i );
@@ -987 +1000 @@
     tr_bencDictAddInt( d, "rpc-version", 4 );
     tr_bencDictAddInt( d, "rpc-version-minimum", 1 );
+    tr_bencDictAddDouble( d, "seedRatioLimit", tr_sessionGetRatioLimit( s ) );
+    tr_bencDictAddBool( d, "seedRatioLimited", tr_sessionIsRatioLimited( s ) );
     tr_bencDictAddInt( d, "speed-limit-up", tr_sessionGetSpeedLimit( s, TR_UP ) );
     tr_bencDictAddInt( d, "speed-limit-up-enabled", tr_sessionIsSpeedLimited( s, TR_UP ) );