diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:12:52 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:20:27 +0900 |
| commit | d64089632e82a2548752c7a6baaa68365a795a74 (patch) | |
| tree | 57fc7b85a8c1290975d58fa4761b04a7695bf7e3 /src/OptionHandlerFactory.cc | |
| parent | c81b1321122e8509b55c94c0cbca0d8d6d319f0c (diff) | |
| parent | a7cd943a06b1a5ff4515b57060b84037f8d01f9f (diff) | |
Merge branch 'master' into random-webseeding
Diffstat (limited to 'src/OptionHandlerFactory.cc')
| -rw-r--r-- | src/OptionHandlerFactory.cc | 1601 |
1 files changed, 572 insertions, 1029 deletions
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index c2605c99..89231cd6 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -48,15 +48,13 @@ namespace aria2 { std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() { std::vector<OptionHandler*> handlers; - static const std::string logLevels[] = - { V_DEBUG, V_INFO, V_NOTICE, V_WARN, V_ERROR }; + static const std::string logLevels[] = {V_DEBUG, V_INFO, V_NOTICE, V_WARN, + V_ERROR}; // General Options { - OptionHandler* op(new BooleanOptionHandler - (PREF_ALLOW_OVERWRITE, - TEXT_ALLOW_OVERWRITE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_ALLOW_OVERWRITE, + TEXT_ALLOW_OVERWRITE, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FILE); op->setInitialOption(true); @@ -65,11 +63,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ALLOW_PIECE_LENGTH_CHANGE, - TEXT_ALLOW_PIECE_LENGTH_CHANGE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ALLOW_PIECE_LENGTH_CHANGE, TEXT_ALLOW_PIECE_LENGTH_CHANGE, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -77,11 +73,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ALWAYS_RESUME, - TEXT_ALWAYS_RESUME, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_ALWAYS_RESUME, + TEXT_ALWAYS_RESUME, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -92,15 +86,13 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #ifdef ENABLE_ASYNC_DNS { - OptionHandler* op(new BooleanOptionHandler - (PREF_ASYNC_DNS, - TEXT_ASYNC_DNS, + OptionHandler* op(new BooleanOptionHandler(PREF_ASYNC_DNS, TEXT_ASYNC_DNS, #if defined(__ANDROID__) || defined(ANDROID) - A2_V_FALSE, -#else // !__ANDROID__ && !ANDROID - A2_V_TRUE, + A2_V_FALSE, +#else // !__ANDROID__ && !ANDROID + A2_V_TRUE, #endif // !__ANDROID__ && !ANDROID - OptionHandler::OPT_ARG)); + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -109,21 +101,17 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #if defined(HAVE_ARES_SET_SERVERS) && defined(HAVE_ARES_ADDR_NODE) { - OptionHandler* op(new DefaultOptionHandler - (PREF_ASYNC_DNS_SERVER, - TEXT_ASYNC_DNS_SERVER, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_ASYNC_DNS_SERVER, TEXT_ASYNC_DNS_SERVER, NO_DEFAULT_VALUE)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } #endif // HAVE_ARES_SET_SERVERS && HAVE_ARES_ADDR_NODE #endif // ENABLE_ASYNC_DNS { - OptionHandler* op(new BooleanOptionHandler - (PREF_AUTO_FILE_RENAMING, - TEXT_AUTO_FILE_RENAMING, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_AUTO_FILE_RENAMING, TEXT_AUTO_FILE_RENAMING, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FILE); op->setInitialOption(true); @@ -132,21 +120,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_AUTO_SAVE_INTERVAL, - TEXT_AUTO_SAVE_INTERVAL, - "60", - 0, 600)); + OptionHandler* op(new NumberOptionHandler( + PREF_AUTO_SAVE_INTERVAL, TEXT_AUTO_SAVE_INTERVAL, "60", 0, 600)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_CHECK_INTEGRITY, - TEXT_CHECK_INTEGRITY, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'V')); + OptionHandler* op(new BooleanOptionHandler(PREF_CHECK_INTEGRITY, + TEXT_CHECK_INTEGRITY, A2_V_FALSE, + OptionHandler::OPT_ARG, 'V')); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); op->addTag(TAG_METALINK); @@ -158,11 +140,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_CONDITIONAL_GET, - TEXT_CONDITIONAL_GET, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_CONDITIONAL_GET, + TEXT_CONDITIONAL_GET, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -171,21 +151,14 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_CONF_PATH, - TEXT_CONF_PATH, - util::getConfigFile(), - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_CONF_PATH, TEXT_CONF_PATH, util::getConfigFile(), PATH_TO_FILE)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_CONTINUE, - TEXT_CONTINUE, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'c')); + OptionHandler* op(new BooleanOptionHandler( + PREF_CONTINUE, TEXT_CONTINUE, A2_V_FALSE, OptionHandler::OPT_ARG, 'c')); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -195,54 +168,41 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_DAEMON, - TEXT_DAEMON, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'D')); + OptionHandler* op(new BooleanOptionHandler( + PREF_DAEMON, TEXT_DAEMON, A2_V_FALSE, OptionHandler::OPT_ARG, 'D')); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_DISK_CACHE, - TEXT_DISK_CACHE, + OptionHandler* op(new UnitNumberOptionHandler(PREF_DISK_CACHE, + TEXT_DISK_CACHE, #ifdef DEFAULT_DISK_CACHE - DEFAULT_DISK_CACHE, + DEFAULT_DISK_CACHE, #else - "16M", + "16M", #endif - 0)); + 0)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_CONSOLE_LOG_LEVEL, - TEXT_CONSOLE_LOG_LEVEL, - V_NOTICE, - {std::begin(logLevels), std::end(logLevels)})); + OptionHandler* op(new ParameterOptionHandler( + PREF_CONSOLE_LOG_LEVEL, TEXT_CONSOLE_LOG_LEVEL, V_NOTICE, + {std::begin(logLevels), std::end(logLevels)})); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_DEFERRED_INPUT, - TEXT_DEFERRED_INPUT, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_DEFERRED_INPUT, + TEXT_DEFERRED_INPUT, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_DIR, - TEXT_DIR, - File::getCurrentDir(), - PATH_TO_DIR, - OptionHandler::REQ_ARG, - 'd')); + OptionHandler* op( + new DefaultOptionHandler(PREF_DIR, TEXT_DIR, File::getCurrentDir(), + PATH_TO_DIR, OptionHandler::REQ_ARG, 'd')); op->addTag(TAG_BASIC); op->addTag(TAG_FILE); op->setInitialOption(true); @@ -251,39 +211,33 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_DISABLE_IPV6, - TEXT_DISABLE_IPV6, + OptionHandler* op(new BooleanOptionHandler(PREF_DISABLE_IPV6, + TEXT_DISABLE_IPV6, #if defined(__MINGW32__) && !defined(__MINGW64__) - // Disable IPv6 by default for - // MinGW build. This is because - // numerous IPv6 routines are - // available from Vista. Checking - // getaddrinfo failed in - // configure. - A2_V_TRUE, -#else // !defined(__MINGW32__) || defined(__MINGW64__) - A2_V_FALSE, + // Disable IPv6 by default for + // MinGW build. This is because + // numerous IPv6 routines are + // available from Vista. Checking + // getaddrinfo failed in + // configure. + A2_V_TRUE, +#else // !defined(__MINGW32__) || defined(__MINGW64__) + A2_V_FALSE, #endif // !defined(__MINGW32__) || defined(__MINGW64__) - OptionHandler::OPT_ARG)); + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_DNS_TIMEOUT, - NO_DESCRIPTION, - "30", - 1, 60)); + OptionHandler* op( + new NumberOptionHandler(PREF_DNS_TIMEOUT, NO_DESCRIPTION, "30", 1, 60)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_DOWNLOAD_RESULT, - TEXT_DOWNLOAD_RESULT, - A2_V_DEFAULT, - { A2_V_DEFAULT, A2_V_FULL})); + OptionHandler* op( + new ParameterOptionHandler(PREF_DOWNLOAD_RESULT, TEXT_DOWNLOAD_RESULT, + A2_V_DEFAULT, {A2_V_DEFAULT, A2_V_FULL})); op->addTag(TAG_ADVANCED); op->setChangeGlobalOption(true); handlers.push_back(op); @@ -291,11 +245,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() #ifdef ENABLE_ASYNC_DNS { // TODO Deprecated - OptionHandler* op(new DeprecatedOptionHandler(new BooleanOptionHandler - (PREF_ENABLE_ASYNC_DNS6, - TEXT_ENABLE_ASYNC_DNS6, - NO_DEFAULT_VALUE, - OptionHandler::OPT_ARG))); + OptionHandler* op(new DeprecatedOptionHandler( + new BooleanOptionHandler(PREF_ENABLE_ASYNC_DNS6, TEXT_ENABLE_ASYNC_DNS6, + NO_DEFAULT_VALUE, OptionHandler::OPT_ARG))); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -304,21 +256,17 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #endif // ENABLE_ASYNC_DNS { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_COLOR, - TEXT_ENABLE_COLOR, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_ENABLE_COLOR, + TEXT_ENABLE_COLOR, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } #if defined(HAVE_MMAP) || defined(__MINGW32__) { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_MMAP, - TEXT_ENABLE_MMAP, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_ENABLE_MMAP, + TEXT_ENABLE_MMAP, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_EXPERIMENTAL); op->setInitialOption(true); @@ -328,63 +276,56 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #endif // HAVE_MMAP || __MINGW32__ { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_RPC, - TEXT_ENABLE_RPC, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ENABLE_RPC, TEXT_ENABLE_RPC, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_EVENT_POLL, - TEXT_EVENT_POLL, + OptionHandler* op(new ParameterOptionHandler(PREF_EVENT_POLL, + TEXT_EVENT_POLL, #if defined(HAVE_EPOLL) - V_EPOLL, + V_EPOLL, #elif defined(HAVE_KQUEUE) - V_KQUEUE, + V_KQUEUE, #elif defined(HAVE_PORT_ASSOCIATE) - V_PORT, + V_PORT, #elif defined(HAVE_LIBUV) - V_LIBUV, + V_LIBUV, #elif defined(HAVE_POLL) - V_POLL, -#else // defined(HAVE_EPOLL) - V_SELECT, + V_POLL, +#else // defined(HAVE_EPOLL) + V_SELECT, #endif // defined(HAVE_EPOLL) - { + { #ifdef HAVE_EPOLL - V_EPOLL, + V_EPOLL, #endif // HAVE_EPOLL #ifdef HAVE_KQUEUE - V_KQUEUE, + V_KQUEUE, #endif // HAVE_KQUEUE #ifdef HAVE_PORT_ASSOCIATE - V_PORT, + V_PORT, #endif // HAVE_PORT_ASSOCIATE #ifdef HAVE_LIBUV - V_LIBUV, + V_LIBUV, #endif // HAVE_LIBUV #ifdef HAVE_POLL - V_POLL, + V_POLL, #endif // HAVE_POLL - V_SELECT - })); + V_SELECT})); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_FILE_ALLOCATION, - TEXT_FILE_ALLOCATION, - V_PREALLOC, - { V_NONE, V_PREALLOC, V_TRUNC, + OptionHandler* op( + new ParameterOptionHandler(PREF_FILE_ALLOCATION, TEXT_FILE_ALLOCATION, + V_PREALLOC, {V_NONE, V_PREALLOC, V_TRUNC, #ifdef HAVE_SOME_FALLOCATE - V_FALLOC + V_FALLOC #endif // HAVE_SOME_FALLOCATE - }, - 'a')); + }, + 'a')); op->addTag(TAG_BASIC); op->addTag(TAG_FILE); op->setInitialOption(true); @@ -393,11 +334,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_FORCE_SAVE, - TEXT_FORCE_SAVE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_FORCE_SAVE, TEXT_FORCE_SAVE, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeOption(true); @@ -406,30 +344,23 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_FORCE_SEQUENTIAL, - TEXT_FORCE_SEQUENTIAL, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'Z')); + OptionHandler* op( + new BooleanOptionHandler(PREF_FORCE_SEQUENTIAL, TEXT_FORCE_SEQUENTIAL, + A2_V_FALSE, OptionHandler::OPT_ARG, 'Z')); op->addTag(TAG_BASIC); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_GID, - TEXT_GID, - NO_DEFAULT_VALUE)); + OptionHandler* op( + new DefaultOptionHandler(PREF_GID, TEXT_GID, NO_DEFAULT_VALUE)); op->addTag(TAG_ADVANCED); op->setInitialOption(true); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_HASH_CHECK_ONLY, - TEXT_HASH_CHECK_ONLY, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_HASH_CHECK_ONLY, + TEXT_HASH_CHECK_ONLY, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_BITTORRENT); op->addTag(TAG_METALINK); @@ -441,75 +372,54 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_HUMAN_READABLE, - TEXT_HUMAN_READABLE, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_HUMAN_READABLE, + TEXT_HUMAN_READABLE, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_INPUT_FILE, - TEXT_INPUT_FILE, - NO_DEFAULT_VALUE, - PATH_TO_FILE_STDIN, - OptionHandler::REQ_ARG, - 'i')); + OptionHandler* op(new DefaultOptionHandler( + PREF_INPUT_FILE, TEXT_INPUT_FILE, NO_DEFAULT_VALUE, PATH_TO_FILE_STDIN, + OptionHandler::REQ_ARG, 'i')); op->addTag(TAG_BASIC); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_INTERFACE, - TEXT_INTERFACE, - NO_DEFAULT_VALUE, - "interface, IP address, hostname", - OptionHandler::REQ_ARG)); + OptionHandler* op(new DefaultOptionHandler( + PREF_INTERFACE, TEXT_INTERFACE, NO_DEFAULT_VALUE, + "interface, IP address, hostname", OptionHandler::REQ_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_LOG, - TEXT_LOG, - NO_DEFAULT_VALUE, - PATH_TO_FILE_STDOUT, - OptionHandler::REQ_ARG, - 'l')); + OptionHandler* op(new DefaultOptionHandler( + PREF_LOG, TEXT_LOG, NO_DEFAULT_VALUE, PATH_TO_FILE_STDOUT, + OptionHandler::REQ_ARG, 'l')); op->addTag(TAG_BASIC); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_LOG_LEVEL, - TEXT_LOG_LEVEL, - V_DEBUG, - {std::begin(logLevels), std::end(logLevels)})); + OptionHandler* op(new ParameterOptionHandler( + PREF_LOG_LEVEL, TEXT_LOG_LEVEL, V_DEBUG, + {std::begin(logLevels), std::end(logLevels)})); op->addTag(TAG_ADVANCED); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_CONCURRENT_DOWNLOADS, - TEXT_MAX_CONCURRENT_DOWNLOADS, - "5", - 1, -1, - 'j')); + OptionHandler* op(new NumberOptionHandler(PREF_MAX_CONCURRENT_DOWNLOADS, + TEXT_MAX_CONCURRENT_DOWNLOADS, + "5", 1, -1, 'j')); op->addTag(TAG_BASIC); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_CONNECTION_PER_SERVER, - TEXT_MAX_CONNECTION_PER_SERVER, - "1", - 1, 16, - 'x')); + OptionHandler* op(new NumberOptionHandler(PREF_MAX_CONNECTION_PER_SERVER, + TEXT_MAX_CONNECTION_PER_SERVER, + "1", 1, 16, 'x')); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -519,11 +429,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_MAX_DOWNLOAD_LIMIT, - TEXT_MAX_DOWNLOAD_LIMIT, - "0", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_MAX_DOWNLOAD_LIMIT, TEXT_MAX_DOWNLOAD_LIMIT, "0", 0)); op->addTag(TAG_BITTORRENT); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -534,21 +441,26 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_DOWNLOAD_RESULT, - TEXT_MAX_DOWNLOAD_RESULT, - "1000", - 0)); + OptionHandler* op(new NumberOptionHandler( + PREF_MAX_DOWNLOAD_RESULT, TEXT_MAX_DOWNLOAD_RESULT, "1000", 0)); op->addTag(TAG_ADVANCED); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_MAX_OVERALL_DOWNLOAD_LIMIT, - TEXT_MAX_OVERALL_DOWNLOAD_LIMIT, - "0", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_MAX_MMAP_LIMIT, TEXT_MAX_MMAP_LIMIT, + util::itos(std::numeric_limits<int64_t>::max()), 0)); + op->addTag(TAG_ADVANCED); + op->setInitialOption(true); + op->setChangeGlobalOption(true); + op->setChangeOptionForReserved(true); + handlers.push_back(op); + } + { + OptionHandler* op( + new UnitNumberOptionHandler(PREF_MAX_OVERALL_DOWNLOAD_LIMIT, + TEXT_MAX_OVERALL_DOWNLOAD_LIMIT, "0", 0)); op->addTag(TAG_BITTORRENT); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -556,11 +468,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_RESUME_FAILURE_TRIES, - TEXT_MAX_RESUME_FAILURE_TRIES, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler( + PREF_MAX_RESUME_FAILURE_TRIES, TEXT_MAX_RESUME_FAILURE_TRIES, "0", 0)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -570,12 +479,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_MIN_SPLIT_SIZE, - TEXT_MIN_SPLIT_SIZE, - "20M", - 1_m, 1_g, - 'k')); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_MIN_SPLIT_SIZE, TEXT_MIN_SPLIT_SIZE, "20M", 1_m, 1_g, 'k')); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -586,40 +491,29 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } #ifdef ENABLE_SSL { - OptionHandler* op(new ParameterOptionHandler - (PREF_MIN_TLS_VERSION, - TEXT_MIN_TLS_VERSION, - A2_V_TLS10, - { A2_V_SSL3, A2_V_TLS10, A2_V_TLS11, A2_V_TLS12 })); + OptionHandler* op(new ParameterOptionHandler( + PREF_MIN_TLS_VERSION, TEXT_MIN_TLS_VERSION, A2_V_TLS10, + {A2_V_SSL3, A2_V_TLS10, A2_V_TLS11, A2_V_TLS12})); op->addTag(TAG_ADVANCED); handlers.push_back(op); } #endif // ENABLE_SSL { - OptionHandler* op(new DefaultOptionHandler - (PREF_MULTIPLE_INTERFACE, - TEXT_MULTIPLE_INTERFACE, - NO_DEFAULT_VALUE, - "interface, IP address, hostname", - OptionHandler::REQ_ARG)); + OptionHandler* op(new DefaultOptionHandler( + PREF_MULTIPLE_INTERFACE, TEXT_MULTIPLE_INTERFACE, NO_DEFAULT_VALUE, + "interface, IP address, hostname", OptionHandler::REQ_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_NO_CONF, - TEXT_NO_CONF, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_NO_CONF, TEXT_NO_CONF, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_NO_FILE_ALLOCATION_LIMIT, - TEXT_NO_FILE_ALLOCATION_LIMIT, - "5M", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_NO_FILE_ALLOCATION_LIMIT, TEXT_NO_FILE_ALLOCATION_LIMIT, "5M", 0)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FILE); op->setInitialOption(true); @@ -628,84 +522,74 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_DOWNLOAD_COMPLETE, - TEXT_ON_DOWNLOAD_COMPLETE, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op(new DefaultOptionHandler( + PREF_ON_DOWNLOAD_COMPLETE, TEXT_ON_DOWNLOAD_COMPLETE, NO_DEFAULT_VALUE, + PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_DOWNLOAD_ERROR, - TEXT_ON_DOWNLOAD_ERROR, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op( + new DefaultOptionHandler(PREF_ON_DOWNLOAD_ERROR, TEXT_ON_DOWNLOAD_ERROR, + NO_DEFAULT_VALUE, PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_DOWNLOAD_PAUSE, - TEXT_ON_DOWNLOAD_PAUSE, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op( + new DefaultOptionHandler(PREF_ON_DOWNLOAD_PAUSE, TEXT_ON_DOWNLOAD_PAUSE, + NO_DEFAULT_VALUE, PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_DOWNLOAD_START, - TEXT_ON_DOWNLOAD_START, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op( + new DefaultOptionHandler(PREF_ON_DOWNLOAD_START, TEXT_ON_DOWNLOAD_START, + NO_DEFAULT_VALUE, PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_DOWNLOAD_STOP, - TEXT_ON_DOWNLOAD_STOP, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op( + new DefaultOptionHandler(PREF_ON_DOWNLOAD_STOP, TEXT_ON_DOWNLOAD_STOP, + NO_DEFAULT_VALUE, PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_PARAMETERIZED_URI, - TEXT_PARAMETERIZED_URI, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'P')); + OptionHandler* op(new OptimizeConcurrentDownloadsOptionHandler( + PREF_OPTIMIZE_CONCURRENT_DOWNLOADS, TEXT_OPTIMIZE_CONCURRENT_DOWNLOADS, + A2_V_FALSE, OptionHandler::OPT_ARG)); + op->addTag(TAG_ADVANCED); + op->setChangeGlobalOption(true); + handlers.push_back(op); + } + { + OptionHandler* op( + new BooleanOptionHandler(PREF_PARAMETERIZED_URI, TEXT_PARAMETERIZED_URI, + A2_V_FALSE, OptionHandler::OPT_ARG, 'P')); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_PAUSE, - TEXT_PAUSE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_PAUSE, TEXT_PAUSE, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_RPC); op->setInitialOption(true); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_PAUSE_METADATA, - TEXT_PAUSE_METADATA, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_PAUSE_METADATA, + TEXT_PAUSE_METADATA, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->addTag(TAG_RPC); op->setInitialOption(true); @@ -714,21 +598,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_QUIET, - TEXT_QUIET, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'q')); + OptionHandler* op(new BooleanOptionHandler( + PREF_QUIET, TEXT_QUIET, A2_V_FALSE, OptionHandler::OPT_ARG, 'q')); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_REALTIME_CHUNK_CHECKSUM, - TEXT_REALTIME_CHUNK_CHECKSUM, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_REALTIME_CHUNK_CHECKSUM, TEXT_REALTIME_CHUNK_CHECKSUM, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_METALINK); op->addTag(TAG_CHECKSUM); op->setInitialOption(true); @@ -737,11 +615,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_REMOVE_CONTROL_FILE, - TEXT_REMOVE_CONTROL_FILE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_REMOVE_CONTROL_FILE, TEXT_REMOVE_CONTROL_FILE, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -749,222 +625,171 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_SAVE_SESSION, - TEXT_SAVE_SESSION, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_SAVE_SESSION, TEXT_SAVE_SESSION, NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_ADVANCED); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_SAVE_SESSION_INTERVAL, - TEXT_SAVE_SESSION_INTERVAL, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler( + PREF_SAVE_SESSION_INTERVAL, TEXT_SAVE_SESSION_INTERVAL, "0", 0)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_DSCP, - TEXT_DSCP, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler(PREF_DSCP, TEXT_DSCP, "0", 0)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } #ifdef HAVE_SYS_RESOURCE_H { - OptionHandler* op(new NumberOptionHandler - (PREF_RLIMIT_NOFILE, - TEXT_RLIMIT_NOFILE, - // Somewhat sane default that most *nix use. - // Some other *nix, like OSX, have insane defaults like - // 256, hence better *not* get the default value from - // getrlimit(). - "1024", - // 1 should not be a problem in practise, since the code - // will only adjust if the specified value > the current - // soft limit. - // And sane systems have a default soft limit > 1. - 1)); + OptionHandler* op(new NumberOptionHandler( + PREF_RLIMIT_NOFILE, TEXT_RLIMIT_NOFILE, + // Somewhat sane default that most *nix use. + // Some other *nix, like OSX, have insane defaults like + // 256, hence better *not* get the default value from + // getrlimit(). + "1024", + // 1 should not be a problem in practise, since the code + // will only adjust if the specified value > the current + // soft limit. + // And sane systems have a default soft limit > 1. + 1)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } #endif // HAVE_SYS_RESOURCE_H { - OptionHandler* op(new BooleanOptionHandler - (PREF_SELECT_LEAST_USED_HOST, - NO_DESCRIPTION, - A2_V_TRUE)); + OptionHandler* op(new BooleanOptionHandler(PREF_SELECT_LEAST_USED_HOST, + NO_DESCRIPTION, A2_V_TRUE)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_SHOW_CONSOLE_READOUT, - TEXT_SHOW_CONSOLE_READOUT, - A2_V_TRUE)); + OptionHandler* op(new BooleanOptionHandler( + PREF_SHOW_CONSOLE_READOUT, TEXT_SHOW_CONSOLE_READOUT, A2_V_TRUE)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_STOP, - TEXT_STOP, - "0", - 0, INT32_MAX)); + OptionHandler* op(new UnitNumberOptionHandler(PREF_SOCKET_RECV_BUFFER_SIZE, + TEXT_SOCKET_RECV_BUFFER_SIZE, + "0", 0, 16_m)); + op->addTag(TAG_ADVANCED); + handlers.push_back(op); + } + { + OptionHandler* op( + new NumberOptionHandler(PREF_STOP, TEXT_STOP, "0", 0, INT32_MAX)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_STOP_WITH_PROCESS, - TEXT_STOP_WITH_PROCESS, - NO_DEFAULT_VALUE, - 0)); + OptionHandler* op(new NumberOptionHandler( + PREF_STOP_WITH_PROCESS, TEXT_STOP_WITH_PROCESS, NO_DEFAULT_VALUE, 0)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_SUMMARY_INTERVAL, - TEXT_SUMMARY_INTERVAL, - "60", - 0, INT32_MAX)); + OptionHandler* op(new NumberOptionHandler( + PREF_SUMMARY_INTERVAL, TEXT_SUMMARY_INTERVAL, "60", 0, INT32_MAX)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_TRUNCATE_CONSOLE_READOUT, - TEXT_TRUNCATE_CONSOLE_READOUT, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_TRUNCATE_CONSOLE_READOUT, TEXT_TRUNCATE_CONSOLE_READOUT, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_ADVANCED); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_RPC_ALLOW_ORIGIN_ALL, - TEXT_RPC_ALLOW_ORIGIN_ALL, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_RPC_ALLOW_ORIGIN_ALL, TEXT_RPC_ALLOW_ORIGIN_ALL, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_RPC); handlers.push_back(op); } { OptionHandler* op( #ifdef HAVE_APPLETLS - new DefaultOptionHandler - (PREF_RPC_CERTIFICATE, - TEXT_RPC_CERTIFICATE, - NO_DEFAULT_VALUE) -#else // HAVE_APPLETLS - new LocalFilePathOptionHandler - (PREF_RPC_CERTIFICATE, - TEXT_RPC_CERTIFICATE, - NO_DEFAULT_VALUE, - false) + new DefaultOptionHandler(PREF_RPC_CERTIFICATE, TEXT_RPC_CERTIFICATE, + NO_DEFAULT_VALUE) +#else // HAVE_APPLETLS + new LocalFilePathOptionHandler( + PREF_RPC_CERTIFICATE, TEXT_RPC_CERTIFICATE, NO_DEFAULT_VALUE, false) #endif // HAVE_APPLETLS - ); + ); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_RPC_LISTEN_ALL, - TEXT_RPC_LISTEN_ALL, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_RPC_LISTEN_ALL, + TEXT_RPC_LISTEN_ALL, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_RPC_LISTEN_PORT, - TEXT_RPC_LISTEN_PORT, - "6800", - 1024, UINT16_MAX)); + OptionHandler* op(new NumberOptionHandler( + PREF_RPC_LISTEN_PORT, TEXT_RPC_LISTEN_PORT, "6800", 1024, UINT16_MAX)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_RPC_MAX_REQUEST_SIZE, - TEXT_RPC_MAX_REQUEST_SIZE, - "2M", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_RPC_MAX_REQUEST_SIZE, TEXT_RPC_MAX_REQUEST_SIZE, "2M", 0)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new LocalFilePathOptionHandler - (PREF_RPC_PRIVATE_KEY, - TEXT_RPC_PRIVATE_KEY, - NO_DEFAULT_VALUE, - false)); + OptionHandler* op(new LocalFilePathOptionHandler( + PREF_RPC_PRIVATE_KEY, TEXT_RPC_PRIVATE_KEY, NO_DEFAULT_VALUE, false)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_RPC_SAVE_UPLOAD_METADATA, - TEXT_RPC_SAVE_UPLOAD_METADATA, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_RPC_SAVE_UPLOAD_METADATA, TEXT_RPC_SAVE_UPLOAD_METADATA, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_RPC); op->setInitialOption(true); op->setChangeGlobalOption(true); handlers.push_back(op); } { - auto op = new DefaultOptionHandler - (PREF_RPC_SECRET, - TEXT_RPC_SECRET); + auto op = new DefaultOptionHandler(PREF_RPC_SECRET, TEXT_RPC_SECRET); op->addTag(TAG_RPC); op->setEraseAfterParse(true); op->setAllowEmpty(false); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_RPC_SECURE, - TEXT_RPC_SECURE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_RPC_SECURE, TEXT_RPC_SECURE, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_RPC); handlers.push_back(op); } { - OptionHandler* op(new DeprecatedOptionHandler - (new DefaultOptionHandler - (PREF_RPC_USER, - TEXT_RPC_USER), - nullptr, true, - "Migrate to --rpc-secret option as soon as possible.")); + OptionHandler* op(new DeprecatedOptionHandler( + new DefaultOptionHandler(PREF_RPC_USER, TEXT_RPC_USER), nullptr, true, + "Migrate to --rpc-secret option as soon as possible.")); op->addTag(TAG_RPC); op->setEraseAfterParse(true); handlers.push_back(op); } { - OptionHandler* op(new DeprecatedOptionHandler - (new DefaultOptionHandler - (PREF_RPC_PASSWD, - TEXT_RPC_PASSWD), - nullptr, true)); + OptionHandler* op(new DeprecatedOptionHandler( + new DefaultOptionHandler(PREF_RPC_PASSWD, TEXT_RPC_PASSWD), nullptr, + true)); op->addTag(TAG_RPC); op->setEraseAfterParse(true); handlers.push_back(op); } // HTTP/FTP options { - OptionHandler* op(new ChecksumOptionHandler - (PREF_CHECKSUM, - TEXT_CHECKSUM)); + OptionHandler* op(new ChecksumOptionHandler(PREF_CHECKSUM, TEXT_CHECKSUM)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->addTag(TAG_CHECKSUM); @@ -973,11 +798,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_CONNECT_TIMEOUT, - TEXT_CONNECT_TIMEOUT, - "60", - 1, 600)); + OptionHandler* op(new NumberOptionHandler( + PREF_CONNECT_TIMEOUT, TEXT_CONNECT_TIMEOUT, "60", 1, 600)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -986,11 +808,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_DRY_RUN, - TEXT_DRY_RUN, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_DRY_RUN, TEXT_DRY_RUN, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -998,11 +817,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_LOWEST_SPEED_LIMIT, - TEXT_LOWEST_SPEED_LIMIT, - "0", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_LOWEST_SPEED_LIMIT, TEXT_LOWEST_SPEED_LIMIT, "0", 0)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1011,11 +827,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_FILE_NOT_FOUND, - TEXT_MAX_FILE_NOT_FOUND, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler(PREF_MAX_FILE_NOT_FOUND, + TEXT_MAX_FILE_NOT_FOUND, "0", 0)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1024,12 +837,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_TRIES, - TEXT_MAX_TRIES, - "5", - 0, -1, - 'm')); + OptionHandler* op(new NumberOptionHandler(PREF_MAX_TRIES, TEXT_MAX_TRIES, + "5", 0, -1, 'm')); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1038,12 +847,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_NO_NETRC, - TEXT_NO_NETRC, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'n')); + OptionHandler* op(new BooleanOptionHandler( + PREF_NO_NETRC, TEXT_NO_NETRC, A2_V_FALSE, OptionHandler::OPT_ARG, 'n')); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1052,13 +857,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_OUT, - TEXT_OUT, - NO_DEFAULT_VALUE, - PATH_TO_FILE, - OptionHandler::REQ_ARG, - 'o')); + OptionHandler* op(new DefaultOptionHandler(PREF_OUT, TEXT_OUT, + NO_DEFAULT_VALUE, PATH_TO_FILE, + OptionHandler::REQ_ARG, 'o')); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -1068,11 +869,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_PIECE_LENGTH, - TEXT_PIECE_LENGTH, - "1M", - 1_m, 1_g)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_PIECE_LENGTH, TEXT_PIECE_LENGTH, "1M", 1_m, 1_g)); op->addTag(TAG_ADVANCED); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -1081,12 +879,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_REMOTE_TIME, - TEXT_REMOTE_TIME, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'R')); + OptionHandler* op(new BooleanOptionHandler(PREF_REMOTE_TIME, + TEXT_REMOTE_TIME, A2_V_FALSE, + OptionHandler::OPT_ARG, 'R')); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1095,11 +890,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_RETRY_WAIT, - TEXT_RETRY_WAIT, - "0", - 0, 600)); + OptionHandler* op( + new NumberOptionHandler(PREF_RETRY_WAIT, TEXT_RETRY_WAIT, "0", 0, 600)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1108,11 +900,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_REUSE_URI, - TEXT_REUSE_URI, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_REUSE_URI, TEXT_REUSE_URI, A2_V_TRUE, OptionHandler::OPT_ARG)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1121,43 +910,33 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_SERVER_STAT_IF, - TEXT_SERVER_STAT_IF, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler(PREF_SERVER_STAT_IF, + TEXT_SERVER_STAT_IF, + NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_SERVER_STAT_OF, - TEXT_SERVER_STAT_OF, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler(PREF_SERVER_STAT_OF, + TEXT_SERVER_STAT_OF, + NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_SERVER_STAT_TIMEOUT, - TEXT_SERVER_STAT_TIMEOUT, - "86400", - 0, INT32_MAX)); + OptionHandler* op(new NumberOptionHandler(PREF_SERVER_STAT_TIMEOUT, + TEXT_SERVER_STAT_TIMEOUT, "86400", + 0, INT32_MAX)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_SPLIT, - TEXT_SPLIT, - "5", - 1, -1, - 's')); + OptionHandler* op( + new NumberOptionHandler(PREF_SPLIT, TEXT_SPLIT, "5", 1, -1, 's')); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); @@ -1167,20 +946,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_STARTUP_IDLE_TIME, - NO_DESCRIPTION, - "10", - 1, 60)); + OptionHandler* op(new NumberOptionHandler(PREF_STARTUP_IDLE_TIME, + NO_DESCRIPTION, "10", 1, 60)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_STREAM_PIECE_SELECTOR, - TEXT_STREAM_PIECE_SELECTOR, - A2_V_DEFAULT, - { A2_V_DEFAULT, V_INORDER, A2_V_RANDOM, A2_V_GEOM })); + OptionHandler* op(new ParameterOptionHandler( + PREF_STREAM_PIECE_SELECTOR, TEXT_STREAM_PIECE_SELECTOR, A2_V_DEFAULT, + {A2_V_DEFAULT, V_INORDER, A2_V_RANDOM, A2_V_GEOM})); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1189,12 +963,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_TIMEOUT, - TEXT_TIMEOUT, - "60", - 1, 600, - 't')); + OptionHandler* op( + new NumberOptionHandler(PREF_TIMEOUT, TEXT_TIMEOUT, "60", 1, 600, 't')); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1203,11 +973,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_URI_SELECTOR, - TEXT_URI_SELECTOR, - V_FEEDBACK, - { V_INORDER, V_FEEDBACK, V_ADAPTIVE })); + OptionHandler* op(new ParameterOptionHandler( + PREF_URI_SELECTOR, TEXT_URI_SELECTOR, V_FEEDBACK, + {V_INORDER, V_FEEDBACK, V_ADAPTIVE})); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1217,15 +985,14 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } // HTTP Specific Options { - OptionHandler* op(new DefaultOptionHandler - (PREF_CA_CERTIFICATE, - TEXT_CA_CERTIFICATE, + OptionHandler* op(new DefaultOptionHandler(PREF_CA_CERTIFICATE, + TEXT_CA_CERTIFICATE, #ifdef CA_BUNDLE - CA_BUNDLE, + CA_BUNDLE, #else - "", + "", #endif - PATH_TO_FILE)); + PATH_TO_FILE)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); handlers.push_back(op); @@ -1233,38 +1000,29 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() { OptionHandler* op( #ifdef HAVE_APPLETLS - new DefaultOptionHandler - (PREF_CERTIFICATE, - TEXT_CERTIFICATE, - NO_DEFAULT_VALUE) -#else // HAVE_APPLETLS - new LocalFilePathOptionHandler - (PREF_CERTIFICATE, - TEXT_CERTIFICATE, - NO_DEFAULT_VALUE, - false) + new DefaultOptionHandler(PREF_CERTIFICATE, TEXT_CERTIFICATE, + NO_DEFAULT_VALUE) +#else // HAVE_APPLETLS + new LocalFilePathOptionHandler(PREF_CERTIFICATE, TEXT_CERTIFICATE, + NO_DEFAULT_VALUE, false) #endif // HAVE_APPLETLS - ); + ); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_CHECK_CERTIFICATE, - TEXT_CHECK_CERTIFICATE, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_CHECK_CERTIFICATE, TEXT_CHECK_CERTIFICATE, + A2_V_TRUE, OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_HTTP_KEEP_ALIVE, - TEXT_ENABLE_HTTP_KEEP_ALIVE, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ENABLE_HTTP_KEEP_ALIVE, TEXT_ENABLE_HTTP_KEEP_ALIVE, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1272,11 +1030,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_HTTP_PIPELINING, - TEXT_ENABLE_HTTP_PIPELINING, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ENABLE_HTTP_PIPELINING, TEXT_ENABLE_HTTP_PIPELINING, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1284,11 +1040,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new CumulativeOptionHandler - (PREF_HEADER, - TEXT_HEADER, - NO_DEFAULT_VALUE, - "\n")); + OptionHandler* op(new CumulativeOptionHandler(PREF_HEADER, TEXT_HEADER, + NO_DEFAULT_VALUE, "\n")); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setCumulative(true); @@ -1297,11 +1050,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_HTTP_ACCEPT_GZIP, - TEXT_HTTP_ACCEPT_GZIP, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_HTTP_ACCEPT_GZIP, TEXT_HTTP_ACCEPT_GZIP, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1309,11 +1060,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_HTTP_AUTH_CHALLENGE, - TEXT_HTTP_AUTH_CHALLENGE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_HTTP_AUTH_CHALLENGE, TEXT_HTTP_AUTH_CHALLENGE, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1321,11 +1070,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_HTTP_NO_CACHE, - TEXT_HTTP_NO_CACHE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_HTTP_NO_CACHE, + TEXT_HTTP_NO_CACHE, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1333,9 +1080,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTP_PASSWD, - TEXT_HTTP_PASSWD)); + OptionHandler* op( + new DefaultOptionHandler(PREF_HTTP_PASSWD, TEXT_HTTP_PASSWD)); op->addTag(TAG_BASIC); op->addTag(TAG_HTTP); op->setEraseAfterParse(true); @@ -1345,9 +1091,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTP_USER, - TEXT_HTTP_USER)); + OptionHandler* op(new DefaultOptionHandler(PREF_HTTP_USER, TEXT_HTTP_USER)); op->addTag(TAG_BASIC); op->addTag(TAG_HTTP); op->setEraseAfterParse(true); @@ -1357,29 +1101,22 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_LOAD_COOKIES, - TEXT_LOAD_COOKIES, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_LOAD_COOKIES, TEXT_LOAD_COOKIES, NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_BASIC); op->addTag(TAG_HTTP); op->addTag(TAG_COOKIE); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_MAX_HTTP_PIPELINING, - NO_DESCRIPTION, - "2", - 1, 8)); + OptionHandler* op(new NumberOptionHandler(PREF_MAX_HTTP_PIPELINING, + NO_DESCRIPTION, "2", 1, 8)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_METALINK_LOCATION, - TEXT_METALINK_LOCATION)); + OptionHandler* op(new DefaultOptionHandler(PREF_METALINK_LOCATION, + TEXT_METALINK_LOCATION)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1387,19 +1124,14 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_PRIVATE_KEY, - TEXT_PRIVATE_KEY, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_PRIVATE_KEY, TEXT_PRIVATE_KEY, NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_REFERER, - TEXT_REFERER)); + OptionHandler* op(new DefaultOptionHandler(PREF_REFERER, TEXT_REFERER)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1407,22 +1139,16 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_SAVE_COOKIES, - TEXT_SAVE_COOKIES, - NO_DEFAULT_VALUE, - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_SAVE_COOKIES, TEXT_SAVE_COOKIES, NO_DEFAULT_VALUE, PATH_TO_FILE)); op->addTag(TAG_HTTP); op->addTag(TAG_COOKIE); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_USE_HEAD, - TEXT_USE_HEAD, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_USE_HEAD, TEXT_USE_HEAD, A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1430,13 +1156,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_USER_AGENT, - TEXT_USER_AGENT, - "aria2/" PACKAGE_VERSION, - A2STR::NIL, - OptionHandler::REQ_ARG, - 'U')); + OptionHandler* op(new DefaultOptionHandler( + PREF_USER_AGENT, TEXT_USER_AGENT, "aria2/" PACKAGE_VERSION, A2STR::NIL, + OptionHandler::REQ_ARG, 'U')); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1445,9 +1167,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() } // FTP Specific Options { - OptionHandler* op(new DefaultOptionHandler - (PREF_FTP_PASSWD, - TEXT_FTP_PASSWD)); + OptionHandler* op( + new DefaultOptionHandler(PREF_FTP_PASSWD, TEXT_FTP_PASSWD)); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->setEraseAfterParse(true); @@ -1457,12 +1178,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_FTP_PASV, - TEXT_FTP_PASV, - A2_V_TRUE, - OptionHandler::OPT_ARG, - 'p')); + OptionHandler* op(new BooleanOptionHandler( + PREF_FTP_PASV, TEXT_FTP_PASV, A2_V_TRUE, OptionHandler::OPT_ARG, 'p')); op->addTag(TAG_FTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1470,11 +1187,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_FTP_REUSE_CONNECTION, - TEXT_FTP_REUSE_CONNECTION, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_FTP_REUSE_CONNECTION, TEXT_FTP_REUSE_CONNECTION, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_FTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1482,11 +1197,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_FTP_TYPE, - TEXT_FTP_TYPE, - V_BINARY, - { V_BINARY, V_ASCII })); + OptionHandler* op(new ParameterOptionHandler( + PREF_FTP_TYPE, TEXT_FTP_TYPE, V_BINARY, {V_BINARY, V_ASCII})); op->addTag(TAG_FTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1494,9 +1206,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_FTP_USER, - TEXT_FTP_USER)); + OptionHandler* op(new DefaultOptionHandler(PREF_FTP_USER, TEXT_FTP_USER)); op->addTag(TAG_BASIC); op->addTag(TAG_FTP); op->setEraseAfterParse(true); @@ -1506,10 +1216,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ChecksumOptionHandler - (PREF_SSH_HOST_KEY_MD, - TEXT_SSH_HOST_KEY_MD, - {"sha-1", "md5"})); + OptionHandler* op(new ChecksumOptionHandler( + PREF_SSH_HOST_KEY_MD, TEXT_SSH_HOST_KEY_MD, {"sha-1", "md5"})); op->addTag(TAG_FTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1517,19 +1225,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_NETRC_PATH, - TEXT_NETRC_PATH, - util::getHomeDir()+"/.netrc", - PATH_TO_FILE)); + OptionHandler* op(new DefaultOptionHandler(PREF_NETRC_PATH, TEXT_NETRC_PATH, + util::getHomeDir() + "/.netrc", + PATH_TO_FILE)); handlers.push_back(op); } // Proxy options { - OptionHandler* op(new HttpProxyOptionHandler - (PREF_HTTP_PROXY, - TEXT_HTTP_PROXY, - NO_DEFAULT_VALUE)); + OptionHandler* op(new HttpProxyOptionHandler( + PREF_HTTP_PROXY, TEXT_HTTP_PROXY, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1537,10 +1241,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTP_PROXY_PASSWD, - TEXT_HTTP_PROXY_PASSWD, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_HTTP_PROXY_PASSWD, TEXT_HTTP_PROXY_PASSWD, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->setEraseAfterParse(true); op->setInitialOption(true); @@ -1549,10 +1251,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTP_PROXY_USER, - TEXT_HTTP_PROXY_USER, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_HTTP_PROXY_USER, TEXT_HTTP_PROXY_USER, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->setEraseAfterParse(true); op->setInitialOption(true); @@ -1561,10 +1261,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new HttpProxyOptionHandler - (PREF_HTTPS_PROXY, - TEXT_HTTPS_PROXY, - NO_DEFAULT_VALUE)); + OptionHandler* op(new HttpProxyOptionHandler( + PREF_HTTPS_PROXY, TEXT_HTTPS_PROXY, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); op->setInitialOption(true); @@ -1573,10 +1271,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTPS_PROXY_PASSWD, - TEXT_HTTPS_PROXY_PASSWD, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_HTTPS_PROXY_PASSWD, TEXT_HTTPS_PROXY_PASSWD, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); op->setEraseAfterParse(true); @@ -1586,10 +1282,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_HTTPS_PROXY_USER, - TEXT_HTTPS_PROXY_USER, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_HTTPS_PROXY_USER, TEXT_HTTPS_PROXY_USER, NO_DEFAULT_VALUE)); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); op->setEraseAfterParse(true); @@ -1599,10 +1293,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new HttpProxyOptionHandler - (PREF_FTP_PROXY, - TEXT_FTP_PROXY, - NO_DEFAULT_VALUE)); + OptionHandler* op(new HttpProxyOptionHandler(PREF_FTP_PROXY, TEXT_FTP_PROXY, + NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1610,10 +1302,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_FTP_PROXY_PASSWD, - TEXT_FTP_PROXY_PASSWD, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_FTP_PROXY_PASSWD, TEXT_FTP_PROXY_PASSWD, NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->setEraseAfterParse(true); op->setInitialOption(true); @@ -1622,10 +1312,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_FTP_PROXY_USER, - TEXT_FTP_PROXY_USER, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_FTP_PROXY_USER, TEXT_FTP_PROXY_USER, NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->setEraseAfterParse(true); op->setInitialOption(true); @@ -1634,10 +1322,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new HttpProxyOptionHandler - (PREF_ALL_PROXY, - TEXT_ALL_PROXY, - NO_DEFAULT_VALUE)); + OptionHandler* op(new HttpProxyOptionHandler(PREF_ALL_PROXY, TEXT_ALL_PROXY, + NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); @@ -1647,10 +1333,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ALL_PROXY_PASSWD, - TEXT_ALL_PROXY_PASSWD, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_ALL_PROXY_PASSWD, TEXT_ALL_PROXY_PASSWD, NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); @@ -1661,10 +1345,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ALL_PROXY_USER, - TEXT_ALL_PROXY_USER, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_ALL_PROXY_USER, TEXT_ALL_PROXY_USER, NO_DEFAULT_VALUE)); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); @@ -1675,11 +1357,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_NO_PROXY, - TEXT_NO_PROXY, - NO_DEFAULT_VALUE, - "HOSTNAME,DOMAIN,NETWORK/CIDR")); + OptionHandler* op(new DefaultOptionHandler(PREF_NO_PROXY, TEXT_NO_PROXY, + NO_DEFAULT_VALUE, + "HOSTNAME,DOMAIN,NETWORK/CIDR")); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->addTag(TAG_HTTPS); @@ -1689,11 +1369,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_PROXY_METHOD, - TEXT_PROXY_METHOD, - V_GET, - { V_GET, V_TUNNEL })); + OptionHandler* op(new ParameterOptionHandler( + PREF_PROXY_METHOD, TEXT_PROXY_METHOD, V_GET, {V_GET, V_TUNNEL})); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); op->setInitialOption(true); @@ -1701,14 +1378,11 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() op->setChangeOptionForReserved(true); handlers.push_back(op); } - // BitTorrent/Metalink Options +// BitTorrent/Metalink Options #if defined(ENABLE_BITTORRENT) || defined(ENABLE_METALINK) { - OptionHandler* op(new IntegerRangeOptionHandler - (PREF_SELECT_FILE, - TEXT_SELECT_FILE, - NO_DEFAULT_VALUE, - 1, 1_m)); + OptionHandler* op(new IntegerRangeOptionHandler( + PREF_SELECT_FILE, TEXT_SELECT_FILE, NO_DEFAULT_VALUE, 1, 1_m)); op->addTag(TAG_BITTORRENT); op->addTag(TAG_METALINK); op->setInitialOption(true); @@ -1716,35 +1390,29 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_SHOW_FILES, - TEXT_SHOW_FILES, - A2_V_FALSE, - OptionHandler::OPT_ARG, - 'S')); + OptionHandler* op(new BooleanOptionHandler(PREF_SHOW_FILES, TEXT_SHOW_FILES, + A2_V_FALSE, + OptionHandler::OPT_ARG, 'S')); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); op->addTag(TAG_METALINK); handlers.push_back(op); } #endif // ENABLE_BITTORRENT || ENABLE_METALINK - // BitTorrent Specific Options +// BitTorrent Specific Options #ifdef ENABLE_BITTORRENT { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_DETACH_SEED_ONLY, - TEXT_BT_DETACH_SEED_ONLY, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_BT_DETACH_SEED_ONLY, TEXT_BT_DETACH_SEED_ONLY, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_ENABLE_LPD, - TEXT_BT_ENABLE_LPD, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_BT_ENABLE_HOOK_AFTER_HASH_CHECK, + TEXT_BT_ENABLE_HOOK_AFTER_HASH_CHECK, + A2_V_TRUE, OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1752,12 +1420,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_BT_EXCLUDE_TRACKER, - TEXT_BT_EXCLUDE_TRACKER, - NO_DESCRIPTION, - "URI,... " - "or *")); + OptionHandler* op(new BooleanOptionHandler(PREF_BT_ENABLE_LPD, + TEXT_BT_ENABLE_LPD, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1765,11 +1430,10 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_BT_EXTERNAL_IP, - TEXT_BT_EXTERNAL_IP, - NO_DEFAULT_VALUE, - "a numeric IP address")); + OptionHandler* op(new DefaultOptionHandler(PREF_BT_EXCLUDE_TRACKER, + TEXT_BT_EXCLUDE_TRACKER, + NO_DESCRIPTION, "URI,... " + "or *")); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1777,11 +1441,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_FORCE_ENCRYPTION, - TEXT_BT_FORCE_ENCRYPTION, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new DefaultOptionHandler(PREF_BT_EXTERNAL_IP, TEXT_BT_EXTERNAL_IP, + NO_DEFAULT_VALUE, "a numeric IP address")); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1789,20 +1451,25 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_KEEP_ALIVE_INTERVAL, - NO_DESCRIPTION, - "120", - 1, 120)); + OptionHandler* op(new BooleanOptionHandler( + PREF_BT_FORCE_ENCRYPTION, TEXT_BT_FORCE_ENCRYPTION, A2_V_FALSE, + OptionHandler::OPT_ARG)); + op->addTag(TAG_BITTORRENT); + op->setInitialOption(true); + op->setChangeGlobalOption(true); + op->setChangeOptionForReserved(true); + handlers.push_back(op); + } + { + OptionHandler* op(new NumberOptionHandler(PREF_BT_KEEP_ALIVE_INTERVAL, + NO_DESCRIPTION, "120", 1, 120)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_HASH_CHECK_SEED, - TEXT_BT_HASH_CHECK_SEED, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_BT_HASH_CHECK_SEED, TEXT_BT_HASH_CHECK_SEED, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->addTag(TAG_CHECKSUM); op->setInitialOption(true); @@ -1811,45 +1478,33 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_BT_LPD_INTERFACE, - TEXT_BT_LPD_INTERFACE, - NO_DEFAULT_VALUE, - "interface, IP address", - OptionHandler::REQ_ARG)); + OptionHandler* op(new DefaultOptionHandler( + PREF_BT_LPD_INTERFACE, TEXT_BT_LPD_INTERFACE, NO_DEFAULT_VALUE, + "interface, IP address", OptionHandler::REQ_ARG)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_MAX_OPEN_FILES, - TEXT_BT_MAX_OPEN_FILES, - "100", - 1)); + OptionHandler* op(new NumberOptionHandler( + PREF_BT_MAX_OPEN_FILES, TEXT_BT_MAX_OPEN_FILES, "100", 1)); op->addTag(TAG_BITTORRENT); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_MAX_PEERS, - TEXT_BT_MAX_PEERS, - "55", - 0)); + OptionHandler* op( + new NumberOptionHandler(PREF_BT_MAX_PEERS, TEXT_BT_MAX_PEERS, "55", 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeOption(true); op->setChangeGlobalOption(true); op->setChangeOptionForReserved(true); handlers.push_back(op); - } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_METADATA_ONLY, - TEXT_BT_METADATA_ONLY, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_BT_METADATA_ONLY, TEXT_BT_METADATA_ONLY, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1857,11 +1512,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_BT_MIN_CRYPTO_LEVEL, - TEXT_BT_MIN_CRYPTO_LEVEL, - V_PLAIN, - { V_PLAIN, V_ARC4 })); + OptionHandler* op(new ParameterOptionHandler(PREF_BT_MIN_CRYPTO_LEVEL, + TEXT_BT_MIN_CRYPTO_LEVEL, + V_PLAIN, {V_PLAIN, V_ARC4})); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1869,9 +1522,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new PrioritizePieceOptionHandler - (PREF_BT_PRIORITIZE_PIECE, - TEXT_BT_PRIORITIZE_PIECE)); + OptionHandler* op(new PrioritizePieceOptionHandler( + PREF_BT_PRIORITIZE_PIECE, TEXT_BT_PRIORITIZE_PIECE)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1879,11 +1531,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_REMOVE_UNSELECTED_FILE, - TEXT_BT_REMOVE_UNSELECTED_FILE, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_BT_REMOVE_UNSELECTED_FILE, TEXT_BT_REMOVE_UNSELECTED_FILE, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeOption(true); @@ -1892,11 +1542,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_BT_REQUEST_PEER_SPEED_LIMIT, - TEXT_BT_REQUEST_PEER_SPEED_LIMIT, - "50K", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_BT_REQUEST_PEER_SPEED_LIMIT, TEXT_BT_REQUEST_PEER_SPEED_LIMIT, + "50K", 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeOption(true); @@ -1905,11 +1553,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_REQUIRE_CRYPTO, - TEXT_BT_REQUIRE_CRYPTO, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_BT_REQUIRE_CRYPTO, TEXT_BT_REQUIRE_CRYPTO, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1917,20 +1563,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_REQUEST_TIMEOUT, - NO_DESCRIPTION, - "60", - 1, 600)); + OptionHandler* op(new NumberOptionHandler(PREF_BT_REQUEST_TIMEOUT, + NO_DESCRIPTION, "60", 1, 600)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_SEED_UNVERIFIED, - TEXT_BT_SEED_UNVERIFIED, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_BT_SEED_UNVERIFIED, TEXT_BT_SEED_UNVERIFIED, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1938,11 +1579,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_BT_SAVE_METADATA, - TEXT_BT_SAVE_METADATA, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_BT_SAVE_METADATA, TEXT_BT_SAVE_METADATA, + A2_V_FALSE, OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1950,11 +1589,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_STOP_TIMEOUT, - TEXT_BT_STOP_TIMEOUT, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler(PREF_BT_STOP_TIMEOUT, + TEXT_BT_STOP_TIMEOUT, "0", 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1962,20 +1598,14 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_TIMEOUT, - NO_DESCRIPTION, - "180", - 1, 600)); + OptionHandler* op(new NumberOptionHandler(PREF_BT_TIMEOUT, NO_DESCRIPTION, + "180", 1, 600)); op->hide(); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_BT_TRACKER, - TEXT_BT_TRACKER, - NO_DESCRIPTION, - "URI,...")); + OptionHandler* op(new DefaultOptionHandler(PREF_BT_TRACKER, TEXT_BT_TRACKER, + NO_DESCRIPTION, "URI,...")); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1983,11 +1613,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_TRACKER_CONNECT_TIMEOUT, - TEXT_BT_TRACKER_CONNECT_TIMEOUT, - "60", - 1, 600)); + OptionHandler* op(new NumberOptionHandler(PREF_BT_TRACKER_CONNECT_TIMEOUT, + TEXT_BT_TRACKER_CONNECT_TIMEOUT, + "60", 1, 600)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -1995,11 +1623,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_TRACKER_INTERVAL, - TEXT_BT_TRACKER_INTERVAL, - "0", - 0)); + OptionHandler* op(new NumberOptionHandler( + PREF_BT_TRACKER_INTERVAL, TEXT_BT_TRACKER_INTERVAL, "0", 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2007,11 +1632,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_BT_TRACKER_TIMEOUT, - TEXT_BT_TRACKER_TIMEOUT, - "60", - 1, 600)); + OptionHandler* op(new NumberOptionHandler( + PREF_BT_TRACKER_TIMEOUT, TEXT_BT_TRACKER_TIMEOUT, "60", 1, 600)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2019,107 +1641,81 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new HostPortOptionHandler - (PREF_DHT_ENTRY_POINT, - TEXT_DHT_ENTRY_POINT, - NO_DEFAULT_VALUE, - PREF_DHT_ENTRY_POINT_HOST, - PREF_DHT_ENTRY_POINT_PORT)); + OptionHandler* op(new HostPortOptionHandler( + PREF_DHT_ENTRY_POINT, TEXT_DHT_ENTRY_POINT, NO_DEFAULT_VALUE, + PREF_DHT_ENTRY_POINT_HOST, PREF_DHT_ENTRY_POINT_PORT)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new HostPortOptionHandler - (PREF_DHT_ENTRY_POINT6, - TEXT_DHT_ENTRY_POINT6, - NO_DEFAULT_VALUE, - PREF_DHT_ENTRY_POINT_HOST6, - PREF_DHT_ENTRY_POINT_PORT6)); + OptionHandler* op(new HostPortOptionHandler( + PREF_DHT_ENTRY_POINT6, TEXT_DHT_ENTRY_POINT6, NO_DEFAULT_VALUE, + PREF_DHT_ENTRY_POINT_HOST6, PREF_DHT_ENTRY_POINT_PORT6)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_DHT_FILE_PATH, - TEXT_DHT_FILE_PATH, - util::getDHTFile(false), - PATH_TO_FILE)); + OptionHandler* op( + new DefaultOptionHandler(PREF_DHT_FILE_PATH, TEXT_DHT_FILE_PATH, + util::getDHTFile(false), PATH_TO_FILE)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_DHT_FILE_PATH6, - TEXT_DHT_FILE_PATH6, - util::getDHTFile(true), - PATH_TO_FILE)); + OptionHandler* op( + new DefaultOptionHandler(PREF_DHT_FILE_PATH6, TEXT_DHT_FILE_PATH6, + util::getDHTFile(true), PATH_TO_FILE)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_DHT_LISTEN_ADDR, - NO_DESCRIPTION, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_DHT_LISTEN_ADDR, NO_DESCRIPTION, NO_DEFAULT_VALUE)); op->hide(); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_DHT_LISTEN_ADDR6, - TEXT_DHT_LISTEN_ADDR6, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_DHT_LISTEN_ADDR6, TEXT_DHT_LISTEN_ADDR6, NO_DEFAULT_VALUE)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new IntegerRangeOptionHandler - (PREF_DHT_LISTEN_PORT, - TEXT_DHT_LISTEN_PORT, - "6881-6999", - 1024, UINT16_MAX)); + OptionHandler* op(new IntegerRangeOptionHandler( + PREF_DHT_LISTEN_PORT, TEXT_DHT_LISTEN_PORT, "6881-6999", 1024, + UINT16_MAX)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_DHT_MESSAGE_TIMEOUT, - TEXT_DHT_MESSAGE_TIMEOUT, - "10", - 1, 60)); + OptionHandler* op(new NumberOptionHandler( + PREF_DHT_MESSAGE_TIMEOUT, TEXT_DHT_MESSAGE_TIMEOUT, "10", 1, 60)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_DHT, - TEXT_ENABLE_DHT, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ENABLE_DHT, TEXT_ENABLE_DHT, A2_V_TRUE, OptionHandler::OPT_ARG)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_DHT6, - TEXT_ENABLE_DHT6, - A2_V_FALSE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler(PREF_ENABLE_DHT6, + TEXT_ENABLE_DHT6, A2_V_FALSE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_ENABLE_PEER_EXCHANGE, - TEXT_ENABLE_PEER_EXCHANGE, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op(new BooleanOptionHandler( + PREF_ENABLE_PEER_EXCHANGE, TEXT_ENABLE_PEER_EXCHANGE, A2_V_TRUE, + OptionHandler::OPT_ARG)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2127,11 +1723,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_FOLLOW_TORRENT, - TEXT_FOLLOW_TORRENT, - A2_V_TRUE, - { A2_V_TRUE, V_MEM, A2_V_FALSE })); + OptionHandler* op( + new ParameterOptionHandler(PREF_FOLLOW_TORRENT, TEXT_FOLLOW_TORRENT, + A2_V_TRUE, {A2_V_TRUE, V_MEM, A2_V_FALSE})); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2139,10 +1733,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new IndexOutOptionHandler - (PREF_INDEX_OUT, - TEXT_INDEX_OUT, - 'O')); + OptionHandler* op( + new IndexOutOptionHandler(PREF_INDEX_OUT, TEXT_INDEX_OUT, 'O')); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setCumulative(true); @@ -2150,33 +1742,23 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new IntegerRangeOptionHandler - (PREF_LISTEN_PORT, - TEXT_LISTEN_PORT, - "6881-6999", - 1024, UINT16_MAX)); + OptionHandler* op(new IntegerRangeOptionHandler( + PREF_LISTEN_PORT, TEXT_LISTEN_PORT, "6881-6999", 1024, UINT16_MAX)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_MAX_OVERALL_UPLOAD_LIMIT, - TEXT_MAX_OVERALL_UPLOAD_LIMIT, - "0", - 0)); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_MAX_OVERALL_UPLOAD_LIMIT, TEXT_MAX_OVERALL_UPLOAD_LIMIT, "0", 0)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new UnitNumberOptionHandler - (PREF_MAX_UPLOAD_LIMIT, - TEXT_MAX_UPLOAD_LIMIT, - "0", - 0, -1, - 'u')); + OptionHandler* op(new UnitNumberOptionHandler( + PREF_MAX_UPLOAD_LIMIT, TEXT_MAX_UPLOAD_LIMIT, "0", 0, -1, 'u')); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); @@ -2186,21 +1768,16 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_ON_BT_DOWNLOAD_COMPLETE, - TEXT_ON_BT_DOWNLOAD_COMPLETE, - NO_DEFAULT_VALUE, - PATH_TO_COMMAND)); + OptionHandler* op(new DefaultOptionHandler( + PREF_ON_BT_DOWNLOAD_COMPLETE, TEXT_ON_BT_DOWNLOAD_COMPLETE, + NO_DEFAULT_VALUE, PATH_TO_COMMAND)); op->addTag(TAG_ADVANCED); op->addTag(TAG_HOOK); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_PEER_CONNECTION_TIMEOUT, - NO_DESCRIPTION, - "20", - 1, 600)); + OptionHandler* op(new NumberOptionHandler(PREF_PEER_CONNECTION_TIMEOUT, + NO_DESCRIPTION, "20", 1, 600)); op->hide(); handlers.push_back(op); } @@ -2209,19 +1786,14 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() sscanf(PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ); char prefix[21]; snprintf(prefix, sizeof(prefix), "A2-%d-%d-%d-", major, minor, micro); - OptionHandler* op(new DefaultOptionHandler - (PREF_PEER_ID_PREFIX, - TEXT_PEER_ID_PREFIX, - prefix)); + OptionHandler* op(new DefaultOptionHandler(PREF_PEER_ID_PREFIX, + TEXT_PEER_ID_PREFIX, prefix)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } { - OptionHandler* op(new NumberOptionHandler - (PREF_SEED_TIME, - TEXT_SEED_TIME, - NO_DEFAULT_VALUE, - 0)); + OptionHandler* op(new NumberOptionHandler(PREF_SEED_TIME, TEXT_SEED_TIME, + NO_DEFAULT_VALUE, 0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2229,11 +1801,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new FloatNumberOptionHandler - (PREF_SEED_RATIO, - TEXT_SEED_RATIO, - "1.0", - 0.0)); + OptionHandler* op(new FloatNumberOptionHandler( + PREF_SEED_RATIO, TEXT_SEED_RATIO, "1.0", 0.0)); op->addTag(TAG_BITTORRENT); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2241,25 +1810,19 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new LocalFilePathOptionHandler - (PREF_TORRENT_FILE, - TEXT_TORRENT_FILE, - NO_DEFAULT_VALUE, - false, - 'T')); + OptionHandler* op(new LocalFilePathOptionHandler( + PREF_TORRENT_FILE, TEXT_TORRENT_FILE, NO_DEFAULT_VALUE, false, 'T')); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } #endif // ENABLE_BITTORRENT - // Metalink Specific Options +// Metalink Specific Options #ifdef ENABLE_METALINK { - OptionHandler* op(new ParameterOptionHandler - (PREF_FOLLOW_METALINK, - TEXT_FOLLOW_METALINK, - A2_V_TRUE, - { A2_V_TRUE, V_MEM, A2_V_FALSE })); + OptionHandler* op( + new ParameterOptionHandler(PREF_FOLLOW_METALINK, TEXT_FOLLOW_METALINK, + A2_V_TRUE, {A2_V_TRUE, V_MEM, A2_V_FALSE})); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2267,21 +1830,18 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_METALINK_BASE_URI, - TEXT_METALINK_BASE_URI, - NO_DEFAULT_VALUE)); + OptionHandler* op(new DefaultOptionHandler( + PREF_METALINK_BASE_URI, TEXT_METALINK_BASE_URI, NO_DEFAULT_VALUE)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); handlers.push_back(op); } { - OptionHandler* op(new BooleanOptionHandler - (PREF_METALINK_ENABLE_UNIQUE_PROTOCOL, - TEXT_METALINK_ENABLE_UNIQUE_PROTOCOL, - A2_V_TRUE, - OptionHandler::OPT_ARG)); + OptionHandler* op( + new BooleanOptionHandler(PREF_METALINK_ENABLE_UNIQUE_PROTOCOL, + TEXT_METALINK_ENABLE_UNIQUE_PROTOCOL, + A2_V_TRUE, OptionHandler::OPT_ARG)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2289,20 +1849,15 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new LocalFilePathOptionHandler - (PREF_METALINK_FILE, - TEXT_METALINK_FILE, - NO_DEFAULT_VALUE, - true, - 'M')); + OptionHandler* op(new LocalFilePathOptionHandler( + PREF_METALINK_FILE, TEXT_METALINK_FILE, NO_DEFAULT_VALUE, true, 'M')); op->addTag(TAG_BASIC); op->addTag(TAG_METALINK); handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_METALINK_LANGUAGE, - TEXT_METALINK_LANGUAGE)); + OptionHandler* op(new DefaultOptionHandler(PREF_METALINK_LANGUAGE, + TEXT_METALINK_LANGUAGE)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2310,9 +1865,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_METALINK_OS, - TEXT_METALINK_OS)); + OptionHandler* op( + new DefaultOptionHandler(PREF_METALINK_OS, TEXT_METALINK_OS)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2320,11 +1874,9 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new ParameterOptionHandler - (PREF_METALINK_PREFERRED_PROTOCOL, - TEXT_METALINK_PREFERRED_PROTOCOL, - V_NONE, - { V_HTTP, V_HTTPS, V_FTP, V_NONE })); + OptionHandler* op(new ParameterOptionHandler( + PREF_METALINK_PREFERRED_PROTOCOL, TEXT_METALINK_PREFERRED_PROTOCOL, + V_NONE, {V_HTTP, V_HTTPS, V_FTP, V_NONE})); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2332,9 +1884,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler - (PREF_METALINK_VERSION, - TEXT_METALINK_VERSION)); + OptionHandler* op( + new DefaultOptionHandler(PREF_METALINK_VERSION, TEXT_METALINK_VERSION)); op->addTag(TAG_METALINK); op->setInitialOption(true); op->setChangeGlobalOption(true); @@ -2344,31 +1895,23 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() #endif // ENABLE_METALINK // Version Option { - OptionHandler* op(new DefaultOptionHandler - (PREF_VERSION, - TEXT_VERSION, - NO_DEFAULT_VALUE, - A2STR::NIL, - OptionHandler::NO_ARG, - 'v')); + OptionHandler* op(new DefaultOptionHandler(PREF_VERSION, TEXT_VERSION, + NO_DEFAULT_VALUE, A2STR::NIL, + OptionHandler::NO_ARG, 'v')); op->addTag(TAG_BASIC); handlers.push_back(op); } // Help Option { std::string tagsStr; - for(int i = 0; i < MAX_HELP_TAG; ++i) { + for (int i = 0; i < MAX_HELP_TAG; ++i) { tagsStr += strHelpTag(i); tagsStr += ", "; } tagsStr += STR_TAG_ALL; - OptionHandler* op(new DefaultOptionHandler - (PREF_HELP, - TEXT_HELP, - strHelpTag(TAG_BASIC), - tagsStr, - OptionHandler::OPT_ARG, - 'h')); + OptionHandler* op(new DefaultOptionHandler(PREF_HELP, TEXT_HELP, + strHelpTag(TAG_BASIC), tagsStr, + OptionHandler::OPT_ARG, 'h')); op->addTag(TAG_BASIC); op->addTag(TAG_HELP); handlers.push_back(op); |