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

2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Renamed --bt-seed option as --bt-seed-unverified so that it 
makes clear
	that this is not going to verify files using piece hashes.
	* src/HelpItemFactory.cc
	* src/OptionHandlerFactory.cc
	* src/RequestGroup.cc
	* src/option_processing.cc
	* src/prefs.cc
	* src/prefs.h
	* src/usage_text.h
pull/1/head
Tatsuhiro Tsujikawa 2008-07-12 13:54:36 +00:00
parent 5472c8033e
commit 7fc0de4f5b
8 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Renamed --bt-seed option as --bt-seed-unverified so that it makes clear
that this is not going to verify files using piece hashes.
* src/HelpItemFactory.cc
* src/OptionHandlerFactory.cc
* src/RequestGroup.cc
* src/option_processing.cc
* src/prefs.cc
* src/prefs.h
* src/usage_text.h
2008-07-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added the ability to retrieve signature from Metalink file.

6
src/HelpItemFactory.cc
View File

@ -391,9 +391,9 @@ TagContainerHandle HelpItemFactory::createHelpItems(const Option* op)
tc->addItem(item);
}
{
HelpItemHandle item(new HelpItem(PREF_BT_SEED,
TEXT_BT_SEED,
op->get(PREF_BT_SEED)));
HelpItemHandle item(new HelpItem(PREF_BT_SEED_UNVERIFIED,
TEXT_BT_SEED_UNVERIFIED,
op->get(PREF_BT_SEED_UNVERIFIED)));
item->addTag(TAG_BITTORRENT);
tc->addItem(item);
}

2
src/OptionHandlerFactory.cc
View File

@ -142,7 +142,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
std::deque<std::string>(&params[0],
&params[arrayLength(params)]))));
}
handlers.push_back(SH(new BooleanOptionHandler(PREF_BT_SEED)));
handlers.push_back(SH(new BooleanOptionHandler(PREF_BT_SEED_UNVERIFIED)));
return handlers;
}

10
src/RequestGroup.cc
View File

@ -240,7 +240,7 @@ void RequestGroup::createInitialCommand(std::deque<Command*>& commands,
if(_pieceStorage->getDiskAdaptor()->fileExists()) {
if(!_option->getAsBool(PREF_CHECK_INTEGRITY) &&
!_option->getAsBool(PREF_ALLOW_OVERWRITE) &&
!_option->getAsBool(PREF_BT_SEED)) {
!_option->getAsBool(PREF_BT_SEED_UNVERIFIED)) {
// TODO we need this->haltRequested = true?
throw DownloadFailureException
(StringFormat
@ -249,7 +249,7 @@ void RequestGroup::createInitialCommand(std::deque<Command*>& commands,
} else {
_pieceStorage->getDiskAdaptor()->openFile();
}
if(_option->getAsBool(PREF_BT_SEED)) {
if(_option->getAsBool(PREF_BT_SEED_UNVERIFIED)) {
_pieceStorage->markAllPiecesDone();
}
} else {
@ -273,9 +273,9 @@ void RequestGroup::createInitialCommand(std::deque<Command*>& commands,
}
}
CheckIntegrityEntryHandle entry(new BtCheckIntegrityEntry(this));
// --bt-seed=true is given and download has completed, skip validation for
// piece hashes.
if(_option->getAsBool(PREF_BT_SEED) &&
// --bt-seed-unverified=true is given and download has completed, skip
// validation for piece hashes.
if(_option->getAsBool(PREF_BT_SEED_UNVERIFIED) &&
_pieceStorage->downloadFinished()) {
entry->onDownloadFinished(commands, e);
} else {

7
src/option_processing.cc
View File

@ -145,7 +145,7 @@ Option* createDefaultOption()
op->put(PREF_BT_REQUIRE_CRYPTO, V_FALSE);
op->put(PREF_BT_REQUEST_PEER_SPEED_LIMIT, "51200");
op->put(PREF_BT_MAX_OPEN_FILES, "100");
op->put(PREF_BT_SEED, V_FALSE);
op->put(PREF_BT_SEED_UNVERIFIED, V_FALSE);
op->put(PREF_QUIET, V_FALSE);
op->put(PREF_STOP, "0");
#ifdef ENABLE_ASYNC_DNS
@ -257,7 +257,7 @@ Option* option_processing(int argc, char* const argv[])
{ PREF_BT_REQUIRE_CRYPTO.c_str(), required_argument, &lopt, 31 },
{ PREF_BT_REQUEST_PEER_SPEED_LIMIT.c_str(), required_argument, &lopt, 32 },
{ PREF_BT_MAX_OPEN_FILES.c_str(), required_argument, &lopt, 33 },
{ PREF_BT_SEED.c_str(), optional_argument, &lopt, 34 },
{ PREF_BT_SEED_UNVERIFIED.c_str(), optional_argument, &lopt, 34 },
#endif // ENABLE_BITTORRENT
#ifdef ENABLE_METALINK
{ PREF_METALINK_FILE.c_str(), required_argument, NULL, 'M' },
@ -375,7 +375,8 @@ Option* option_processing(int argc, char* const argv[])
cmdstream << PREF_BT_MAX_OPEN_FILES << "=" << optarg << "\n";
break;
case 34:
cmdstream << PREF_BT_SEED << "=" << toBoolArg(optarg) << "\n";
cmdstream << PREF_BT_SEED_UNVERIFIED << "=" << toBoolArg(optarg)
<< "\n";
break;
case 100:
cmdstream << PREF_METALINK_VERSION << "=" << optarg << "\n";

2
src/prefs.cc
View File

@ -252,7 +252,7 @@ const std::string PREF_BT_REQUEST_PEER_SPEED_LIMIT("bt-request-peer-speed-limit"
// values: 1*digit
const std::string PREF_BT_MAX_OPEN_FILES("bt-max-open-files");
// values: true | false
const std::string PREF_BT_SEED("bt-seed");
const std::string PREF_BT_SEED_UNVERIFIED("bt-seed-unverified");
/**
* Metalink related preferences

2
src/prefs.h
View File

@ -256,7 +256,7 @@ extern const std::string PREF_BT_REQUEST_PEER_SPEED_LIMIT;
// values: 1*digit
extern const std::string PREF_BT_MAX_OPEN_FILES;
// values: true | false
extern const std::string PREF_BT_SEED;
extern const std::string PREF_BT_SEED_UNVERIFIED;
/**
* Metalink related preferences

6
src/usage_text.h
View File

@ -284,9 +284,9 @@ _(" --bt-request-peer-speed-limit=SPEED In BitTorrent downloads, if the download
#define TEXT_BT_MAX_OPEN_FILES \
_(" --bt-max-open-files=NUM Specify maximum number of files to open in each\n"\
" BitTorrent download.")
#define TEXT_BT_SEED \
_(" --bt-seed[=true|false] Seed previously downloaded files without\n"\
" validating piece hashes.")
#define TEXT_BT_SEED_UNVERIFIED \
_(" --bt-seed-unverified[=true|false] Seed previously downloaded files without\n"\
" verifying piece hashes.")
#define TEXT_METALINK_FILE \
_(" -M, --metalink-file=METALINK_FILE The file path to the .metalink file.")
#define TEXT_METALINK_SERVERS \