mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-14 05:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Parity operation enhancements

Browse Source
This commit is contained in:
bergware
2022-02-09 11:55:42 +01:00
parent a77a06b1a1
commit ba229cc477
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/dynamix/ArrayOperation.page
View File

@@ -369,35 +369,35 @@ function formatWarning(val) {
<tr><td></td><td><input type="button" value="_(History)_" onclick="parityHistory()"></td>
<? if ($var['sbSyncExit']!=0):?>
<td class="wrap"><?=sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0))?><?if ($var['sbSynced2']):?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?><?endif;?>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($var['sbSyncExit'])?></td></tr>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($var['sbSyncExit'])?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?><?endif;?></td></tr>
<? elseif ($var['sbSynced']==0):
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();?>
<? if ($status==0):?>
<td class="wrap"><?=sprintf(_('Last checked on **%s**'),_(my_time($date).day_count($date),0))?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?></td></tr>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?></td></tr>
<? else:?>
<td class="wrap"><?=sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0))?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($status)?></td></tr>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($status)?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?></td></tr>
<? endif;
elseif ($var['sbSynced2']==0):
[$date,$duration,$speed,$status,$error,$action] = my_explode('|', read_parity_log($var['sbSynced']),6);
if ($status==0):?>
<td class="wrap"><?=sprintf(_('Last checked on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0))?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?></td></tr>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?></td></tr>
<? else:?>
<td class="wrap"><?=sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0))?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($status)?></td></tr>
<br><i class="fa fa-fw fa-dot-circle-o"></i> _(Error code)_: <?=my_error($status)?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0')?></td></tr>
<? endif;
else:
[$date,$duration,$speed,$status,$error,$action] = last_parity_log();?>
<td class="wrap"><?=sprintf(_('Last check completed on **%s**'),_(my_time($var['sbSynced2']).day_count($var['sbSynced2']),0))?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?></td></tr>
<br><i class="fa fa-fw fa-clock-o"></i> _(Duration)_: <?=my_check($duration,$speed)?>
<br><i class="fa fa-fw fa-search"></i> <?=sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0')?></td></tr>
<? endif;
endif;
else:

14
plugins/dynamix/nchan/update_2
View File

@@ -354,44 +354,44 @@ while (true) {
$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));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($var['sbSyncExit']);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
} 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));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($date).day_count($date),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
}
} 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));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').": ".my_check($duration,$speed);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
} else {
$echo[4] = sprintf(_('Last check incomplete on **%s**'),_(my_time($var['sbSynced']).day_count($var['sbSynced']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-dot-circle-o'></i> "._('Error code').": ".my_error($status);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
}
} else {
$echo[4] = sprintf(_('Current operation %s on **%s**'),($var['mdResync']?_('started'):_('paused')),_(my_time($var['sbUpdated']).day_count($var['sbSynced']),0));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Elapsed time').": "._(my_clock(floor((time()-$var['sbUpdated'])/60)),2);
$echo[4].= "<br><i class='fa fa-fw fa-flag-checkered'></i> "._('Estimated finish').': '._(my_clock(round(((($var['mdResyncDt']*(($var['mdResync']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)),2);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
}
} 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));
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
$echo[4].= "<br><i class='fa fa-fw fa-clock-o'></i> "._('Duration').': '.my_check($duration,$speed);
$echo[4].= "<br><i class='fa fa-fw fa-search'></i> ".sprintf(_('Finding **%s** error'.($var['sbSyncErrs']==1?'':'s')),$var['sbSyncErrs']?:'0');
}
if ($idle) {
[$m,$h] = explode(' ', $parity['hour']);