2009-05-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

The information for files, URIs, peers are removed from the
	reponse of TellaActive, TellStatus command because they tend to be
	large. Instead they can be retrieved by the dedicated commands:
	getFiles, getUris and getPeers respectively.
	* src/XmlRpcMethodFactory.cc
	* src/XmlRpcMethodImpl.cc
	* src/XmlRpcMethodImpl.h

ChangeLog

@@ -1,3 +1,13 @@
+2009-05-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	The information for files, URIs, peers are removed from the
+	reponse of TellaActive, TellStatus command because they tend to be
+	large. Instead they can be retrieved by the dedicated commands:
+	getFiles, getUris and getPeers respectively.
+	* src/XmlRpcMethodFactory.cc
+	* src/XmlRpcMethodImpl.cc
+	* src/XmlRpcMethodImpl.h
+	
 2009-05-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed --max-overall-upload-limit and

src/XmlRpcMethodFactory.cc

@@ -52,6 +52,12 @@ XmlRpcMethodFactory::create(const std::string& methodName)
     return SharedHandle<XmlRpcMethod>(new RemoveXmlRpcMethod());
   } else if(methodName == "aria2.tellStatus") {
     return SharedHandle<XmlRpcMethod>(new TellStatusXmlRpcMethod());
+  } else if(methodName == "aria2.getUris") {
+    return SharedHandle<XmlRpcMethod>(new GetUrisXmlRpcMethod());
+  } else if(methodName == "aria2.getFiles") {
+    return SharedHandle<XmlRpcMethod>(new GetFilesXmlRpcMethod());
+  } else if(methodName == "aria2.getPeers") {
+    return SharedHandle<XmlRpcMethod>(new GetPeersXmlRpcMethod());
   } else if(methodName == "aria2.tellActive") {
     return SharedHandle<XmlRpcMethod>(new TellActiveXmlRpcMethod());
   } else {

src/XmlRpcMethodImpl.cc

@@ -35,6 +35,7 @@
 #include "XmlRpcMethodImpl.h"
 
 #include <cassert>
+#include <algorithm>
 
 #include "Logger.h"
 #include "BDE.h"
@@ -179,19 +180,7 @@ static void gatherProgressCommon
       entryDict["bitfield"] = BDE(Util::toHex(ps->getBitfield(),
 					      ps->getBitfieldLength()));
     }
-
-    if(!ps->getDiskAdaptor().isNull()) {
-      BDE files = BDE::list();
-      const std::deque<SharedHandle<FileEntry> >& entries =
-	ps->getDiskAdaptor()->getFileEntries();
-      for(std::deque<SharedHandle<FileEntry> >::const_iterator i =
-	    entries.begin(); i != entries.end(); ++i) {
-	files << BDE((*i)->getPath());
-      }
-      entryDict["files"] = files;
-    }
   }
-
   entryDict["pieceLength"] = 
     BDE(Util::uitos(group->getDownloadContext()->getPieceLength()));
   entryDict["numPieces"] =
@@ -204,10 +193,8 @@ static void gatherProgressBitTorrent
   entryDict["infoHash"] = BDE(btctx->getInfoHashAsString());
 }
 
-static void gatherPeer(BDE& entryDict, const SharedHandle<PeerStorage>& ps)
+static void gatherPeer(BDE& peers, const SharedHandle<PeerStorage>& ps)
 {
-  BDE peers = BDE::list();
-
   std::deque<SharedHandle<Peer> > activePeers;
   ps->getActivePeers(activePeers);
   for(std::deque<SharedHandle<Peer> >::const_iterator i =
@@ -221,34 +208,16 @@ static void gatherPeer(BDE& entryDict, const SharedHandle<PeerStorage>& ps)
 					    (*i)->getBitfieldLength()));
     peers << peerEntry;
   }
-  entryDict["peers"] = peers;
 }
 
 static void gatherProgress
 (BDE& entryDict, const SharedHandle<RequestGroup>& group, DownloadEngine* e)
 {
   gatherProgressCommon(entryDict, group);
-
-  BDE uriList = BDE::list();
-  std::deque<std::string> uris;
-  group->getURIs(uris);
-  for(std::deque<std::string>::const_iterator i = uris.begin(); i != uris.end();
-      ++i) {
-    uriList << *i;
-  }
-  entryDict["uris"] = uriList;
-
   SharedHandle<BtContext> btctx =
     dynamic_pointer_cast<BtContext>(group->getDownloadContext());
   if(!btctx.isNull()) {
     gatherProgressBitTorrent(entryDict, btctx);
-
-    SharedHandle<BtRegistry> btreg = e->getBtRegistry();
-    SharedHandle<PeerStorage> ps =
-      btreg->getPeerStorage(btctx->getInfoHashAsString());
-    if(!ps.isNull()) {
-      gatherPeer(entryDict, ps);
-    }
   }
 }
 
@@ -265,6 +234,138 @@ static void gatherStoppedDownload
   }
 }
 
+static
+SharedHandle<RequestGroup>
+findRequestGroup(const SharedHandle<RequestGroupMan>& rgman, int32_t gid)
+{
+  SharedHandle<RequestGroup> group = rgman->findRequestGroup(gid);
+  if(group.isNull()) {
+    group = rgman->findReservedGroup(gid);
+  }
+  return group;
+}
+
+BDE GetFilesXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
+{
+  const BDE& params = req._params;
+  assert(params.isList());
+
+  if(params.empty() || !params[0].isString()) {
+    throw DlAbortEx("GID is not provided.");
+  }
+  
+  int32_t gid = Util::parseInt(params[0].s());
+
+  SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
+  if(group.isNull()) {
+    throw DlAbortEx
+      (StringFormat("No file data is available for GID#%d", gid).str());
+  }
+  BDE files = BDE::list();
+  SharedHandle<BtContext> btctx =
+    dynamic_pointer_cast<BtContext>(group->getDownloadContext());
+  if(btctx.isNull()) {
+    BDE entry = BDE::dict();
+    entry["index"] = BDE("1");
+    entry["path"] = group->getDownloadContext()->getActualBasePath();
+    entry["selected"] = BDE("true");
+    files << entry;
+  } else {
+    std::deque<int32_t> fileIndexes = btctx->getFileFilter().flush();
+    std::sort(fileIndexes.begin(), fileIndexes.end());
+    fileIndexes.erase(std::unique(fileIndexes.begin(), fileIndexes.end()),
+		      fileIndexes.end());
+    std::deque<SharedHandle<FileEntry> > fileEntries =
+      btctx->getFileEntries();
+
+    bool selectAll = fileIndexes.empty() || fileEntries.size() == 1;
+
+    size_t index = 1;
+    for(std::deque<SharedHandle<FileEntry> >::const_iterator i =
+	  fileEntries.begin(); i != fileEntries.end(); ++i, ++index) {
+      BDE entry = BDE::dict();
+      entry["index"] = Util::uitos(index);
+      entry["path"] = (*i)->getPath();
+      if(selectAll ||
+	 std::binary_search(fileIndexes.begin(), fileIndexes.end(), index)) {
+	entry["selected"] = BDE("true");
+      } else {
+	entry["selected"] = BDE("false");
+      }
+      files << entry;
+    }
+  }
+  BDE resParams = BDE::list();
+  resParams << files;
+  return resParams;
+}
+
+BDE GetUrisXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
+{
+  const BDE& params = req._params;
+  assert(params.isList());
+
+  if(params.empty() || !params[0].isString()) {
+    throw DlAbortEx("GID is not provided.");
+  }
+  
+  int32_t gid = Util::parseInt(params[0].s());
+
+  SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
+  if(group.isNull()) {
+    throw DlAbortEx
+      (StringFormat("No URI data is available for GID#%d", gid).str());
+  }
+  BDE uriList = BDE::list();
+  std::deque<std::string> uris;
+  group->getURIs(uris);
+  for(std::deque<std::string>::const_iterator i = uris.begin(); i != uris.end();
+      ++i) {
+    BDE entry = BDE::dict();
+    entry["uri"] = *i;
+    uriList << entry;
+  }
+  BDE resParams = BDE::list();
+  resParams << uriList;
+  return resParams;
+}
+
+BDE GetPeersXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
+{
+  const BDE& params = req._params;
+  assert(params.isList());
+
+  if(params.empty() || !params[0].isString()) {
+    throw DlAbortEx("GID is not provided.");
+  }
+  
+  int32_t gid = Util::parseInt(params[0].s());
+
+  SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
+  if(group.isNull()) {
+    throw DlAbortEx
+      (StringFormat("No peer data is available for GID#%d", gid).str());
+  }
+  BDE peers = BDE::list();
+  SharedHandle<BtContext> btctx =
+    dynamic_pointer_cast<BtContext>(group->getDownloadContext());
+  if(!btctx.isNull()) {
+    SharedHandle<BtRegistry> btreg = e->getBtRegistry();
+    SharedHandle<PeerStorage> ps =
+      btreg->getPeerStorage(btctx->getInfoHashAsString());
+    if(!ps.isNull()) {
+      BDE entry = BDE::dict();
+      gatherPeer(peers, ps);
+    }
+  }
+  BDE resParams = BDE::list();
+  resParams << peers;
+  return resParams;
+}
+
 BDE TellStatusXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {

src/XmlRpcMethodImpl.h

@@ -56,6 +56,21 @@ protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
 };
 
+class GetUrisXmlRpcMethod:public XmlRpcMethod {
+protected:
+  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+};
+
+class GetFilesXmlRpcMethod:public XmlRpcMethod {
+protected:
+  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+};
+
+class GetPeersXmlRpcMethod:public XmlRpcMethod {
+protected:
+  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+};
+
 class TellStatusXmlRpcMethod:public XmlRpcMethod {
 protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);