Browse Source

2010-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Documented --always-resume and --max-resume-failure-tries option
	and exit status 8 in man page. Fixed typo.
	* doc/aria2c.1.txt
	* src/OptionHandlerFactory.cc
Tatsuhiro Tsujikawa 15 năm trước cách đây
mục cha
commit
65389139c6
5 tập tin đã thay đổi với 113 bổ sung10 xóa
  1. 7 0
      ChangeLog
  2. 38 2
      doc/aria2c.1
  3. 36 1
      doc/aria2c.1.html
  4. 23 0
      doc/aria2c.1.txt
  5. 9 7
      src/usage_text.h

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2010-03-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Documented --always-resume and --max-resume-failure-tries option
+	and exit status 8 in man page. Fixed typo.
+	* doc/aria2c.1.txt
+	* src/OptionHandlerFactory.cc
+
 2010-03-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 2010-03-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 
 	Added --always-resume and --max-resume-failure-tries option.  If
 	Added --always-resume and --max-resume-failure-tries option.  If

+ 38 - 2
doc/aria2c.1

@@ -2,12 +2,12 @@
 .\"     Title: aria2c
 .\"     Title: aria2c
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 03/25/2010
+.\"      Date: 03/28/2010
 .\"    Manual: Aria2 Manual
 .\"    Manual: Aria2 Manual
 .\"    Source: Aria2 1.9.1a
 .\"    Source: Aria2 1.9.1a
 .\"  Language: English
 .\"  Language: English
 .\"
 .\"
-.TH "ARIA2C" "1" "03/25/2010" "Aria2 1\&.9\&.1a" "Aria2 Manual"
+.TH "ARIA2C" "1" "03/28/2010" "Aria2 1\&.9\&.1a" "Aria2 Manual"
 .\" -----------------------------------------------------------------
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 .\" -----------------------------------------------------------------
@@ -994,6 +994,23 @@ If false is given, aria2 aborts download when a piece length is different from o
 \fIfalse\fR
 \fIfalse\fR
 .RE
 .RE
 .PP
 .PP
+\fB\-\-always\-resume\fR[=\fItrue\fR|\fIfalse\fR]
+.RS 4
+Always resume download\&. If
+\fItrue\fR
+is given, aria2 always tries to resume download and if resume is not possible, aborts download\&. If
+\fIfalse\fR
+is given, when all given URIs do not support resume or aria2 encounters
+\fIN\fR
+URIs which does not support resume (\fIN\fR
+is the value specified using
+\fB\-\-max\-resume\-failure\-tries\fR
+option), aria2 downloads file from scratch\&. See
+\fB\-\-max\-resume\-failure\-tries\fR
+option\&. Default:
+\fItrue\fR
+.RE
+.PP
 \fB\-\-async\-dns\fR[=\fItrue\fR|\fIfalse\fR]
 \fB\-\-async\-dns\fR[=\fItrue\fR|\fIfalse\fR]
 .RS 4
 .RS 4
 Enable asynchronous DNS\&. Default:
 Enable asynchronous DNS\&. Default:
@@ -1104,6 +1121,20 @@ If an interface has multiple addresses, it is highly recommended to specify IP a
 .sp .5v
 .sp .5v
 .RE
 .RE
 .PP
 .PP
+\fB\-\-max\-resume\-failure\-tries\fR=\fIN\fR
+.RS 4
+When used with
+\fB\-\-always\-resume\fR=\fIfalse\fR, aria2 downloads file from scratch when aria2 detects
+\fIN\fR
+number of URIs that does not support resume\&. If
+\fIN\fR
+is
+\fI0\fR, aria2 downloads file from scratch when all given URIs do not support resume\&. See
+\fB\-\-always\-resume\fR
+option\&. Default:
+\fI0\fR
+.RE
+.PP
 \fB\-\-log\-level\fR=LEVEL
 \fB\-\-log\-level\fR=LEVEL
 .RS 4
 .RS 4
 Set log level to output\&. LEVEL is either
 Set log level to output\&. LEVEL is either
@@ -1357,6 +1388,11 @@ If network problem occurs\&.
 .RS 4
 .RS 4
 If there are unfinished downloads\&. This error is only reported if all finished downloads are successful and there are unfinished downloads in a queue when aria2 exits by pressing Ctrl\-C by an user or sending TERM or INT signal\&.
 If there are unfinished downloads\&. This error is only reported if all finished downloads are successful and there are unfinished downloads in a queue when aria2 exits by pressing Ctrl\-C by an user or sending TERM or INT signal\&.
 .RE
 .RE
+.PP
+\fB8\fR
+.RS 4
+If server does not support resume when resume is required to complete download\&.
+.RE
 .if n \{\
 .if n \{\
 .sp
 .sp
 .\}
 .\}

+ 36 - 1
doc/aria2c.1.html

@@ -1798,6 +1798,20 @@ writes the piece to the appropriate files.</td>
 </p>
 </p>
 </dd>
 </dd>
 <dt class="hdlist1">
 <dt class="hdlist1">
+<strong>--always-resume</strong>[=<em>true</em>|<em>false</em>]
+</dt>
+<dd>
+<p>
+  Always resume download. If <em>true</em> is given, aria2 always tries to
+  resume download and if resume is not possible, aborts download.  If
+  <em>false</em> is given, when all given URIs do not support resume or aria2
+  encounters <em>N</em> URIs which does not support resume (<em>N</em> is the value
+  specified using <strong>--max-resume-failure-tries</strong> option), aria2
+  downloads file from scratch.  See <strong>--max-resume-failure-tries</strong>
+  option. Default: <em>true</em>
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>--async-dns</strong>[=<em>true</em>|<em>false</em>]
 <strong>--async-dns</strong>[=<em>true</em>|<em>false</em>]
 </dt>
 </dt>
 <dd>
 <dd>
@@ -1933,6 +1947,18 @@ name.</td>
 </div>
 </div>
 <div class="dlist"><dl>
 <div class="dlist"><dl>
 <dt class="hdlist1">
 <dt class="hdlist1">
+<strong>--max-resume-failure-tries</strong>=<em>N</em>
+</dt>
+<dd>
+<p>
+  When used with <strong>--always-resume</strong>=<em>false</em>, aria2 downloads file from
+  scratch when aria2 detects <em>N</em> number of URIs that does not support
+  resume. If <em>N</em> is <em>0</em>, aria2 downloads file from scratch when all
+  given URIs do not support resume.  See <strong>--always-resume</strong> option.
+  Default: <em>0</em>
+</p>
+</dd>
+<dt class="hdlist1">
 <strong>--log-level</strong>=LEVEL
 <strong>--log-level</strong>=LEVEL
 </dt>
 </dt>
 <dd>
 <dd>
@@ -2257,6 +2283,15 @@ based on the last error encountered.</p></div>
   or sending TERM or INT signal.
   or sending TERM or INT signal.
 </p>
 </p>
 </dd>
 </dd>
+<dt class="hdlist1">
+<strong>8</strong>
+</dt>
+<dd>
+<p>
+  If server does not support resume when resume is required to
+  complete download.
+</p>
+</dd>
 </dl></div>
 </dl></div>
 <div class="admonitionblock">
 <div class="admonitionblock">
 <table><tr>
 <table><tr>
@@ -4012,7 +4047,7 @@ files in the program, then also delete it here.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer">
 <div id="footer-text">
 <div id="footer-text">
-Last updated 2010-03-25 23:48:28 JST
+Last updated 2010-03-28 16:34:53 JST
 </div>
 </div>
 </div>
 </div>
 </body>
 </body>

+ 23 - 0
doc/aria2c.1.txt

@@ -687,6 +687,16 @@ Advanced Options
   If true is given, you can proceed but some download progress will be lost.
   If true is given, you can proceed but some download progress will be lost.
   Default: 'false'
   Default: 'false'
 
 
+*--always-resume*[='true'|'false']::
+
+  Always resume download. If 'true' is given, aria2 always tries to
+  resume download and if resume is not possible, aborts download.  If
+  'false' is given, when all given URIs do not support resume or aria2
+  encounters 'N' URIs which does not support resume ('N' is the value
+  specified using *--max-resume-failure-tries* option), aria2
+  downloads file from scratch.  See *--max-resume-failure-tries*
+  option. Default: 'true'
+
 *--async-dns*[='true'|'false']::
 *--async-dns*[='true'|'false']::
   Enable asynchronous DNS.
   Enable asynchronous DNS.
   Default: 'true'
   Default: 'true'
@@ -764,6 +774,14 @@ specify IP address explicitly. See also *--disable-ipv6*.  If your
 system doesn't have getifaddrs(), this option doesn't accept interface
 system doesn't have getifaddrs(), this option doesn't accept interface
 name.
 name.
 
 
+*--max-resume-failure-tries*='N'::
+
+  When used with *--always-resume*='false', aria2 downloads file from
+  scratch when aria2 detects 'N' number of URIs that does not support
+  resume. If 'N' is '0', aria2 downloads file from scratch when all
+  given URIs do not support resume.  See *--always-resume* option.
+  Default: '0'
+
 *--log-level*=LEVEL::
 *--log-level*=LEVEL::
   Set log level to output.
   Set log level to output.
   LEVEL is either 'debug', 'info', 'notice', 'warn' or 'error'.
   LEVEL is either 'debug', 'info', 'notice', 'warn' or 'error'.
@@ -964,6 +982,11 @@ based on the last error encountered.
   downloads in a queue when aria2 exits by pressing Ctrl-C by an user
   downloads in a queue when aria2 exits by pressing Ctrl-C by an user
   or sending TERM or INT signal.
   or sending TERM or INT signal.
 
 
+*8*::
+
+  If server does not support resume when resume is required to
+  complete download.
+
 [NOTE]
 [NOTE]
 An error occurred in a finished download will not be reported
 An error occurred in a finished download will not be reported
 as exit status.
 as exit status.

+ 9 - 7
src/usage_text.h

@@ -641,17 +641,19 @@
     "                              starts from scratch. This will be useful for\n" \
     "                              starts from scratch. This will be useful for\n" \
     "                              users behind proxy server which disables resume.")
     "                              users behind proxy server which disables resume.")
 #define TEXT_ALWAYS_RESUME                      \
 #define TEXT_ALWAYS_RESUME                      \
-  _(" --always-resume[=true|false] Always resume download. If false is given, when\n" \
-    "                              all given URIs does not support resume or aria2\n" \
-    "                              encounters N URIs which does not support resume\n" \
-    "                              (N is the value specified using\n"   \
+  _(" --always-resume[=true|false] Always resume download. If true is given, aria2\n" \
+    "                              always tries to resume download and if resume is\n" \
+    "                              not possible, aborts download. If false is given,\n" \
+    "                              when all given URIs do not support resume or\n" \
+    "                              aria2 encounters N URIs which does not support\n" \
+    "                              resume (N is the value specified using\n"   \
     "                              --max-resume-failure-tries option), aria2\n" \
     "                              --max-resume-failure-tries option), aria2\n" \
-    "                              download file from scratch.\n"       \
+    "                              downloads file from scratch.\n"       \
     "                              See --max-resume-failure-tries option.")
     "                              See --max-resume-failure-tries option.")
 #define TEXT_MAX_RESUME_FAILURE_TRIES                                   \
 #define TEXT_MAX_RESUME_FAILURE_TRIES                                   \
   _(" --max-resume-failure-tries=N When used with --always-resume=false, aria2\n" \
   _(" --max-resume-failure-tries=N When used with --always-resume=false, aria2\n" \
-    "                              download file from scratch when aria2 detects N\n" \
+    "                              downloads file from scratch when aria2 detects N\n" \
     "                              number of URIs that does not support resume. If N\n" \
     "                              number of URIs that does not support resume. If N\n" \
-    "                              is 0, aria2 download file from scratch when all\n" \
+    "                              is 0, aria2 downloads file from scratch when all\n" \
     "                              given URIs do not support resume.\n" \
     "                              given URIs do not support resume.\n" \
     "                              See --always-resume option.")
     "                              See --always-resume option.")