github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Changed method sinature:
	RequestGroup::getURIs
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* test/Metalink2RequestGroupTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-05-12 11:15:17 +00:00
parent 5f8e8e371e
commit f84eac327f
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Changed method sinature:
RequestGroup::getURIs
* src/RequestGroup.cc
* src/RequestGroup.h
* test/Metalink2RequestGroupTest.cc
2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-05-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Changed method signature: Changed method signature:

10
src/RequestGroup.cc
View File

@ -754,11 +754,10 @@ void RequestGroup::initializePostDownloadHandler()
#endif // ENABLE_METALINK #endif // ENABLE_METALINK
} }
std::deque<std::string> RequestGroup::getUris() const void RequestGroup::getURIs(std::deque<std::string>& uris) const
{ {
std::deque<std::string> temp(_spentUris.begin(), _spentUris.end()); uris.insert(uris.end(), _spentUris.begin(), _spentUris.end());
temp.insert(temp.end(), _uris.begin(), _uris.end()); uris.insert(uris.end(), _uris.begin(), _uris.end());
return temp;
} }
bool RequestGroup::isDependencyResolved() bool RequestGroup::isDependencyResolved()
@ -853,7 +852,8 @@ bool RequestGroup::needsFileAllocation() const
DownloadResultHandle RequestGroup::createDownloadResult() const DownloadResultHandle RequestGroup::createDownloadResult() const
{ {
std::deque<std::string> uris = getUris(); std::deque<std::string> uris;
getURIs(uris);
return return
SharedHandle<DownloadResult>(new DownloadResult(_gid, SharedHandle<DownloadResult>(new DownloadResult(_gid,
getFilePath(), getFilePath(),

2
src/RequestGroup.h
View File

@ -179,7 +179,7 @@ public:
return _spentUris; return _spentUris;
} }
std::deque<std::string> getUris() const; void getURIs(std::deque<std::string>& uris) const;
/** /**
* Compares expected filename with specified actualFilename. * Compares expected filename with specified actualFilename.

12
test/Metalink2RequestGroupTest.cc
View File

@ -37,7 +37,8 @@ void Metalink2RequestGroupTest::testGenerate()
// first file // first file
{ {
SharedHandle<RequestGroup> rg = groups[0]; SharedHandle<RequestGroup> rg = groups[0];
std::deque<std::string> uris = rg->getUris(); std::deque<std::string> uris;
rg->getURIs(uris);
std::sort(uris.begin(), uris.end()); std::sort(uris.begin(), uris.end());
CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size()); CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size());
CPPUNIT_ASSERT_EQUAL(std::string("ftp://ftphost/aria2-0.5.2.tar.bz2"), uris[0]); CPPUNIT_ASSERT_EQUAL(std::string("ftp://ftphost/aria2-0.5.2.tar.bz2"), uris[0]);
@ -55,7 +56,8 @@ void Metalink2RequestGroupTest::testGenerate()
// second file // second file
{ {
SharedHandle<RequestGroup> rg = groups[1]; SharedHandle<RequestGroup> rg = groups[1];
std::deque<std::string> uris = rg->getUris(); std::deque<std::string> uris;
rg->getURIs(uris);
CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size()); CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size());
SharedHandle<SingleFileDownloadContext> dctx SharedHandle<SingleFileDownloadContext> dctx
(dynamic_pointer_cast<SingleFileDownloadContext>(rg->getDownloadContext())); (dynamic_pointer_cast<SingleFileDownloadContext>(rg->getDownloadContext()));
@ -73,7 +75,8 @@ void Metalink2RequestGroupTest::testGenerate()
// fifth file <- downloading .torrent file // fifth file <- downloading .torrent file
{ {
SharedHandle<RequestGroup> rg = groups[4]; SharedHandle<RequestGroup> rg = groups[4];
std::deque<std::string> uris = rg->getUris(); std::deque<std::string> uris;
rg->getURIs(uris);
CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size());
CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated.torrent"), CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated.torrent"),
uris[0]); uris[0]);
@ -90,7 +93,8 @@ void Metalink2RequestGroupTest::testGenerate()
#else #else
SharedHandle<RequestGroup> rg = groups[4]; SharedHandle<RequestGroup> rg = groups[4];
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
std::deque<std::string> uris = rg->getUris(); std::deque<std::string> uris;
rg->getURIs(uris);
CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size());
CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated"), uris[0]); CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated"), uris[0]);
SharedHandle<SingleFileDownloadContext> dctx SharedHandle<SingleFileDownloadContext> dctx