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

1 files changed, 31 insertions, 10 deletions

diff --git a/src/BtPostDownloadHandler.cc b/src/BtPostDownloadHandler.cc
index 096a0e4c..5aae5311 100644
--- a/src/BtPostDownloadHandler.cc
+++ b/src/BtPostDownloadHandler.cc
@@ -38,23 +38,44 @@
 #include "RequestGroup.h"
 #include "Option.h"
 #include "Logger.h"
+#include "DownloadHandlerConstants.h"
+#include "File.h"
+#include "PieceStorage.h"
+#include "DiskAdaptor.h"
+#include "Util.h"
+#include "ContentTypeRequestGroupCriteria.h"
 
-BtPostDownloadHandler::BtPostDownloadHandler(const Option* option):
-  PostDownloadHandler(".torrent", option)
-{}
+BtPostDownloadHandler::BtPostDownloadHandler()
+{
+  setCriteria(new ContentTypeRequestGroupCriteria(DownloadHandlerConstants::getBtContentTypes(),
+						  DownloadHandlerConstants::getBtExtensions()));
+}
 
 BtPostDownloadHandler::~BtPostDownloadHandler() {}
 
-RequestGroups BtPostDownloadHandler::getNextRequestGroups(const string& path)
+RequestGroups BtPostDownloadHandler::getNextRequestGroups(RequestGroup* requestGroup)
 {
-  _logger->debug("Generating RequestGroups for Torrent file %s", path.c_str());
-  RequestGroupHandle rg = new RequestGroup(_option, Strings());
+  const Option* op = requestGroup->getOption();
+  _logger->debug("Generating RequestGroups for Torrent file %s",
+		 requestGroup->getFilePath().c_str());
+  RequestGroupHandle rg = new RequestGroup(op, Strings());
+
+  string content;
+  try {
+    requestGroup->getPieceStorage()->getDiskAdaptor()->openExistingFile();
+    content = Util::toString(requestGroup->getPieceStorage()->getDiskAdaptor());
+    requestGroup->getPieceStorage()->getDiskAdaptor()->closeFile();    
+  } catch(Exception* e) {
+    requestGroup->getPieceStorage()->getDiskAdaptor()->closeFile();
+    throw;
+  }
   DefaultBtContextHandle btContext = new DefaultBtContext();
-  btContext->load(path);
-  if(_option->defined(PREF_PEER_ID_PREFIX)) {
-    btContext->setPeerIdPrefix(_option->get(PREF_PEER_ID_PREFIX));
+  btContext->loadFromMemory(content.c_str(), content.size(),
+			    File(requestGroup->getFilePath()).getBasename());
+  if(op->defined(PREF_PEER_ID_PREFIX)) {
+    btContext->setPeerIdPrefix(op->get(PREF_PEER_ID_PREFIX));
   }
-  btContext->setDir(_option->get(PREF_DIR));
+  btContext->setDir(op->get(PREF_DIR));
   rg->setDownloadContext(btContext);
   btContext->setOwnerRequestGroup(rg.get());