diff --git a/ChangeLog.old b/ChangeLog.old index 67e0b70c..05485f8e 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -10974,7 +10974,7 @@ 2009-05-04 Tatsuhiro Tsujikawa - Fixed the bug that aria2 aborts when --select-file is used. This + Fixed the bug that aria2 aborts when --select-files is used. This bug was introduced in r1199. * src/MultiDiskAdaptor.cc @@ -12064,13 +12064,13 @@ 2009-02-28 Tatsuhiro Tsujikawa - Documented select-file option in Input File section. + Documented select-files option in Input File section. Documented --http-auth-challenge option. * doc/aria2c.1.txt 2009-02-28 Tatsuhiro Tsujikawa - Now select-file can be specified in the uri list(-i list). + Now select-files can be specified in the uri list(-i list). * src/BtContext.cc * src/BtContext.h * src/RequestGroup.cc @@ -14361,7 +14361,7 @@ 2008-10-22 Tatsuhiro Tsujikawa Fixed the bug that causes segmentation fault when accessing files which - don't exist or are not included in --select-file option while + don't exist or are not included in --select-files option while validating chunk checksum. * src/MultiDiskAdaptor.cc @@ -20236,7 +20236,7 @@ 2007-11-20 Tatsuhiro Tsujikawa Preallocate non-requested file which is adjacent forward to requested - file('requested' files means the files given in --select-file option) + file('requested' files means the files given in --select-files option) if they share a same piece. This fixes long pause in the file system which doesn't support sparse files like FAT32 while downloading. @@ -20283,7 +20283,7 @@ * test/OptionHandlerTest.cc Added IntegerRangeOptionHandler. Used for --listen-port and - --select-file. Now --listen-port accepts range of port. + --select-files. Now --listen-port accepts range of port. * src/OptionHandlerFactory.cc * src/version_usage.cc * src/OptionHandlerImpl.h @@ -21395,7 +21395,7 @@ a metalink file. Added selective download mode to metalink. * src/main.cc - (showUsage): Updated to denote that -S and --select-file options are + (showUsage): Updated to denote that -S and --select-files options are applicable to metalink. * src/FileEntry.h (operator=): New function. @@ -26763,7 +26763,7 @@ 2006-04-29 Tatsuhiro Tsujikawa - To add --select-file command-line option: + To add --select-files command-line option: * src/Util.cc (unfoldRange): New function. @@ -26771,7 +26771,7 @@ (unfoldSubRange): New function * src/main.cc (showUsage): Added help message. - (main): Added --select-file command-line option. Updated the layout of + (main): Added --select-files command-line option. Updated the layout of file listing. * src/common.h (Integers): New definition. diff --git a/doc/bash_completion/aria2c b/doc/bash_completion/aria2c index 9ab3ed02..09435956 100644 --- a/doc/bash_completion/aria2c +++ b/doc/bash_completion/aria2c @@ -78,7 +78,7 @@ _aria2c() esac case $cur in -*) - COMPREPLY=( $( compgen -W '--rpc-save-upload-metadata --rpc-save-upload-metadata=false --on-download-start --metalink-language --rpc-secret --torrent-file --enable-peer-exchange --enable-peer-exchange=false --http-proxy-passwd --bt-tracker-timeout --ftp-type --seed-time --keep-unfinished-download-result --keep-unfinished-download-result=false --bt-tracker-connect-timeout --bt-max-open-files --no-netrc --no-netrc=false --force-sequential --force-sequential=false --metalink-base-uri --private-key --ftp-passwd --allow-overwrite --allow-overwrite=false --rpc-allow-origin-all --rpc-allow-origin-all=false --bt-detach-seed-only --bt-detach-seed-only=false --dht-entry-point6 --summary-interval --lowest-speed-limit --bt-tracker-interval --proxy-method --metalink-preferred-protocol --enable-http-keep-alive --enable-http-keep-alive=false --metalink-version --stderr --stderr=false --bt-lpd-interface --force-save --force-save=false --rpc-secure --rpc-secure=false --listen-port --rpc-private-key --server-stat-of --server-stat-timeout --bt-load-saved-metadata --bt-load-saved-metadata=false --https-proxy-user --piece-length --dry-run --dry-run=false --truncate-console-readout --truncate-console-readout=false --save-not-found --save-not-found=false --async-dns-server --bt-max-peers --max-overall-upload-limit --rpc-user --optimize-concurrent-downloads --optimize-concurrent-downloads=true --optimize-concurrent-downloads=false --optimize-concurrent-downloads=A:B --dir --split --on-download-pause --auto-file-renaming --auto-file-renaming=false --http-proxy --save-session-interval --daemon --daemon=false --https-proxy --min-tls-version --save-cookies --out --rlimit-nofile --max-file-not-found --on-download-stop --certificate --bt-min-crypto-level --remove-control-file --remove-control-file=false --enable-dht --enable-dht=false --file-allocation --follow-metalink --on-bt-download-complete --ftp-proxy --show-files --show-files=false --timeout --bt-hash-check-seed --bt-hash-check-seed=false --ftp-pasv --ftp-pasv=false --check-certificate --check-certificate=false --always-resume --always-resume=false --load-cookies --bt-remove-unselected-file --bt-remove-unselected-file=false --bt-stop-timeout --version --max-concurrent-downloads --quiet --quiet=false --max-download-result --content-disposition-default-utf8 --content-disposition-default-utf8=false --max-resume-failure-tries --header --rpc-listen-all --rpc-listen-all=false --all-proxy-user --server-stat-if --dht-file-path6 --save-session --bt-external-ip --max-tries --conditional-get --conditional-get=false --ftp-reuse-connection --ftp-reuse-connection=false --gid --dscp --max-download-limit --bt-prioritize-piece --check-integrity --check-integrity=false --log-level --remote-time --remote-time=false --uri-selector --rpc-listen-port --index-out --bt-tracker --referer --ssh-host-key-md --console-log-level --connect-timeout --stream-piece-selector --dht-message-timeout --select-file --download-result --disable-ipv6 --disable-ipv6=false --rpc-max-request-size --rpc-passwd --stop-with-process --https-proxy-passwd --continue --continue=false --no-file-allocation-limit --netrc-path --ftp-proxy-user --enable-color --enable-color=false --metalink-location --allow-piece-length-change --allow-piece-length-change=false --max-connection-per-server --no-conf --no-conf=false --rpc-certificate --metalink-os --enable-http-pipelining --enable-http-pipelining=false --http-passwd --user-agent --enable-dht6 --enable-dht6=false --dht-file-path --http-auth-challenge --http-auth-challenge=false --bt-enable-hook-after-hash-check --bt-enable-hook-after-hash-check=false --peer-id-prefix --max-mmap-limit --enable-mmap --enable-mmap=false --use-head --use-head=false --bt-require-crypto --bt-require-crypto=false --show-console-readout --show-console-readout=false --conf-path --log --no-proxy --dht-entry-point --dht-listen-port --http-user --retry-wait --on-download-complete --help --help=#basic --help=#advanced --help=#http --help=#https --help=#ftp --help=#metalink --help=#bittorrent --help=#cookie --help=#hook --help=#file --help=#rpc --help=#checksum --help=#experimental --help=#deprecated --help=#help --help=#all --max-overall-download-limit --event-poll --http-accept-gzip --http-accept-gzip=false --metalink-file --all-proxy --disk-cache --hash-check-only --hash-check-only=false --dht-listen-addr6 --human-readable --human-readable=false --ftp-user --all-proxy-passwd --bt-exclude-tracker --pause-metadata --pause-metadata=false --http-proxy-user --deferred-input --deferred-input=false --metalink-enable-unique-protocol --metalink-enable-unique-protocol=false --stop --peer-agent --max-upload-limit --multiple-interface --realtime-chunk-checksum --realtime-chunk-checksum=false --http-no-cache --http-no-cache=false --ca-certificate --bt-force-encryption --bt-force-encryption=false --bt-save-metadata --bt-save-metadata=false --seed-ratio --follow-torrent --pause --pause=false --checksum --auto-save-interval --async-dns --async-dns=false --bt-enable-lpd --bt-enable-lpd=false --parameterized-uri --parameterized-uri=false --ftp-proxy-passwd --enable-rpc --enable-rpc=false --min-split-size --bt-seed-unverified --bt-seed-unverified=false --input-file --interface --enable-async-dns6 --enable-async-dns6=false --reuse-uri --reuse-uri=false --socket-recv-buffer-size --bt-request-peer-speed-limit --on-download-error --bt-metadata-only --bt-metadata-only=false ' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '--rpc-save-upload-metadata --rpc-save-upload-metadata=false --on-download-start --metalink-language --rpc-secret --torrent-file --enable-peer-exchange --enable-peer-exchange=false --http-proxy-passwd --bt-tracker-timeout --ftp-type --seed-time --keep-unfinished-download-result --keep-unfinished-download-result=false --bt-tracker-connect-timeout --bt-max-open-files --no-netrc --no-netrc=false --force-sequential --force-sequential=false --metalink-base-uri --private-key --ftp-passwd --allow-overwrite --allow-overwrite=false --rpc-allow-origin-all --rpc-allow-origin-all=false --bt-detach-seed-only --bt-detach-seed-only=false --dht-entry-point6 --summary-interval --lowest-speed-limit --bt-tracker-interval --proxy-method --metalink-preferred-protocol --enable-http-keep-alive --enable-http-keep-alive=false --metalink-version --stderr --stderr=false --bt-lpd-interface --force-save --force-save=false --rpc-secure --rpc-secure=false --listen-port --rpc-private-key --server-stat-of --server-stat-timeout --bt-load-saved-metadata --bt-load-saved-metadata=false --https-proxy-user --piece-length --dry-run --dry-run=false --truncate-console-readout --truncate-console-readout=false --save-not-found --save-not-found=false --async-dns-server --bt-max-peers --max-overall-upload-limit --rpc-user --optimize-concurrent-downloads --optimize-concurrent-downloads=true --optimize-concurrent-downloads=false --optimize-concurrent-downloads=A:B --dir --split --on-download-pause --auto-file-renaming --auto-file-renaming=false --http-proxy --save-session-interval --daemon --daemon=false --https-proxy --min-tls-version --save-cookies --out --rlimit-nofile --max-file-not-found --on-download-stop --certificate --bt-min-crypto-level --remove-control-file --remove-control-file=false --enable-dht --enable-dht=false --file-allocation --follow-metalink --on-bt-download-complete --ftp-proxy --show-files --show-files=false --timeout --bt-hash-check-seed --bt-hash-check-seed=false --ftp-pasv --ftp-pasv=false --check-certificate --check-certificate=false --always-resume --always-resume=false --load-cookies --bt-remove-unselected-file --bt-remove-unselected-file=false --bt-stop-timeout --version --max-concurrent-downloads --quiet --quiet=false --max-download-result --content-disposition-default-utf8 --content-disposition-default-utf8=false --max-resume-failure-tries --header --rpc-listen-all --rpc-listen-all=false --all-proxy-user --server-stat-if --dht-file-path6 --save-session --bt-external-ip --max-tries --conditional-get --conditional-get=false --ftp-reuse-connection --ftp-reuse-connection=false --gid --dscp --max-download-limit --bt-prioritize-piece --check-integrity --check-integrity=false --log-level --remote-time --remote-time=false --uri-selector --rpc-listen-port --index-out --bt-tracker --referer --ssh-host-key-md --console-log-level --connect-timeout --stream-piece-selector --dht-message-timeout --select-files --download-result --disable-ipv6 --disable-ipv6=false --rpc-max-request-size --rpc-passwd --stop-with-process --https-proxy-passwd --continue --continue=false --no-file-allocation-limit --netrc-path --ftp-proxy-user --enable-color --enable-color=false --metalink-location --allow-piece-length-change --allow-piece-length-change=false --max-connection-per-server --no-conf --no-conf=false --rpc-certificate --metalink-os --enable-http-pipelining --enable-http-pipelining=false --http-passwd --user-agent --enable-dht6 --enable-dht6=false --dht-file-path --http-auth-challenge --http-auth-challenge=false --bt-enable-hook-after-hash-check --bt-enable-hook-after-hash-check=false --peer-id-prefix --max-mmap-limit --enable-mmap --enable-mmap=false --use-head --use-head=false --bt-require-crypto --bt-require-crypto=false --show-console-readout --show-console-readout=false --conf-path --log --no-proxy --dht-entry-point --dht-listen-port --http-user --retry-wait --on-download-complete --help --help=#basic --help=#advanced --help=#http --help=#https --help=#ftp --help=#metalink --help=#bittorrent --help=#cookie --help=#hook --help=#file --help=#rpc --help=#checksum --help=#experimental --help=#deprecated --help=#help --help=#all --max-overall-download-limit --event-poll --http-accept-gzip --http-accept-gzip=false --metalink-file --all-proxy --disk-cache --hash-check-only --hash-check-only=false --dht-listen-addr6 --human-readable --human-readable=false --ftp-user --all-proxy-passwd --bt-exclude-tracker --pause-metadata --pause-metadata=false --http-proxy-user --deferred-input --deferred-input=false --metalink-enable-unique-protocol --metalink-enable-unique-protocol=false --stop --peer-agent --max-upload-limit --multiple-interface --realtime-chunk-checksum --realtime-chunk-checksum=false --http-no-cache --http-no-cache=false --ca-certificate --bt-force-encryption --bt-force-encryption=false --bt-save-metadata --bt-save-metadata=false --seed-ratio --follow-torrent --pause --pause=false --checksum --auto-save-interval --async-dns --async-dns=false --bt-enable-lpd --bt-enable-lpd=false --parameterized-uri --parameterized-uri=false --ftp-proxy-passwd --enable-rpc --enable-rpc=false --min-split-size --bt-seed-unverified --bt-seed-unverified=false --input-file --interface --enable-async-dns6 --enable-async-dns6=false --reuse-uri --reuse-uri=false --socket-recv-buffer-size --bt-request-peer-speed-limit --on-download-error --bt-metadata-only --bt-metadata-only=false ' -- "$cur" ) ) ;; *) _filedir '@(torrent|meta4|metalink|text|txt|list|lst)' diff --git a/doc/manual-src/en/aria2c.rst b/doc/manual-src/en/aria2c.rst index 6d54f361..41d3069a 100644 --- a/doc/manual-src/en/aria2c.rst +++ b/doc/manual-src/en/aria2c.rst @@ -633,7 +633,7 @@ FTP/SFTP Specific Options BitTorrent/Metalink Options ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. option:: --select-file=... +.. option:: --select-files=... Set file to download by specifying its index. You can find the file index using the :option:`--show-files <-S>` option. @@ -772,7 +772,7 @@ BitTorrent Specific Options Removes the unselected files when download is completed in BitTorrent. To select files, use - :option:`--select-file` option. If it is + :option:`--select-files` option. If it is not used, all files are assumed to be selected. Please use this option with care because it will actually remove files from your disk. @@ -2220,7 +2220,7 @@ of URIs. These optional lines must start with white space(s). * :option:`rpc-save-upload-metadata <--rpc-save-upload-metadata>` * :option:`seed-ratio <--seed-ratio>` * :option:`seed-time <--seed-time>` - * :option:`select-file <--select-file>` + * :option:`select-files <--select-files>` * :option:`split <-s>` * :option:`ssh-host-key-md <--ssh-host-key-md>` * :option:`stream-piece-selector <--stream-piece-selector>` @@ -2889,8 +2889,8 @@ For information on the *secret* parameter, see :ref:`rpc_auth`. in :func:`aria2.tellStatus` also includes partially completed pieces. ``selected`` - ``true`` if this file is selected by :option:`--select-file` option. If - :option:`--select-file` is not specified or this is single-file torrent or + ``true`` if this file is selected by :option:`--select-files` option. If + :option:`--select-files` is not specified or this is single-file torrent or not a torrent download at all, this value is always ``true``. Otherwise ``false``. @@ -3354,7 +3354,7 @@ For information on the *secret* parameter, see :ref:`rpc_auth`. :option:`index-out <-O>`, :option:`out <-o>`, :option:`pause <--pause>` and - :option:`select-file <--select-file>`. + :option:`select-files <--select-files>`. With the :option:`log <-l>` option, you can dynamically start logging or change log file. To stop logging, specify an empty string("") as the parameter @@ -3920,7 +3920,7 @@ This section describes what these numbers and strings mean. ``X/Y(Z%)`` Completed length, the total file length and its progress. If - :option:`--select-file` is used, this is the sum of selected files. + :option:`--select-files` is used, this is the sum of selected files. ``SEED`` Share ratio when the aria2 is seeding a finished torrent. @@ -4077,7 +4077,7 @@ Download only selected files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 file.metalink + $ aria2c --select-files=1-4,8 file.metalink .. note:: @@ -4144,7 +4144,7 @@ Only download specific files (usually called "selected download") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 file.torrent + $ aria2c --select-files=1-4,8 file.torrent .. note:: diff --git a/doc/manual-src/pt/aria2c.rst b/doc/manual-src/pt/aria2c.rst index ecb3a551..5c3527c3 100644 --- a/doc/manual-src/pt/aria2c.rst +++ b/doc/manual-src/pt/aria2c.rst @@ -587,7 +587,7 @@ Opções Específicas de FTP Opções Comuns de BitTorrent / Metalink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. option:: --select-file=... +.. option:: --select-files=... Define arquivo para download através da especificação de seu index. Para achar o index do arquivo use a opção :option:`--show-files <-S>`. @@ -694,7 +694,7 @@ Opções Específicas de BitTorrent .. option:: --bt-remove-unselected-file [true|false] Remove os arquivos não selecionados quando o download do BitTorrent estiver - completo. Para selecionar arquivo(s) use a opção :option:`--select-file`. + completo. Para selecionar arquivo(s) use a opção :option:`--select-files`. Se não for usada esta opção, é assumido que todos os arquivos serão selecionados. Use esta opção com critério pois ela realmente remove arquivo(s) do seu disco. @@ -1930,7 +1930,7 @@ URI. Estas linhas opcionais precisam iniciar com um ou mais espaços. * :option:`rpc-save-upload-metadata <--rpc-save-upload-metadata>` * :option:`seed-ratio <--seed-ratio>` * :option:`seed-time <--seed-time>` - * :option:`select-file <--select-file>` + * :option:`select-files <--select-files>` * :option:`split <-s>` * :option:`stream-piece-selector <--stream-piece-selector>` * :option:`timeout <-t>` @@ -2551,8 +2551,8 @@ Python versão 2.7. of partially completed piece. ``selected`` - ``true`` if this file is selected by :option:`--select-file` option. If - :option:`--select-file` is not specified or this is single torrent or no + ``true`` if this file is selected by :option:`--select-files` option. If + :option:`--select-files` is not specified or this is single torrent or no torrent download, this value is always ``true``. Otherwise ``false``. ``uris`` @@ -3012,7 +3012,7 @@ Python versão 2.7. :option:`index-out <-O>`, :option:`out <-o>`, :option:`pause <--pause>` and - :option:`select-file <--select-file>`. + :option:`select-files <--select-files>`. Using :option:`log <-l>` option, you can dynamically start logging or change log file. To stop logging, give empty string("") as a parameter @@ -3507,7 +3507,7 @@ Entenda o que estes números e strings significam. N significa GID, o qual é um ID único para cada download. ``SIZE`` - Tamanho Total e Tamanho em bytes. Se a :option:`--select-file` é usada, + Tamanho Total e Tamanho em bytes. Se a :option:`--select-files` é usada, será exibida a somatória do tamanho do arquivo. ``SEEDING`` @@ -3667,7 +3667,7 @@ Download só arquivos selecionados usando index ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 arquivo.metalink + $ aria2c --select-files=1-4,8 arquivo.metalink .. note:: @@ -3737,7 +3737,7 @@ Download arquivos selecionados usando index(chamado "download seletivo") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 arquivo.torrent + $ aria2c --select-files=1-4,8 arquivo.torrent .. note:: diff --git a/doc/manual-src/ru/aria2c.rst b/doc/manual-src/ru/aria2c.rst index 7a4c9d65..ae139b85 100644 --- a/doc/manual-src/ru/aria2c.rst +++ b/doc/manual-src/ru/aria2c.rst @@ -657,7 +657,7 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent- Параметры BitTorrent/Metalink ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. option:: --select-file=... +.. option:: --select-files=... Задать файл для загрузки по заданному индексу. Вы можете найти индекс файла, используя параметр :option:`--show-files <-S>`. @@ -808,7 +808,7 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent- Удалить невыбранные файлы, когда завершена загрузка в BitTorrent. Чтобы выбрать файлы, используйте параметр - :option:`--select-file`. Если не + :option:`--select-files`. Если не использовался этот параметр, то предполагается, что все файлы выбраны. Пожалуйста, используйте этот параметр внимательно, так как это фактически удалит файлы с вашего диска. @@ -2333,7 +2333,7 @@ URI. Эти дополнительные строки должны начина * :option:`rpc-save-upload-metadata <--rpc-save-upload-metadata>` * :option:`seed-ratio <--seed-ratio>` * :option:`seed-time <--seed-time>` - * :option:`select-file <--select-file>` + * :option:`select-files <--select-files>` * :option:`split <-s>` * :option:`ssh-host-key-md <--ssh-host-key-md>` * :option:`stream-piece-selector <--stream-piece-selector>` @@ -3000,8 +3000,8 @@ RPC-метод `system.multicall` обрабатывается особым об :func:`aria2.tellStatus` также включены частично завершённые блоки. ``selected`` - ``true`` - если этот файл выбран параметром :option:`--select-file`. Если - параметр :option:`--select-file` не указан или это однофайловый торрент + ``true`` - если этот файл выбран параметром :option:`--select-files`. Если + параметр :option:`--select-files` не указан или это однофайловый торрент или загрузка вообще не торрент, то это значение всегда будет ``true``. Иначе ``false``. @@ -3459,7 +3459,7 @@ RPC-метод `system.multicall` обрабатывается особым об :option:`index-out <-O>`, :option:`out <-o>`, :option:`pause <--pause>`, - :option:`select-file <--select-file>`. + :option:`select-files <--select-files>`. C параметром :option:`log <-l>`, вы можете динамически начинать вести журнал событий или изменять файл журнала событий. Чтобы @@ -4026,7 +4026,7 @@ RPC-сервер может отправлять уведомления клие ``X/Y(Z%)`` Загруженный размер, общий размер файла и процент выполнения загрузки. - Если используется :option:`--select-file`, то + Если используется :option:`--select-files`, то значение является суммой выбранных файлов. ``SEED`` @@ -4185,7 +4185,7 @@ Checksum ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 file.metalink + $ aria2c --select-files=1-4,8 file.metalink .. note:: @@ -4251,7 +4251,7 @@ Checksum ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: console - $ aria2c --select-file=1-4,8 file.torrent + $ aria2c --select-files=1-4,8 file.torrent .. note:: diff --git a/doc/xmlrpc/aria2rpc b/doc/xmlrpc/aria2rpc index f52b7f6a..f81360ca 100755 --- a/doc/xmlrpc/aria2rpc +++ b/doc/xmlrpc/aria2rpc @@ -100,7 +100,7 @@ OptionParser.new do |opt| opt.on("--reuse-uri [BOOL]",["true","false"]){|val| options["reuse-uri"]=val||"true" } - opt.on("--select-file INDEXES"){|val| options["select-file"]=val} + opt.on("--select-files INDEXES"){|val| options["select-files"]=val} opt.on("--bt-enable-lpd [BOOL]",["true","false"]){|val| options["bt-enable-lpd"]=val||"true" } diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc index c2249202..dcf1988d 100644 --- a/src/RpcMethodImpl.cc +++ b/src/RpcMethodImpl.cc @@ -622,11 +622,11 @@ void gatherProgressCommon(Dict* entryDict, entryDict->put(KEY_GID, GroupId::toHex(group->getGID()).c_str()); } if (requested_key(keys, KEY_TOTAL_LENGTH)) { - // This is "filtered" total length if --select-file is used. + // This is "filtered" total length if --select-files is used. entryDict->put(KEY_TOTAL_LENGTH, util::itos(group->getTotalLength())); } if (requested_key(keys, KEY_COMPLETED_LENGTH)) { - // This is "filtered" total length if --select-file is used. + // This is "filtered" total length if --select-files is used. entryDict->put(KEY_COMPLETED_LENGTH, util::itos(group->getCompletedLength())); } diff --git a/src/includes/aria2/aria2.h b/src/includes/aria2/aria2.h index c704a64c..b8108a6f 100644 --- a/src/includes/aria2/aria2.h +++ b/src/includes/aria2/aria2.h @@ -468,7 +468,7 @@ KeyVals getGlobalOptions(Session* session); * :option:`index-out <-O>`, * :option:`out <-o>`, * :option:`pause <--pause>` and - * :option:`select-file <--select-file>`. + * :option:`select-files <--select-files>`. * * The options which are not applicable or unknown, they are just * ignored. @@ -637,8 +637,8 @@ struct FileData { */ int64_t completedLength; /** - * true if this file is selected by ``select-file`` option. If - * ``select-file`` is not specified or this is single torrent or no + * true if this file is selected by ``select-files`` option. If + * ``select-files`` is not specified or this is single torrent or no * torrent download, this value is always true. */ bool selected; diff --git a/src/prefs.cc b/src/prefs.cc index 2591b9f0..b060bb3c 100644 --- a/src/prefs.cc +++ b/src/prefs.cc @@ -474,7 +474,7 @@ PrefPtr PREF_LISTEN_PORT = makePref("listen-port"); // values: true | false | mem PrefPtr PREF_FOLLOW_TORRENT = makePref("follow-torrent"); // values: 1*digit * = makePref( = makePref(,|-) 1*digit); -PrefPtr PREF_SELECT_FILE = makePref("select-file"); +PrefPtr PREF_SELECT_FILE = makePref("select-files"); // values: 1*digit PrefPtr PREF_SEED_TIME = makePref("seed-time"); // values: 1*digit ['.' [ 1*digit ] ] diff --git a/src/usage_text.h b/src/usage_text.h index 48684565..54d84596 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -274,7 +274,7 @@ " information will be listed in case of torrent\n" \ " file.") #define TEXT_SELECT_FILE \ - _(" --select-file=INDEX... Set file to download by specifying its index.\n" \ + _(" --select-files=INDEX... Set file to download by specifying its index.\n" \ " You can find the file index using the\n" \ " --show-files option. Multiple indexes can be\n" \ " specified by using ',', for example: \"3,6\".\n" \ @@ -941,7 +941,7 @@ #define TEXT_BT_REMOVE_UNSELECTED_FILE \ _(" --bt-remove-unselected-file[=true|false] Removes the unselected files when\n" \ " download is completed in BitTorrent. To\n" \ - " select files, use --select-file option. If\n" \ + " select files, use --select-files option. If\n" \ " it is not used, all files are assumed to be\n" \ " selected. Please use this option with care\n" \ " because it will actually remove files from\n" \