From 03da3e0a60bc24e8fc01556982d45d5fef97a903 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Sun, 13 Jan 2013 20:39:56 +0000 Subject: [PATCH] (libT) #5220 'add etaIdle to torrent-get in RPC' -- done. --- extras/rpc-spec.txt | 4 ++++ libtransmission/quark.c | 1 + libtransmission/quark.h | 1 + libtransmission/rpcimpl.c | 6 +++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/extras/rpc-spec.txt b/extras/rpc-spec.txt index ad81cf416..6fc56f246 100644 --- a/extras/rpc-spec.txt +++ b/extras/rpc-spec.txt @@ -163,6 +163,7 @@ error | number | tr_stat errorString | string | tr_stat eta | number | tr_stat + etaIdle | number | tr_stat files | array (see below) | n/a fileStats | array (see below) | n/a hashString | string | tr_info @@ -715,3 +716,6 @@ | | yes | | new method "queue-move-down" | | yes | | new method "queue-move-bottom" | | yes | | new method "torrent-start-now" + ------+---------+-----------+----------------+------------------------------- + 15 | 2.80 | yes | torrent-get | new arg "etaIdle" + diff --git a/libtransmission/quark.c b/libtransmission/quark.c index 4bd81e9d4..603c3489b 100644 --- a/libtransmission/quark.c +++ b/libtransmission/quark.c @@ -100,6 +100,7 @@ static const struct tr_key_struct my_static[] = { "error", 5 }, { "errorString", 11 }, { "eta", 3 }, + { "etaIdle", 7 }, { "failure reason", 14 }, { "fields", 6 }, { "fileStats", 9 }, diff --git a/libtransmission/quark.h b/libtransmission/quark.h index 5bb6900e5..2f1b3f3a6 100644 --- a/libtransmission/quark.h +++ b/libtransmission/quark.h @@ -110,6 +110,7 @@ enum TR_KEY_error, TR_KEY_errorString, TR_KEY_eta, + TR_KEY_etaIdle, TR_KEY_failure_reason, TR_KEY_fields, TR_KEY_fileStats, diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c index 6a581dd59..1599f58fd 100644 --- a/libtransmission/rpcimpl.c +++ b/libtransmission/rpcimpl.c @@ -34,7 +34,7 @@ #include "version.h" #include "web.h" -#define RPC_VERSION 14 +#define RPC_VERSION 15 #define RPC_VERSION_MIN 1 #define RECENTLY_ACTIVE_SECONDS 60 @@ -760,6 +760,10 @@ addField (tr_torrent * const tor, tr_variantDictAddInt (d, key, st->queuePosition); break; + case TR_KEY_etaIdle: + tr_variantDictAddInt (d, key, st->etaIdle); + break; + case TR_KEY_rateDownload: tr_variantDictAddInt (d, key, toSpeedBytes (st->pieceDownloadSpeed_KBps)); break;