From 506bc3db13f6130aca37c1df216a3e8a7967bf99 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 27 Nov 2007 12:27:10 +0000
Subject: 2007-11-27  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

	Rewritten to add content-type support.
	* src/DownloadHandler.{h, cc}
	* src/BtPostDownloadHandler.{h, cc}
	* test/BtPostDownloadHandlerTest.cc
	* src/MetalinkPostDownloadHandler.{h, cc}
	* test/MetalinkPostDownloadHandlerTest.cc
	* src/PostDownloadHandler.{h, cc}
	* src/DownloadHandlerConstants.{h, cc}
	* src/RequestGroup.cc
	* src/HttpResponseCommand.cc
	* src/FtpNegotiationCommand.cc
	* src/SingleFileDownloadContext.{h, cc}
	* src/RequestGroup.h
	* src/RequestGroupCriteria.h
	* src/ContentTypeRequestGroupCriteria.h

	Added 'mem' option value for --follow-metalink,
--follow-torrent.
	If it is give, metalink/torrent file is not written to the disk,
but
	just is kept in memory. Parsing is occurred on memory.
	* src/MetalinkHelper.{h, cc}
	* src/MetalinkProcessor.h
	* src/Xml2MetalinkProcessor.{h, cc}
	* test/Xml2MetalinkProcessorTest.cc
	* src/DownloadHandlerFactory.{h, cc}
	* test/DownloadHandlerFactoryTest.cc
	* src/PreDownloadHandler.{h, cc}
	* src/OptionHandlerFactory.cc
	* src/DefaultBtContext.{h, cc}
	* test/DefaultBtContextTest.cc
	* src/version_usage.cc
	* src/Metalink2RequestGroup.{h, cc}
	* src/RequestGroup.{h, cc}
	* src/a2functional.h
	* test/a2functionalTest.cc
	* src/MemoryBufferPreDownloadHandler.{h, cc}
	* src/OptionHandlerImpl.h
	* src/prefs.h
	* src/Util.{h, cc}
	* test/UtilTest.cc

	Keep DownloadResult rather than RequestGroup after downloads to
reduce
	memory usage.
	* src/RequestGroupMan.{h, cc}
	* src/DownloadEngine.cc
	* src/BtDependency.{h, cc}: Changed the type of dependee from
	WeakHandle to SharedHandle because WeakHandle could be null.
	* src/RequestGroup.{h, cc}
	* src/DownloadEngineFactory.cc
	* src/DownloadResult.h

	Set totalLength after download finished
	* src/UnknownLengthPieceStorage.{h, cc}

	Keep torrent file specified in metalink in memory.
	* src/Metalink2RequestGroup.cc
	* src/BtDependency.cc
	* src/TrueRequestGroupCriteria.h

	Fixed the bug: seekg is used where seekp should be used.
	* src/ByteArrayDiskWriter.cc
	* test/ByteArraydiskWriterTest.cc
---
 src/BtDependency.cc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/BtDependency.cc')

diff --git a/src/BtDependency.cc b/src/BtDependency.cc
index 8be2266e..6c0bda48 100644
--- a/src/BtDependency.cc
+++ b/src/BtDependency.cc
@@ -40,9 +40,12 @@
 #include "RecoverableException.h"
 #include "message.h"
 #include "prefs.h"
+#include "Util.h"
+#include "PieceStorage.h"
+#include "DiskAdaptor.h"
 
 BtDependency::BtDependency(const RequestGroupWeakHandle& dependant,
-			   const RequestGroupWeakHandle& dependee,
+			   const RequestGroupHandle& dependee,
 			   const Option* option):
   _dependant(dependant),
   _dependee(dependee),
@@ -54,9 +57,16 @@ BtDependency::~BtDependency() {}
 bool BtDependency::resolve()
 {
   if(_dependee->getNumCommand() == 0 && _dependee->downloadFinished()) {
+    RequestGroupHandle dependee = _dependee;
+    // cut reference here
+    _dependee = 0;
     DefaultBtContextHandle btContext = new DefaultBtContext();
     try {
-      btContext->load(_dependee->getFilePath());
+      DiskAdaptorHandle diskAdaptor = dependee->getPieceStorage()->getDiskAdaptor();
+      diskAdaptor->openExistingFile();
+      string content = Util::toString(diskAdaptor);
+      btContext->loadFromMemory(content.c_str(), content.size(),
+				File(dependee->getFilePath()).getBasename());
       if(_option->defined(PREF_PEER_ID_PREFIX)) {
 	btContext->setPeerIdPrefix(_option->get(PREF_PEER_ID_PREFIX));
       }
@@ -74,6 +84,8 @@ bool BtDependency::resolve()
     return true;
   } else if(_dependee->getNumCommand() == 0) {
     // _dependee's download failed.
+    // cut reference here
+    _dependee = 0;
     _logger->debug("BtDependency for GID#%d failed. Go without Bt.",
 		   _dependant->getGID());    
     return true;
-- 
cgit