Add "seeder" key to tellStatus RPC response

4 files changed, 19 insertions, 8 deletions

diff --git a/src/ConsoleStatCalc.cc b/src/ConsoleStatCalc.cc
index 9ea84a88..066e814f 100644
--- a/src/ConsoleStatCalc.cc
+++ b/src/ConsoleStatCalc.cc
@@ -105,10 +105,7 @@ void printSizeProgress(ColorizedStream& o,
                        const SizeFormatter& sizeFormatter)
 {
 #ifdef ENABLE_BITTORRENT
-  if (rg->getDownloadContext()->hasAttribute(CTX_ATTR_BT) &&
-      !bittorrent::getTorrentAttrs(rg->getDownloadContext())
-           ->metadata.empty() &&
-      rg->downloadFinished()) {
+  if (rg->isSeeder()) {
     o << "SEED(";
     if (rg->getCompletedLength() > 0) {
       std::streamsize oldprec = o.precision();
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index a1f7080d..0098acc4 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -1264,4 +1264,10 @@ void RequestGroup::enableSeedOnly()
   }
 }
 
+bool RequestGroup::isSeeder() const {
+  return downloadContext_->hasAttribute(CTX_ATTR_BT) &&
+         !bittorrent::getTorrentAttrs(downloadContext_)->metadata.empty() &&
+         downloadFinished();
+}
+
 } // namespace aria2
diff --git a/src/RequestGroup.h b/src/RequestGroup.h
index 38dbb1fd..fcb09cd5 100644
--- a/src/RequestGroup.h
+++ b/src/RequestGroup.h
@@ -489,6 +489,9 @@ public:
   bool isSeedOnlyEnabled() { return seedOnly_; }
 
   void enableSeedOnly();
+
+  // Returns true if this download is now seeding.
+  bool isSeeder() const;
 };
 
 } // namespace aria2
diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc
index 0f87a948..7cded6ab 100644
--- a/src/RpcMethodImpl.cc
+++ b/src/RpcMethodImpl.cc
@@ -710,7 +710,9 @@ void gatherBitTorrentMetadata(Dict* btDict, TorrentAttribute* torrentAttrs)
 }
 
 namespace {
-void gatherProgressBitTorrent(Dict* entryDict, TorrentAttribute* torrentAttrs,
+void gatherProgressBitTorrent(Dict* entryDict,
+                              const std::shared_ptr<RequestGroup>& group,
+                              TorrentAttribute* torrentAttrs,
                               BtObject* btObject,
                               const std::vector<std::string>& keys)
 {
@@ -734,6 +736,9 @@ void gatherProgressBitTorrent(Dict* entryDict, TorrentAttribute* torrentAttrs,
                      util::uitos(countSeeder(peers.begin(), peers.end())));
     }
   }
+  if (requested_key(keys, KEY_SEEDER)) {
+    entryDict->put(KEY_SEEDER, group->isSeeder() ? VLB_TRUE : VLB_FALSE);
+  }
 }
 } // namespace
 
@@ -777,9 +782,9 @@ void gatherProgress(Dict* entryDict, const std::shared_ptr<RequestGroup>& group,
   gatherProgressCommon(entryDict, group, keys);
 #ifdef ENABLE_BITTORRENT
   if (group->getDownloadContext()->hasAttribute(CTX_ATTR_BT)) {
-    gatherProgressBitTorrent(
-        entryDict, bittorrent::getTorrentAttrs(group->getDownloadContext()),
-        e->getBtRegistry()->get(group->getGID()), keys);
+    gatherProgressBitTorrent(entryDict, group, bittorrent::getTorrentAttrs(
+                                                   group->getDownloadContext()),
+                             e->getBtRegistry()->get(group->getGID()), keys);
   }
 #endif // ENABLE_BITTORRENT
 }