From 66b595011517258e3c05ea3e329f07a33bf6391f Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 9 Sep 2009 12:58:23 +0000 Subject: [PATCH] 2009-09-09 Tatsuhiro Tsujikawa Use LocalFilePathOptionHandler for -T and -M option. Updated message of MSG_FILE_NOT_EXIST. * src/OptionHandlerFactory.cc * src/message.h --- ChangeLog | 7 +++++++ src/OptionHandlerFactory.cc | 8 ++------ src/message.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86f6ed39..b0139ebd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-09 Tatsuhiro Tsujikawa + + Use LocalFilePathOptionHandler for -T and -M option. + Updated message of MSG_FILE_NOT_EXIST. + * src/OptionHandlerFactory.cc + * src/message.h + 2009-09-09 Tatsuhiro Tsujikawa Added LocalFilePathOptionHandler which check whether the specified diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index a714bae2..f200ec02 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -1156,12 +1156,10 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle op(new DefaultOptionHandler + SharedHandle op(new LocalFilePathOptionHandler (PREF_TORRENT_FILE, TEXT_TORRENT_FILE, NO_DEFAULT_VALUE, - A2STR::NIL, - OptionHandler::REQ_ARG, 'T')); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); @@ -1189,12 +1187,10 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle op(new DefaultOptionHandler + SharedHandle op(new LocalFilePathOptionHandler (PREF_METALINK_FILE, TEXT_METALINK_FILE, NO_DEFAULT_VALUE, - A2STR::NIL, - OptionHandler::REQ_ARG, 'M')); op->addTag(TAG_BASIC); op->addTag(TAG_METALINK); diff --git a/src/message.h b/src/message.h index 300e705b..21a0d2d2 100644 --- a/src/message.h +++ b/src/message.h @@ -174,7 +174,7 @@ #define MSG_GID_NOT_PROVIDED "GID is not provided." #define MSG_CANNOT_PARSE_XML_RPC_REQUEST "Failed to parse xml-rpc request." #define MSG_GOOD_BYE_SEEDER "Client is in seed state: Good Bye Seeder;)" -#define MSG_FILE_NOT_EXIST "File %s was not found." +#define MSG_FILE_NOT_EXIST "File '%s' was not found." #define EX_TIME_OUT _("Timeout.") #define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")