From 591e9fa8432415968e16d9087fcc9d5cec4ca7c1 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 28 Nov 2009 09:10:20 +0000
Subject: [PATCH] 2009-11-28  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Use createRequestGroupForBitTorrent()
	* src/BtPostDownloadHandler.cc
---
 ChangeLog                    |  5 +++++
 src/BtPostDownloadHandler.cc | 16 ++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f04f71b..46e9c082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Use createRequestGroupForBitTorrent()
+	* src/BtPostDownloadHandler.cc
+
 2009-11-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added remove().
diff --git a/src/BtPostDownloadHandler.cc b/src/BtPostDownloadHandler.cc
index fa0b8b2e..62d56413 100644
--- a/src/BtPostDownloadHandler.cc
+++ b/src/BtPostDownloadHandler.cc
@@ -45,7 +45,7 @@
 #include "ContentTypeRequestGroupCriteria.h"
 #include "Exception.h"
 #include "DownloadContext.h"
-#include "bittorrent_helper.h"
+#include "download_helper.h"
 
 namespace aria2 {
 
@@ -66,11 +66,8 @@ void BtPostDownloadHandler::getNextRequestGroups
 (std::deque<SharedHandle<RequestGroup> >& groups,
  RequestGroup* requestGroup)
 {
-  const SharedHandle<Option>& op = requestGroup->getOption();
   _logger->debug("Generating RequestGroups for Torrent file %s",
 		 requestGroup->getFirstFilePath().c_str());
-  RequestGroupHandle rg(new RequestGroup(op));
-
   std::string content;
   try {
     requestGroup->getPieceStorage()->getDiskAdaptor()->openExistingFile();
@@ -80,14 +77,9 @@ void BtPostDownloadHandler::getNextRequestGroups
     requestGroup->getPieceStorage()->getDiskAdaptor()->closeFile();
     throw;
   }
-  SharedHandle<DownloadContext> context(new DownloadContext());
-  context->setDir(requestGroup->getDownloadContext()->getDir());
-  bittorrent::loadFromMemory
-    (content, context, File(requestGroup->getFirstFilePath()).getBasename());
-  rg->setDownloadContext(context);
-  context->setOwnerRequestGroup(rg.get());
-  
-  groups.push_back(rg);
+  createRequestGroupForBitTorrent(groups, requestGroup->getOption(),
+				  std::deque<std::string>(),
+				  content);
 }
 
 } // namespace aria2