marsadm: clarify timestamps via macros p2

docu/mars-manual.lyx

@@ -6965,11 +6965,8 @@ syncinfo-1and1
 replinfo
 \family default
  Shows an informational progress bar when fetch is running.
- Use cases are analogously to 
-\family typewriter
-syncinfo
-\family default
-.
+ This should not be used for scripting at all, because it contains realtime
+ information in human-readable form.
 \end_layout
 
 \begin_layout Labeling
@@ -6981,6 +6978,59 @@ replinfo-1and1
  A variant for internal use by 1&1 Internet AG.
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
+\family typewriter
+fetch-line
+\family default
+ Additional details, called by 
+\family typewriter
+replinfo
+\family default
+.
+ Shows the amount of data to be fetched, as well as the current transfer
+ rate and a very rough estimation of the future duration.
+ When primitive macros 
+\family typewriter
+%fetch-age{}
+\family default
+ or 
+\family typewriter
+%fetch-lag{}
+\family default
+ exceed 
+\family typewriter
+${window}
+\family default
+, their values are also displayed for human informational purposes.
+ See description of these primitive macros.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+
+\family typewriter
+replay-line
+\family default
+ Additional details, called by 
+\family typewriter
+replinfo
+\family default
+.
+ Shows the amount of data to be replayed, as well as the current replay
+ rate and a very rough estimation of the future duration.
+ When primitive macro 
+\family typewriter
+%replay-age{}
+\family default
+ exceeds 
+\family typewriter
+${window}
+\family default
+, it is also displayed for human informational purposes.
+\end_layout
+
 \begin_layout Subsubsection
 Predefined Trivial Macros
 \begin_inset CommandInset label

userspace/marsadm

@@ -3593,7 +3593,9 @@ my %complex_macros =
    => "%let{amount}{%human-numbers{}{}{}{%fetch-rest{}}}"
    .  "%let{rate}{%human-numbers{}{}{}{%fetch-rate{}}}"
    .  "%let{remain}{%human-seconds{%fetch-remain{}}}"
-   .  "       > fetch: %{amount} rate: %{rate}/sec  remaining: %{remain} hrs\n",
+   .  "%let{age}{%if{%and{%fetch-remain{}}{%>={%fetch-age{}}{%{window}}}}{ age: %human-seconds{%fetch-age{}}}}"
+   .  "%let{lag}{%if{%and{%fetch-remain{}}{%>={%fetch-lag{}}{%{window}}}}{ lag: %human-seconds{%fetch-lag{}}}}"
+   .  "       > fetch: %{amount}%{age}%{lag} rate: %{rate}/s remaining: %{remain}\n",
 
    "fetch-line-1and1"
    => "%let{amount}{%human-numbers{}{}{}{%fetch-rest{}}}"
@@ -3605,7 +3607,8 @@ my %complex_macros =
    => "%let{amount}{%human-numbers{}{}{}{%replay-rest{}}}"
    .  "%let{rate}{%human-numbers{}{}{}{%replay-rate{}}}"
    .  "%let{remain}{%human-seconds{%replay-remain{}}}"
-   .  "       > replay: %{amount} rate: %{rate}/sec  remaining: %{remain} hrs\n",
+   .  "%let{age}{%if{%and{%replay-remain{}}{%>={%replay-age{}}{%{window}}}}{ age: %human-seconds{%replay-age{}}}}"
+   .  "       > replay: %{amount}%{age} rate: %{rate}/s remaining: %{remain}\n",
 
    "replay-line-1and1"
    => "%let{amount}{%human-numbers{}{}{}{%replay-rest{}}}"