diff --git a/ChangeLog b/ChangeLog index a043a091..641c54ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2009-12-22 Tatsuhiro Tsujikawa + + Added changePosition XML-RPC method. It takes 3 parameters: gid, + pos and how. This method changes the position of download denoted + by gid. If how is POS_SET, it moves the download to a position + relative to the beginning of the queue. If how is POS_CUR, it + moves the download to a position relative to the current + position. If how is POS_END, it moves the download to a position + relative to the end of the queue. If the destination position is + less than 0 or beyond the end of the queue, it moves the download + to the beginning or the end of the queue respectively. Returns + the destination position. + * src/RequestGroupMan.cc + * src/RequestGroupMan.h + * src/XmlRpcMethodFactory.cc + * src/XmlRpcMethodImpl.cc + * src/XmlRpcMethodImpl.h + * test/RequestGroupManTest.cc + * test/XmlRpcMethodTest.cc + 2009-12-20 Tatsuhiro Tsujikawa Added getOption and getGlobalOption to aria2rpc. diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc index 02bb3070..23a50368 100644 --- a/src/RequestGroupMan.cc +++ b/src/RequestGroupMan.cc @@ -66,6 +66,7 @@ #include "util.h" #include "Command.h" #include "FileEntry.h" +#include "StringFormat.h" namespace aria2 { @@ -173,6 +174,48 @@ RequestGroupMan::findReservedGroup(int32_t gid) const } } +size_t RequestGroupMan::changeReservedGroupPosition +(int32_t gid, int pos, HOW how) +{ + std::deque >::iterator i = + findByGID(_reservedGroups.begin(), _reservedGroups.end(), gid); + if(i == _reservedGroups.end()) { + throw DL_ABORT_EX + (StringFormat("GID#%d not found in the waiting queue.", gid).str()); + } + SharedHandle rg = *i; + if(how == POS_SET) { + _reservedGroups.erase(i); + if(pos < 0) { + pos = 0; + } else if(pos > 0) { + pos = std::min(_reservedGroups.size(), (size_t)pos); + } + } else if(how == POS_CUR) { + size_t abspos = std::distance(_reservedGroups.begin(), i); + if(pos < 0) { + int dist = -std::distance(_reservedGroups.begin(), i); + pos = abspos+std::max(pos, dist); + } else if(pos > 0) { + int dist = std::distance(i, _reservedGroups.end())-1; + pos = abspos+std::min(pos, dist); + } else { + pos = abspos; + } + _reservedGroups.erase(i); + } else if(how == POS_END) { + _reservedGroups.erase(i); + if(pos >= 0) { + pos = _reservedGroups.size(); + } else { + pos = + _reservedGroups.size()-std::min(_reservedGroups.size(), (size_t)-pos); + } + } + _reservedGroups.insert(_reservedGroups.begin()+pos, rg); + return pos; +} + bool RequestGroupMan::removeReservedGroup(int32_t gid) { std::deque >::iterator i = diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h index 3fc93299..c579c095 100644 --- a/src/RequestGroupMan.h +++ b/src/RequestGroupMan.h @@ -130,6 +130,23 @@ public: SharedHandle findReservedGroup(int32_t gid) const; + enum HOW { + POS_SET, + POS_CUR, + POS_END + }; + + // Changes the position of download denoted by gid. If how is + // POS_SET, it moves the download to a position relative to the + // beginning of the queue. If how is POS_CUR, it moves the download + // to a position relative to the current position. If how is + // POS_END, it moves the download to a position relative to the end + // of the queue. If the destination position is less than 0 or + // beyond the end of the queue, it moves the download to the + // beginning or the end of the queue respectively. Returns the + // destination position. + size_t changeReservedGroupPosition(int32_t gid, int pos, HOW how); + bool removeReservedGroup(int32_t gid); void showDownloadResults(std::ostream& o) const; diff --git a/src/XmlRpcMethodFactory.cc b/src/XmlRpcMethodFactory.cc index 699b72e1..c0597fa2 100644 --- a/src/XmlRpcMethodFactory.cc +++ b/src/XmlRpcMethodFactory.cc @@ -58,6 +58,8 @@ XmlRpcMethodFactory::create(const std::string& methodName) } else if(methodName == "aria2.remove") { return SharedHandle(new RemoveXmlRpcMethod()); + } else if(methodName == "aria2.changePosition") { + return SharedHandle(new ChangePositionXmlRpcMethod()); } else if(methodName == "aria2.tellStatus") { return SharedHandle(new TellStatusXmlRpcMethod()); } else if(methodName == "aria2.getUris") { diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc index c99b5103..855f2be7 100644 --- a/src/XmlRpcMethodImpl.cc +++ b/src/XmlRpcMethodImpl.cc @@ -727,6 +727,35 @@ BDE GetGlobalOptionXmlRpcMethod::process return result; } +BDE ChangePositionXmlRpcMethod::process +(const XmlRpcRequest& req, DownloadEngine* e) +{ + const BDE& params = req._params; + assert(params.isList()); + + if(params.size() != 3 || + !params[0].isString() || !params[1].isInteger() || !params[2].isString()) { + throw DL_ABORT_EX("Illegal argument."); + } + int32_t gid = util::parseInt(params[0].s()); + int pos = params[1].i(); + const std::string& howStr = params[2].s(); + RequestGroupMan::HOW how; + if(howStr == "POS_SET") { + how = RequestGroupMan::POS_SET; + } else if(howStr == "POS_CUR") { + how = RequestGroupMan::POS_CUR; + } else if(howStr == "POS_END") { + how = RequestGroupMan::POS_END; + } else { + throw DL_ABORT_EX("Illegal argument."); + } + size_t destPos = + e->_requestGroupMan->changeReservedGroupPosition(gid, pos, how); + BDE result(destPos); + return result; +} + BDE NoSuchMethodXmlRpcMethod::process (const XmlRpcRequest& req, DownloadEngine* e) { diff --git a/src/XmlRpcMethodImpl.h b/src/XmlRpcMethodImpl.h index 5e6f4fe6..b805829a 100644 --- a/src/XmlRpcMethodImpl.h +++ b/src/XmlRpcMethodImpl.h @@ -130,6 +130,11 @@ protected: virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e); }; +class ChangePositionXmlRpcMethod:public XmlRpcMethod { +protected: + virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e); +}; + class NoSuchMethodXmlRpcMethod:public XmlRpcMethod { protected: virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e); diff --git a/test/RequestGroupManTest.cc b/test/RequestGroupManTest.cc index 0437fc6c..dcadf209 100644 --- a/test/RequestGroupManTest.cc +++ b/test/RequestGroupManTest.cc @@ -13,6 +13,7 @@ #include "ServerStatMan.h" #include "ServerStat.h" #include "File.h" +#include "array_fun.h" namespace aria2 { @@ -23,12 +24,14 @@ class RequestGroupManTest : public CppUnit::TestFixture { CPPUNIT_TEST(testGetInitialCommands); CPPUNIT_TEST(testLoadServerStat); CPPUNIT_TEST(testSaveServerStat); + CPPUNIT_TEST(testChangeReservedGroupPosition); CPPUNIT_TEST_SUITE_END(); private: SharedHandle