Pluralise "select-file".

I don't think there is any reason to select one file out of one files.
pull/1558/head
Penguin-Guru 2020-02-09 16:05:18 -08:00
parent 9d0a48ac81
commit 55407afe65
10 changed files with 46 additions and 46 deletions

View File

@ -10974,7 +10974,7 @@
2009-05-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
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 <t-tujikawa@users.sourceforge.net>
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 <t-tujikawa@users.sourceforge.net>
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 <tujikawa at rednoah dot com>
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 <tujikawa at rednoah dot com>
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 <tujikawa at rednoah dot com>
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.

File diff suppressed because one or more lines are too long

View File

@ -629,7 +629,7 @@ FTP/SFTP Specific Options
BitTorrent/Metalink Options
~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. option:: --select-file=<INDEX>...
.. option:: --select-files=<INDEX>...
Set file to download by specifying its index.
You can find the file index using the :option:`--show-files <-S>` option.
@ -768,7 +768,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.
@ -2216,7 +2216,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>`
@ -2885,8 +2885,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``.
@ -3350,7 +3350,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
@ -3916,7 +3916,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.
@ -4073,7 +4073,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::
@ -4140,7 +4140,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::

View File

@ -584,7 +584,7 @@ Opções Específicas de FTP
Opções Comuns de BitTorrent / Metalink
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. option:: --select-file=<INDEX>...
.. option:: --select-files=<INDEX>...
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>`.
@ -691,7 +691,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.
@ -1927,7 +1927,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>`
@ -2548,8 +2548,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``
@ -3009,7 +3009,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
@ -3504,7 +3504,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``
@ -3664,7 +3664,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::
@ -3734,7 +3734,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::

View File

@ -653,7 +653,7 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent-
Параметры BitTorrent/Metalink
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. option:: --select-file=<INDEX>...
.. option:: --select-files=<INDEX>...
Задать файл для загрузки по заданному индексу. Вы можете найти
индекс файла, используя параметр :option:`--show-files <-S>`.
@ -804,7 +804,7 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent-
Удалить невыбранные файлы, когда завершена загрузка в
BitTorrent. Чтобы выбрать файлы, используйте параметр
:option:`--select-file`. Если не
:option:`--select-files`. Если не
использовался этот параметр, то предполагается, что все файлы
выбраны. Пожалуйста, используйте этот параметр внимательно,
так как это фактически удалит файлы с вашего диска.
@ -2329,7 +2329,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>`
@ -2996,8 +2996,8 @@ RPC-метод `system.multicall` обрабатывается особым об
:func:`aria2.tellStatus` также включены частично завершённые блоки.
``selected``
``true`` - если этот файл выбран параметром :option:`--select-file`. Если
параметр :option:`--select-file` не указан или это однофайловый торрент
``true`` - если этот файл выбран параметром :option:`--select-files`. Если
параметр :option:`--select-files` не указан или это однофайловый торрент
или загрузка вообще не торрент, то это значение всегда будет ``true``.
Иначе ``false``.
@ -3455,7 +3455,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>`, вы можете динамически
начинать вести журнал событий или изменять файл журнала событий. Чтобы
@ -4022,7 +4022,7 @@ RPC-сервер может отправлять уведомления клие
``X/Y(Z%)``
Загруженный размер, общий размер файла и процент выполнения загрузки.
Если используется :option:`--select-file`, то
Если используется :option:`--select-files`, то
значение является суммой выбранных файлов.
``SEED``
@ -4181,7 +4181,7 @@ Checksum
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. code-block:: console
$ aria2c --select-file=1-4,8 file.metalink
$ aria2c --select-files=1-4,8 file.metalink
.. note::
@ -4247,7 +4247,7 @@ Checksum
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. code-block:: console
$ aria2c --select-file=1-4,8 file.torrent
$ aria2c --select-files=1-4,8 file.torrent
.. note::

View File

@ -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"
}

View File

@ -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()));
}

View File

@ -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;

View File

@ -472,7 +472,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 ] ]

View File

@ -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" \
@ -938,7 +938,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" \