mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-09 04:21:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update device_list

Browse Source
This commit is contained in:
SimonFair
2024-10-17 13:18:13 +01:00
parent 95c6913c62
commit 60c5dd2902
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
emhttp/plugins/dynamix/nchan/device_list
View File

@@ -119,7 +119,7 @@ function assignment(&$disk) {
function vfs_luks($fs) {
return str_starts_with($fs,'luks:');
}
function vfs_type(&$disk) {
function vfs_type(&$disk,$online = false) {
global $disks, $pools, $crypto;
$fsType = _var($disk,'fsType','');
$luks = '';
@@ -148,13 +148,13 @@ function vfs_type(&$disk) {
}
return $luks.str_replace('luks:','',$fsType);
}
function fs_info(&$disk) {
function fs_info(&$disk,$online = false) {
global $display;
$echo = [];
if (empty(_var($disk,'fsStatus','')))
return "<td colspan='4'></td>";
if (_var($disk,'fsStatus')=='Mounted') {
$echo[] = "<td>".vfs_type($disk)."</td>";
$echo[] = "<td>".vfs_type($disk,$online)."</td>";
$echo[] = "<td>".my_scale(_var($disk,'fsSize',0)*1024,$unit,-1)." $unit</td>";
if ($display['text']%10==0) {
$echo[] = "<td>".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit</td>";
@@ -169,7 +169,7 @@ function fs_info(&$disk) {
$echo[] = "<td><div class='usage-disk'><span style='width:$free%' class='".usage_color($disk,$free,true)."'></span><span>".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit</span></div></td>";
}
} else {
$echo[] = "<td>".vfs_type($disk)."</td><td colspan='3'>"._(_var($disk,'fsStatus'))."</td>";
$echo[] = "<td>".vfs_type($disk,$online)."</td><td colspan='3'>"._(_var($disk,'fsStatus'))."</td>";
}
return implode($echo);
}
@@ -211,14 +211,14 @@ function array_offline(&$disk, $pool='') {
$echo[] = "<td>".device_info($disk,false)."<br><span class='diskinfo'><em>"._('Missing')."</em></span></td>";
$echo[] = "<td>".assignment($disk)."<em>{$disk['idSb']} - ".my_scale(_var($disk,'sizeSb',0)*1024,$unit)." $unit</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td>".vfs_type($disk)."</td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
break;
case 'DISK_NP_DSBL':
$echo[] = "<td>".device_info($disk,false)."</td>";
$echo[] = "<td>".assignment($disk)."</td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td>".vfs_type($disk)."</td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
break;
case 'DISK_OK':
@@ -233,7 +233,7 @@ function array_offline(&$disk, $pool='') {
$echo[] = "<td colspan='7'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td>".vfs_type($disk)."</td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
}
break;
@@ -245,7 +245,7 @@ function array_offline(&$disk, $pool='') {
$echo[] = "<td colspan='7'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td>".vfs_type($disk)."</td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
}
break;
@@ -268,7 +268,7 @@ function array_online(&$disk, $fstype='') {
$sum['count']++;
$sum['temp'] += $disk['temp'];
}
$sum['power'] += intval(_var($disk,'power',0));
$sum['power'] += floatval(_var($disk,'power',0));
$sum['numReads'] += _var($disk,'numReads',0);
$sum['numWrites'] += _var($disk,'numWrites',0);
$sum['numErrors'] += _var($disk,'numErrors',0);
@@ -284,14 +284,14 @@ function array_online(&$disk, $fstype='') {
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td><a class='static'><i class='icon-disk icon'></i><span></span></a><em>".($fstype=='zfs' ? _('Not present') : _('Not installed'))."</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = fs_info($disk);
$echo[] = fs_info($disk,true);
}
break;
case 'DISK_NP_DSBL':
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td><a class='static'><i class='icon-disk icon'></i><span></span></a><em>"._('Not installed')."</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = fs_info($disk);
$echo[] = fs_info($disk,true);
break;
case 'DISK_DSBL':
default:
@@ -301,7 +301,7 @@ function array_online(&$disk, $fstype='') {
$echo[] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($disk,'numReads',0))."</span></td>";
$echo[] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($disk,'numWrites',0))."</span></td>";
$echo[] = "<td>".my_number(_var($disk,'numErrors',0))."</td>";
$echo[] = fs_info($disk);
$echo[] = fs_info($disk,true);
break;
}
$echo[] = "</tr>";
@@ -479,7 +479,7 @@ while (true) {
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($Flash,'numReads',0))."</span></td>";
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($Flash,'numWrites',0))."</span></td>";
$echo[$a][] = "<td>".my_number(_var($Flash,'numErrors',0))."</td>";
$echo[$a][] = fs_info($Flash);
$echo[$a][] = fs_info($Flash,true);
$echo[$a][] = "</tr>";
$echo[$a] = implode($echo[$a]);