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

Multi cache pool support

Browse Source
This commit is contained in:
bergware
2020-04-11 08:23:45 +02:00
parent 1c366d1acc
commit 965c846c79
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,9 +30,6 @@ extract(parse_plugin_cfg('dynamix',true));
function model($id) {
return substr($id,0,strrpos($id,'_'));
}
function truncate($name) {
return strlen($name)<=15 ? $name : substr($name,0,6).'...'.substr($name,-6);
}
// sort unassigned devices on disk identification
if (count($devs)>1) array_multisort(array_column($devs,'sectors'),SORT_DESC,array_map('model',array_column($devs,'id')),SORT_NATURAL|SORT_FLAG_CASE,array_column($devs,'device'),$devs);
@@ -75,7 +72,7 @@ function device_info(&$disk,$online) {
($disk['type']=='Data' && $disk['status']!='DISK_NP') ||
($disk['type']=='Cache' && $disk['status']!='DISK_NP') ||
($disk['name']=='flash') || in_array($disk['name'],$pools) ||
$disk['type']=='New' ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".truncate($fancyname)."</a>" : truncate($fancyname);
$disk['type']=='New' ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".truncate($fancyname,15)."</a>" : truncate($fancyname,15);
if ($crypto) switch ($disk['luksState']) {
case 0:
if (!vfs_luks($disk['fsType']))

3
plugins/dynamix/include/DiskList.php
View File

@@ -52,9 +52,6 @@ function sharesOnly($disk) {
return strpos('Data,Cache',$disk['type'])!==false && $disk['exportable']=='yes';
}
function truncate($name) {
return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6);
}
// filter disk shares
$disks = array_filter($disks,'sharesOnly');

4
plugins/dynamix/include/Helpers.php
View File

@@ -188,6 +188,10 @@ function day_count($time) {
function plus($val, $word, $last) {
return $val>0 ? (($val || $last) ? ($val.' '.$word.($val!=1?'s':'').($last ?'':', ')) : '') : '';
}
function truncate($name,$size=20) {
return strlen($name)<=$size ? $name : substr($name,0,$size-9).'...'.substr($name,-6);
}
function read_parity_log($epoch, $busy=false) {
$log = '/boot/config/parity-checks.log';
if (file_exists($log)) {

3
plugins/dynamix/include/ShareList.php
View File

@@ -57,9 +57,6 @@ function shareInclude($name) {
return !$include || substr($name,0,4)!='disk' || strpos("$include,", "$name,")!==false;
}
function truncate($name) {
return strlen($name)<=20 ? $name : substr($name,0,11).'...'.substr($name,-6);
}
// Compute all user shares & check encryption
$crypto = false;
foreach ($shares as $name => $share) {