From 4c8917048804cbe82febfadcf0b1747ecd888333 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Mon, 11 Jan 2010 14:01:20 +0000
Subject: 2010-01-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>

	Treat --dir="" as --dir="."
	* src/FtpNegotiationCommand.cc
	* src/HttpResponseCommand.cc
	* src/Metalink2RequestGroup.cc
	* src/UTMetadataPostDownloadHandler.cc
	* src/bittorrent_helper.cc
	* src/download_helper.cc
	* src/util.cc
	* src/util.h
	* test/UtilTest.cc
---
 src/UTMetadataPostDownloadHandler.cc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/UTMetadataPostDownloadHandler.cc')

diff --git a/src/UTMetadataPostDownloadHandler.cc b/src/UTMetadataPostDownloadHandler.cc
index fd67cf95..d3230ad2 100644
--- a/src/UTMetadataPostDownloadHandler.cc
+++ b/src/UTMetadataPostDownloadHandler.cc
@@ -82,23 +82,22 @@ void UTMetadataPostDownloadHandler::getNextRequestGroups
     util::toString(requestGroup->getPieceStorage()->getDiskAdaptor());
   std::string torrent = bittorrent::metadata2Torrent(metadata, attrs);
 
-  std::deque<SharedHandle<RequestGroup> > newRgs;
-  createRequestGroupForBitTorrent(newRgs, requestGroup->getOption(),
-                                  std::deque<std::string>(), torrent);
-  requestGroup->followedBy(newRgs.begin(), newRgs.end());
-  groups.insert(groups.end(), newRgs.begin(), newRgs.end());
-
   if(requestGroup->getOption()->getAsBool(PREF_BT_SAVE_METADATA)) {
-    std::string filename = requestGroup->getOption()->get(PREF_DIR);
-    filename += A2STR::SLASH_C;
-    filename += util::toHex(attrs[bittorrent::INFO_HASH].s());
-    filename += ".torrent";
+    std::string filename =
+      util::applyDir(requestGroup->getOption()->get(PREF_DIR),
+                     util::toHex(attrs[bittorrent::INFO_HASH].s())+".torrent");
     if(util::saveAs(filename, torrent)) {
       _logger->notice(MSG_METADATA_SAVED, filename.c_str());
     } else {
       _logger->notice(MSG_METADATA_NOT_SAVED, filename.c_str());
     }
   }
+  std::deque<SharedHandle<RequestGroup> > newRgs;
+  createRequestGroupForBitTorrent(newRgs, requestGroup->getOption(),
+                                  std::deque<std::string>(), torrent);
+  
+  requestGroup->followedBy(newRgs.begin(), newRgs.end());
+  groups.insert(groups.end(), newRgs.begin(), newRgs.end());
 }
 
 } // namespace aria2
-- 
cgit