mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 13:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse source 
Call DownloadContext::setOwnerRequestGroup() in
	RequestGroup::setDownloadContext().
	* src/BtDependency.cc
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* src/download_helper.cc
	* test/DefaultBtMessageDispatcherTest.cc
	* test/DefaultExtensionMessageFactoryTest.cc
	* test/HandshakeExtensionMessageTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa 2009-11-28 10:12:04 +00:00
parent 339795311b
commit 88bfe8b084
8 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Call DownloadContext::setOwnerRequestGroup() in
RequestGroup::setDownloadContext().
* src/BtDependency.cc
* src/RequestGroup.cc
* src/RequestGroup.h
* src/download_helper.cc
* test/DefaultBtMessageDispatcherTest.cc
* test/DefaultExtensionMessageFactoryTest.cc
* test/HandshakeExtensionMessageTest.cc
2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Accept BitTorrent Magnet URI in Metalink resource type bittorrent. Accept BitTorrent Magnet URI in Metalink resource type bittorrent.

1
src/BtDependency.cc
View file

@ -107,7 +107,6 @@ bool BtDependency::resolve()
} }
_logger->debug("Dependency resolved for GID#%d", _dependant->getGID()); _logger->debug("Dependency resolved for GID#%d", _dependant->getGID());
_dependant->setDownloadContext(context); _dependant->setDownloadContext(context);
context->setOwnerRequestGroup(_dependant.get());
return true; return true;
} else if(_dependee->getNumCommand() == 0) { } else if(_dependee->getNumCommand() == 0) {
// _dependee's download failed. // _dependee's download failed.

9
src/RequestGroup.cc
View file

@ -1045,4 +1045,13 @@ void RequestGroup::removeControlFile() const
_progressInfoFile->removeFile(); _progressInfoFile->removeFile();
} }
void RequestGroup::setDownloadContext
(const SharedHandle<DownloadContext>& downloadContext)
{
_downloadContext = downloadContext;
if(!_downloadContext.isNull()) {
_downloadContext->setOwnerRequestGroup(this);
}
}
} // namespace aria2 } // namespace aria2

7
src/RequestGroup.h
View file

@ -244,10 +244,9 @@ public:
return _downloadContext; return _downloadContext;
} }
void setDownloadContext(const SharedHandle<DownloadContext>& downloadContext) // This function also calls
{ // downloadContext->setOwnerRequestGroup(this).
_downloadContext = downloadContext; void setDownloadContext(const SharedHandle<DownloadContext>& downloadContext);
}
const SharedHandle<PieceStorage>& getPieceStorage() const const SharedHandle<PieceStorage>& getPieceStorage() const
{ {

2
src/download_helper.cc
View file

@ -223,7 +223,6 @@ createBtRequestGroup(const std::string& torrentFilePath,
((*i).first, strconcat(dctx->getDir(), "/", (*i).second)); ((*i).first, strconcat(dctx->getDir(), "/", (*i).second));
} }
rg->setDownloadContext(dctx); rg->setDownloadContext(dctx);
dctx->setOwnerRequestGroup(rg.get());
return rg; return rg;
} }
@ -246,7 +245,6 @@ createBtMagnetRequestGroup(const std::string& magnetLink,
dctx->getFirstFileEntry()->setPath dctx->getFirstFileEntry()->setPath
(dctx->getAttribute(bittorrent::BITTORRENT)[bittorrent::NAME].s()); (dctx->getAttribute(bittorrent::BITTORRENT)[bittorrent::NAME].s());
rg->setDownloadContext(dctx); rg->setDownloadContext(dctx);
dctx->setOwnerRequestGroup(rg.get());
rg->clearPostDownloadHandler(); rg->clearPostDownloadHandler();
rg->addPostDownloadHandler rg->addPostDownloadHandler
(SharedHandle<UTMetadataPostDownloadHandler> (SharedHandle<UTMetadataPostDownloadHandler>

3
test/DefaultBtMessageDispatcherTest.cc
View file

@ -141,7 +141,8 @@ public:
_dctx.reset(new DownloadContext()); _dctx.reset(new DownloadContext());
bittorrent::load("test.torrent", _dctx); bittorrent::load("test.torrent", _dctx);
_dctx->setOwnerRequestGroup(_rg.get());
_rg->setDownloadContext(_dctx);
peer.reset(new Peer("192.168.0.1", 6969)); peer.reset(new Peer("192.168.0.1", 6969));
peer->allocateSessionResource peer->allocateSessionResource

1
test/DefaultExtensionMessageFactoryTest.cc
View file

@ -67,7 +67,6 @@ public:
SharedHandle<Option> option(new Option()); SharedHandle<Option> option(new Option());
_requestGroup.reset(new RequestGroup(option)); _requestGroup.reset(new RequestGroup(option));
_requestGroup->setDownloadContext(_dctx); _requestGroup->setDownloadContext(_dctx);
_dctx->setOwnerRequestGroup(_requestGroup.get());
_factory.reset(new DefaultExtensionMessageFactory()); _factory.reset(new DefaultExtensionMessageFactory());
_factory->setPeerStorage(_peerStorage); _factory->setPeerStorage(_peerStorage);

1
test/HandshakeExtensionMessageTest.cc
View file

@ -95,7 +95,6 @@ void HandshakeExtensionMessageTest::testDoReceivedAction()
SharedHandle<Option> op(new Option()); SharedHandle<Option> op(new Option());
RequestGroup rg(op); RequestGroup rg(op);
rg.setDownloadContext(dctx); rg.setDownloadContext(dctx);
dctx->setOwnerRequestGroup(&rg);
BDE attrs = BDE::dict(); BDE attrs = BDE::dict();
dctx->setAttribute(bittorrent::BITTORRENT, attrs); dctx->setAttribute(bittorrent::BITTORRENT, attrs);