Prefix the estimated completion time of "--fineta" with "FIN" rather than "ETA" to differentiate it from the "ETA" provided by "--eta" (#43).

This commit is contained in:
Andrew Wood
2024-10-04 19:45:08 +01:00
parent 4b399995f5
commit a2c6490d31
9 changed files with 91 additions and 69 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ is acknowledged and greatly appreciated:
* Kim Krecht - suggested buffer fill status and last bytes output display options
* Cristian Ciupitu <http://ciupicri.github.io>, Josh Stone - pointed out file descriptor leak with helpful suggestions (Josh Stone initially noticed the missing close)
* Jan Seda - found issue with `splice()` and *SPLICE_F_NONBLOCK* causing slowdown
* André Stapf - pointed out formatting problem e.g. 13GB -> 13.1GB which should be shown 13.0GB -> 13.1GB; highlighted on-startup row swapping in "`-c`", and suggested "`--discard`"
* André Stapf - pointed out formatting problem e.g. 13GB -> 13.1GB which should be shown 13.0GB -> 13.1GB; highlighted on-startup row swapping in "`-c`", and suggested "`--discard`"; suggested making "`--fineta`" have a "FIN" prefix
* Damon Harper <http://www.usrbin.ca/> - suggested "`-D`" / "`--delay-start`" option
* Ganaël Laplanche <http://www.martymac.org> - provided patch for `lstat64()` on systems that do not support it
* Peter Korsgaard <http://www.buildroot.net/> - provided similar patch for `lstat64()`, specifically for uClibc support; provided AIX cross-compilation patch to fix bug in "`-lc128`" check
+2 -1
View File
@@ -4,8 +4,9 @@
* feature: "`--rate`" can now be used with "`--numeric`" ([#17](https://codeberg.org/a-j-wood/pv/issues/17))
* i18n: complete set of German translations supplied by Hartmut Goebel ([#98](https://codeberg.org/a-j-wood/pv/pulls/98))
* fix: resume stopped pipelines when running in the background (part of [#56](https://codeberg.org/a-j-wood/pv/issues/56))
* fix: write UTC timestamps in debugging mode to avoid lockups in signal handlers
* fix: prefix completion time ("`--fineta`") with *FIN* rather than *ETA* ([#43](https://codeberg.org/a-j-wood/pv/issues/43))
* fix: correct a memory leak in "`--watchfd PID`"
* fix: write UTC timestamps in debugging mode to avoid lockups in signal handlers
* cleanup: removed TODO.md, since it's just an outdated copy of the issue tracker
* cleanup: re-ordered structure members to reduce padding
* cleanup: improved readability of SIGTTOU handling code
+12 -10
View File
@@ -109,9 +109,8 @@ If no display switches are specified,
.B pv
behaves as if
.BR \-p ", " \-t ", " \-e ", " \-r ", and " \-b
had been given (i.e. everything except average rate is switched on).
Otherwise, only those display types that are explicitly switched on will be
shown.
had been given. Otherwise, only those display types that are explicitly
switched on will be shown.
.TP
.B \-p, \-\-progress
Turn the progress bar on. If any inputs are not files, or are
@@ -129,13 +128,16 @@ has been running for.
.B \-e, \-\-eta
Turn the ETA timer on. This will attempt to guess, based on current
transfer rates and the total data size, how long it will be before
completion. This option will have no effect if the total data size cannot
be determined.
completion. The countdown is prefixed with "ETA". This option will have no
effect if the total data size cannot be determined.
.TP
.B \-I, \-\-fineta
Turn the ETA timer on, but display the estimated local time of arrival
instead of time left. When the estimated time is more than 6 hours in the
future, the date is shown as well.
Turn the ETA timer on, but display the estimated local time at which the
transfer will finish, instead of the amount of time remaining. When the
estimated time is more than 6 hours in the future, the date is shown as
well. The time is prefixed with "FIN" for finish time. As with
.BR \-\-eta ,
this option will have no effect if the total data size cannot be determined.
.TP
.B \-r, \-\-rate
Turn the rate counter on. This will display the current rate of data
@@ -567,7 +569,7 @@ ETA as time remaining. Equivalent to
.BR \-e .
.TP
.B %I
ETA as local time of completion. Equivalent to
ETA as local time at which the transfer will finish. Equivalent to
.BR \-I .
.TP
.B %r
@@ -616,7 +618,7 @@ A single %.
.P
The format string equivalent of turning on all display switches is
.BR "\`%N %b %T %t %r %a %p %e'" .
.BR "\`%N %b %T %t %r %a %p %e %I'" .
.SH COMMON SWITCHES
+13 -10
View File
@@ -71,9 +71,8 @@ output modifiers, and general options.
# DISPLAY SWITCHES
If no display switches are specified, **pv** behaves as if **-p**,
**-t**, **-e**, **-r**, and **-b** had been given (i.e. everything
except average rate is switched on). Otherwise, only those display types
that are explicitly switched on will be shown.
**-t**, **-e**, **-r**, and **-b** had been given. Otherwise, only those
display types that are explicitly switched on will be shown.
**-p, \--progress**
@@ -92,14 +91,17 @@ that are explicitly switched on will be shown.
: Turn the ETA timer on. This will attempt to guess, based on current
transfer rates and the total data size, how long it will be before
completion. This option will have no effect if the total data size
cannot be determined.
completion. The countdown is prefixed with \"ETA\". This option will
have no effect if the total data size cannot be determined.
**-I, \--fineta**
: Turn the ETA timer on, but display the estimated local time of
arrival instead of time left. When the estimated time is more than 6
hours in the future, the date is shown as well.
: Turn the ETA timer on, but display the estimated local time at which
the transfer will finish, instead of the amount of time remaining.
When the estimated time is more than 6 hours in the future, the date
is shown as well. The time is prefixed with \"FIN\" for finish time.
As with **\--eta**, this option will have no effect if the total
data size cannot be determined.
**-r, \--rate**
@@ -413,7 +415,8 @@ be used:
**%I**
: ETA as local time of completion. Equivalent to **-I**.
: ETA as local time at which the transfer will finish. Equivalent to
**-I**.
**%r**
@@ -453,7 +456,7 @@ be used:
: A single %.
The format string equivalent of turning on all display switches is
**\`%N %b %T %t %r %a %p %e\'**.
**\`%N %b %T %t %r %a %p %e %I\'**.
# COMMON SWITCHES