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

DeviceList code optimization

Browse Source
This commit is contained in:
bergware
2017-10-29 23:59:02 +01:00
parent ecdd873c54
commit 4df7bac94f
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
plugins/dynamix/include/DeviceList.php
View File

@@ -27,7 +27,7 @@ require_once "$docroot/webGui/include/CustomMerge.php";
function in_parity_log($log,$timestamp) {
if (file_exists($log)) {
$handle = fopen($log, 'r');
while (($line = fgets($handle)) !== false) {
while (($line = fgets($handle))!==false) {
if (strpos($line,$timestamp)!==false) break;
}
fclose($handle);
@@ -35,7 +35,7 @@ function in_parity_log($log,$timestamp) {
return !empty($line);
}
function device_info(&$disk,$online) {
global $path, $var, $show;
global $path, $var, $crypto;
$name = $disk['name'];
$fancyname = $disk['type']=='New' ? $name : my_disk($name);
$type = $disk['type']=='Flash' || $disk['type']=='New' ? $disk['type'] : 'Device';
@@ -58,7 +58,7 @@ function device_info(&$disk,$online) {
}
$status = "$ctrl<a class='info nohand' onclick='return false'><img src='/webGui/images/{$disk['color']}.png' class='icon'><span>$help</span></a>";
$link = (strcmp($disk['status'], 'DISK_NP')!=0 || $disk['name']=="cache") ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".$fancyname."</a>" : $fancyname;
if ($show && $online) switch ($disk['luksState']) {
if ($crypto && $online) switch ($disk['luksState']) {
case 0: $luks = "<i class='nolock fa fa-lock'></i>"; break;
case 1: $luks = "<a class='info' onclick='return false'><i class='padlock fa fa-unlock-alt green-text'></i><span>Encrypted and unlocked</span></a>"; break;
case 2: $luks = "<a class='info' onclick='return false'><i class='padlock fa fa-lock red-text'></i><span>Locked: missing encryption key</span></a>"; break;
@@ -90,7 +90,7 @@ function assignment(&$disk) {
$out .= "<option value=''>$empty</option>";
} else
$out .= "<option value='' selected>$empty</option>";
if ($disk['type']=="Cache")
if ($disk['type']=='Cache')
foreach ($devs as $dev) {$out .= "<option value=\"{$dev['id']}\">".device_desc($dev)."</option>";}
else
foreach ($devs as $dev) if ($dev['tag']==0) {$out .= "<option value=\"{$dev['id']}\">".device_desc($dev)."</option>";}
@@ -123,22 +123,26 @@ function fs_info(&$disk) {
function my_diskio($data) {
return my_scale($data,$unit,1)." $unit/s";
}
function parity_only($disk) {
return $disk['type']=='Parity';
}
function data_only($disk) {
return $disk['type']=='Data';
}
function cache_only($disk) {
return $disk['type']=='Cache';
}
function array_offline(&$disk) {
global $var, $disks;
if (strpos($var['mdState'],"ERROR:")===false) {
$w = '<span class="red-text"><em>All existing data on this device will be OVERWRITTEN when array is Started</em></span>';
if ($disk['type']=="Cache") {
if (!empty($disks['cache']['uuid']) && $disk['status']=="DISK_NEW") $warning = $w;
}
else {
if ($var['mdState']=="NEW_ARRAY") {
if ($disk['type']=="Parity") $warning = $w;
}
else {
if ($disk['status']=="DISK_INVALID" ||
$disk['status']=="DISK_DSBL_NEW" ||
$disk['status']=="DISK_WRONG" ||
$disk['status']=="DISK_NEW") $warning = $w;
if (strpos($var['mdState'],'ERROR:')===false) {
$text = '<span class="red-text"><em>All existing data on this device will be OVERWRITTEN when array is Started</em></span>';
if ($disk['type']=='Cache') {
if (!empty($disks['cache']['uuid']) && $disk['status']=='DISK_NEW') $warning = $text;
} else {
if ($var['mdState']=='NEW_ARRAY') {
if ($disk['type']=='Parity') $warning = $text;
} else {
if (in_array($disk['status'],['DISK_INVALID','DISK_DSBL_NEW','DISK_WRONG','DISK_NEW'])) $warning = $text;
}
}
}
@@ -302,24 +306,26 @@ function cache_slots() {
$out .= "</select></form>";
return $out;
}
$show = false;
$crypto = false;
switch ($_POST['device']) {
case 'array':
foreach ($disks as $disk) if ($disk['type']=='Data') $show |= strpos($disk['fsType'],'luks:')!==false;
$parity = array_filter($disks,'parity_only');
$data = array_filter($disks,'data_only');
foreach ($data as $disk) $crypto |= strpos($disk['fsType'],'luks:')!==false;
if ($var['fsState']=='Stopped') {
foreach ($disks as $disk) {if ($disk['type']=='Parity') array_offline($disk);}
foreach ($parity as $disk) array_offline($disk);
echo "<tr class='tr_last'><td style='height:12px' colspan='11'></td></tr>";
foreach ($disks as $disk) {if ($disk['type']=='Data') array_offline($disk);}
foreach ($data as $disk) array_offline($disk);
echo "<tr class='tr_last'><td><img src='/webGui/images/sum.png' class='icon'>Slots:</td><td colspan='9'>".array_slots()."</td><td></td></tr>";
} else {
foreach ($disks as $disk) {if ($disk['type']=='Parity' && $disk['status']!='DISK_NP_DSBL') array_online($disk);}
foreach ($disks as $disk) {if ($disk['type']=='Data') array_online($disk);}
foreach ($parity as $disk) if ($disk['status']!='DISK_NP_DSBL') array_online($disk);
foreach ($data as $disk) array_online($disk);
if ($display['total']) show_totals('Array of '.my_word($var['mdNumDisks']).' devices');
}
break;
case 'flash':
$disk = &$disks['flash'];
$data = $diskio ? explode(' ',$diskio[$disk['device']]) : [];
$data = explode(' ',$diskio[$disk['device']] ?? '');
$disk['fsUsed'] = $disk['fsSize']-$disk['fsFree'];
echo "<tr>";
echo "<td>".device_info($disk,true)."</td>";
@@ -332,19 +338,20 @@ case 'flash':
echo "</tr>";
break;
case 'cache':
foreach ($disks as $disk) if ($disk['type']=='Cache') $show |= strpos($disk['fsType'],'luks:')!==false;
$cache = array_filter($disks,'cache_only');
foreach ($cache as $disk) $crypto |= strpos($disk['fsType'],'luks:')!==false;
if ($var['fsState']=='Stopped') {
foreach ($disks as $disk) {if ($disk['type']=='Cache') array_offline($disk);}
foreach ($cache as $disk) array_offline($disk);
echo "<tr class='tr_last'><td><img src='/webGui/images/sum.png' class='icon'>Slots:</td><td colspan='9'>".cache_slots()."</td><td></td></tr>";
} else {
foreach ($disks as $disk) {if ($disk['type']=='Cache') array_online($disk);}
foreach ($cache as $disk) array_online($disk);
if ($display['total'] && $var['cacheSbNumDisks']>1) show_totals('Pool of '.my_word($var['cacheNumDevices']).' devices');
}
break;
case 'open':
foreach ($devs as $disk) {
$dev = $disk['device'];
$data = $diskio ? explode(' ',$diskio[$dev]) : [];
$data = explode(' ',$diskio[$dev] ?? '');
$disk['name'] = $dev;
$disk['type'] = 'New';
$disk['color'] = read_disk($dev,'color');