github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Use .meta4 instead of .metalink as suffix when saving metalink XML 

uploaded by RPC.
pull/1/head
Tatsuhiro Tsujikawa 2011-03-16 16:55:38 +09:00
parent 4f3542a931
commit 73572712d8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/RpcMethodImpl.cc
View File

@ -326,11 +326,12 @@ SharedHandle<ValueBase> AddMetalinkRpcMethod::process
bool posGiven = false; bool posGiven = false;
getPosParam(req, 2, posGiven, pos); getPosParam(req, 2, posGiven, pos);
// TODO RFC5854 Metalink has the extension .meta4. We use .metalink // TODO RFC5854 Metalink has the extension .meta4 and Metalink
// for both v3 and RFC5854 Metalink. aria2 can detect which of which // 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. // by reading content rather than extension.
std::string filename = util::applyDir 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; std::vector<SharedHandle<RequestGroup> > result;
// Save uploaded data in order to save this download in // Save uploaded data in order to save this download in
// --save-session file. // --save-session file.

8
test/RpcMethodTest.cc
View File

@ -347,7 +347,7 @@ void RpcMethodTest::testAddTorrent_withPosition()
void RpcMethodTest::testAddMetalink() void RpcMethodTest::testAddMetalink()
{ {
File(e_->getOption()->get(PREF_DIR)+ File(e_->getOption()->get(PREF_DIR)+
"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").remove(); "/c908634fbc257fd56f0114912c2772aeeb4064f4.met4").remove();
AddMetalinkRpcMethod m; AddMetalinkRpcMethod m;
RpcRequest req(AddMetalinkRpcMethod::getMethodName(), List::g()); RpcRequest req(AddMetalinkRpcMethod::getMethodName(), List::g());
req.params->append(readFile(A2_TEST_DIR"/2files.metalink")); 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_EQUAL(std::string("2"), asString(resParams->get(1))->s());
CPPUNIT_ASSERT CPPUNIT_ASSERT
(File(e_->getOption()->get(PREF_DIR)+ (File(e_->getOption()->get(PREF_DIR)+
"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").exists()); "/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").exists());
SharedHandle<RequestGroup> tar = SharedHandle<RequestGroup> tar =
e_->getRequestGroupMan()->findReservedGroup(1); e_->getRequestGroupMan()->findReservedGroup(1);
@ -378,7 +378,7 @@ void RpcMethodTest::testAddMetalink()
File(dir).mkdirs(); File(dir).mkdirs();
SharedHandle<Dict> opt = Dict::g(); SharedHandle<Dict> opt = Dict::g();
opt->put(PREF_DIR, dir); opt->put(PREF_DIR, dir);
File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").remove(); File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").remove();
req.params->append(opt); req.params->append(opt);
{ {
RpcResponse res = m.execute(req, e_.get()); RpcResponse res = m.execute(req, e_.get());
@ -387,7 +387,7 @@ void RpcMethodTest::testAddMetalink()
e_->getRequestGroupMan()->findReservedGroup(3)-> e_->getRequestGroupMan()->findReservedGroup(3)->
getFirstFilePath()); getFirstFilePath());
CPPUNIT_ASSERT CPPUNIT_ASSERT
(File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.metalink").exists()); (File(dir+"/c908634fbc257fd56f0114912c2772aeeb4064f4.meta4").exists());
} }
} }