From 73572712d81e83f98bafcfcbd9be50f3297b5feb Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 16 Mar 2011 16:55:38 +0900
Subject: [PATCH] Use .meta4 instead of .metalink as suffix when saving
 metalink XML uploaded by RPC.

---
 src/RpcMethodImpl.cc  | 7 ++++---
 test/RpcMethodTest.cc | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc
index 763a4d32..3adf34f9 100644
--- a/src/RpcMethodImpl.cc
+++ b/src/RpcMethodImpl.cc
@@ -326,11 +326,12 @@ SharedHandle<ValueBase> AddMetalinkRpcMethod::process
   bool posGiven = false;
   getPosParam(req, 2, posGiven, pos);
 
-  // TODO RFC5854 Metalink has the extension .meta4. We use .metalink
-  // for both v3 and RFC5854 Metalink. aria2 can detect which of which
+  // TODO RFC5854 Metalink has the extension .meta4 and Metalink
+  // Version 3 uses .metalink extension. We use .meta4 for both
+  // RFC5854 Metalink and Version 3. aria2 can detect which of which
   // by reading content rather than extension.
   std::string filename = util::applyDir
-    (requestOption->get(PREF_DIR), getHexSha1(metalinkParam->s())+".metalink");
+    (requestOption->get(PREF_DIR), getHexSha1(metalinkParam->s())+".meta4");
   std::vector<SharedHandle<RequestGroup> > result;
   // Save uploaded data in order to save this download in
   // --save-session file.
diff --git a/test/RpcMethodTest.cc b/test/RpcMethodTest.cc
index d0a85741..d9286a7e 100644
--- a/test/RpcMethodTest.cc
+++ b/test/RpcMethodTest.cc
@@ -347,7 +347,7 @@ void RpcMethodTest::testAddTorrent_withPosition()
 void RpcMethodTest::testAddMetalink()
 {
   File(e_->getOption()->get(PREF_DIR)+
-       "/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").remove();
+       "/c908634fbc257fd56f0114912c2772aeeb4064f4.met4").remove();
   AddMetalinkRpcMethod m;
   RpcRequest req(AddMetalinkRpcMethod::getMethodName(), List::g());
   req.params->append(readFile(A2_TEST_DIR"/2files.metalink"));
@@ -360,7 +360,7 @@ void RpcMethodTest::testAddMetalink()
     CPPUNIT_ASSERT_EQUAL(std::string("2"), asString(resParams->get(1))->s());
     CPPUNIT_ASSERT
       (File(e_->getOption()->get(PREF_DIR)+
-            "/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").exists());
+            "/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").exists());
 
     SharedHandle<RequestGroup> tar =
       e_->getRequestGroupMan()->findReservedGroup(1);
@@ -378,7 +378,7 @@ void RpcMethodTest::testAddMetalink()
   File(dir).mkdirs();
   SharedHandle<Dict> opt = Dict::g();
   opt->put(PREF_DIR, dir);
-  File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").remove();
+  File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").remove();
   req.params->append(opt);
   {
     RpcResponse res = m.execute(req, e_.get());
@@ -387,7 +387,7 @@ void RpcMethodTest::testAddMetalink()
                          e_->getRequestGroupMan()->findReservedGroup(3)->
                          getFirstFilePath());
     CPPUNIT_ASSERT
-      (File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").exists());
+      (File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").exists());
   }
 }