From 2db8c045c43a392c6e61cddd1b3820ef61ba5d7f Mon Sep 17 00:00:00 2001 From: bergware Date: Wed, 9 Feb 2022 05:52:12 +0100 Subject: [PATCH] Parity operation enhancements --- plugins/dynamix/nchan/update_2 | 39 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/plugins/dynamix/nchan/update_2 b/plugins/dynamix/nchan/update_2 index c7a0e6a87..aed4d8cb2 100755 --- a/plugins/dynamix/nchan/update_2 +++ b/plugins/dynamix/nchan/update_2 @@ -347,38 +347,45 @@ while (true) { $frmt = $display['date'].($display['date']!='%c' ? ", {$display['time']}" : ""); $idle = $var['mdResync']==0; if ($var['sbSyncExit']!=0) { - $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)).'
'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); - $echo[4] .= " "._('Error code').": ".my_error($var['sbSyncExit']); + $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); + $echo[4].= "
"._('Error code').": ".my_error($var['sbSyncExit']); } elseif ($var['sbSynced']==0) { [$date,$duration,$speed,$status,$error,$action] = last_parity_log(); if (!$date) { $echo[4] = _('Parity has not been checked yet'); } elseif ($status==0) { - $echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0)).'
'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); - $echo[4] .= " "._('Duration').": ".my_check($duration,$speed); + $echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); + $echo[4].= "
"._('Duration').": ".my_check($duration,$speed); } else { - $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0)).'
'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); - $echo[4] .= " "._('Error code').": ".my_error($status); + $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); + $echo[4].= "
"._('Error code').": ".my_error($status); } } elseif ($var['sbSynced2']==0) { if ($idle) { [$date,$duration,$speed,$status,$error,$action] = my_explode('|', read_parity_log($var['sbSynced'],!$idle),6); if ($status==0) { - $echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)).'
'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); - $echo[4] .= " "._('Duration').": ".my_check($duration,$speed); + $echo[4] = sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); + $echo[4].= "
"._('Duration').": ".my_check($duration,$speed); } else { - $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)).'
'.sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); - $echo[4] .= " "._('Error code').": ".my_error($status); + $echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0'); + $echo[4].= "
"._('Error code').": ".my_error($status); } } else { - $echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0)).'
'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); - $echo[4] .= "
"._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2); - $echo[4] .= "
"._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2); + $echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); + $echo[4].= "
"._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2); + $echo[4].= "
"._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2); } } else { [$date,$duration,$speed,$status,$error,$action] = last_parity_log(); - $echo[4] = sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)).'
'.sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); - $echo[4] .= " "._('Duration').': '.my_check($duration,$speed); + $echo[4] = sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0)); + $echo[4].= "
".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0'); + $echo[4].= "
"._('Duration').': '.my_check($duration,$speed); } if ($idle) { [$m,$h] = explode(' ', $parity['hour']); @@ -448,7 +455,7 @@ while (true) { $echo[4] .= sprintf(_('Next check scheduled on **%s**'),_(strftime($frmt,$time+$t),0)); $echo[4] .= "
"._('Due in').": "._(my_clock(floor($t/60)),2); } else { - $echo[4] .= " "._('Scheduled parity check is disabled'); + $echo[4] .= " "._('Scheduled parity check is disabled'); } } else { $echo[4] .= "\0";