Multi cache pool support

This commit is contained in:
bergware
2020-04-12 04:04:17 +02:00
parent 676edec3c8
commit ca7a96e031
2 changed files with 26 additions and 29 deletions

View File

@@ -21,7 +21,7 @@ Markdown="false"
<script>
$(function(){
timers.browse = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
$.get('/webGui/include/Browse.php',{dir:"<?=addslashes(urlencode($dir))?>",path:"<?=$path?>",user:<?=substr($dir,0,10)=='/mnt/user/'?1:0?>},function(data){
$.get('/webGui/include/Browse.php',{dir:"<?=addslashes(urlencode($dir))?>",path:"<?=$path?>",user:<?=substr($dir,0,9)=='/mnt/user'?1:0?>},function(data){
clearTimeout(timers.browse);
var table = $('table.indexer');
var col = $.cookie('col')||1;

View File

@@ -26,45 +26,44 @@ function parent_link() {
function trim_slash($url){
return preg_replace('/\/\/+/','/',$url);
}
function my_name($devs) {
$names = [];
foreach (array_map('my_disk',$devs) as $fancy) $names[] = my_lang($fancy,3);
return implode(', ',$names);
}
function luks($devs) {
function my_devs(&$devs) {
global $disks;
$text = [];
$text = []; $i = 0;
foreach ($devs as $dev) {
switch ($disks[$dev]['luksState']) {
case 0: $text[] = "<a class='info' onclick='return false'><i class='lock fa fa-unlock grey-text'></i><span>"._('Not encrypted')."</span></a>"; break;
case 1: $text[] = "<a class='info' onclick='return false'><i class='lock fa fa-unlock-alt green-text'></i><span>"._('Encrypted and unlocked')."</span></a>"; break;
case 2: $text[] = "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: missing encryption key')."</span></a>"; break;
case 3: $text[] = "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: wrong encryption key')."</span></a>"; break;
default: $text[] = "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: unknown error')."</span></a>"; break;}
$text[$i] = my_lang(my_disk($dev),3);
if (substr($disks[$dev]['fsType'],0,5)=='luks:') {
switch ($disks[$dev]['luksState']) {
case 0: $text[$i] .= "<a class='info' onclick='return false'><i class='lock fa fa-unlock grey-text'></i><span>"._('Not encrypted')."</span></a>"; break;
case 1: $text[$i] .= "<a class='info' onclick='return false'><i class='lock fa fa-unlock-alt green-text'></i><span>"._('Encrypted and unlocked')."</span></a>"; break;
case 2: $text[$i] .= "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: missing encryption key')."</span></a>"; break;
case 3: $text[$i] .= "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: wrong encryption key')."</span></a>"; break;
default: $text[$i] .= "<a class='info' onclick='return false'><i class='lock fa fa-lock red-text'></i><span>"._('Locked: unknown error')."</span></a>"; break;}
}
$i++;
}
return implode('',$text);
return implode(', ',$text);
}
extract(parse_plugin_cfg('dynamix',true));
$disks = parse_ini_file('state/disks.ini',true);
$dir = urldecode($_GET['dir']);
$path = $_GET['path'];
$user = $_GET['user'];
$list = [];
$all = $docroot.preg_replace('/([\'" &()[\]\\\\])/','\\\\$1',$dir).'/*';
$fix = substr($dir,0,4)=='/mnt' ? explode('/',trim_slash($dir))[2] : 'flash';
$fmt = "%F {$display['time']}";
$dirs = $files = [];
$total = $i = 0;
exec("shopt -s dotglob; stat -L -c'%F|%n|%s|%Y' $all 2>/dev/null",$objs);
if ($user) {
exec("shopt -s dotglob; stat -L -c'%F|%n|%s|%Y' $all 2>/dev/null",$rows);
if ($user && count($rows)) {
$tag = implode('|',array_merge(['disk'],pools_filter($disks)));
$set = explode(';',str_replace(',;',',',preg_replace("/($tag)/",';$1',exec("shopt -s dotglob; getfattr --no-dereference --absolute-names --only-values -n system.LOCATIONS $all 2>/dev/null"))));
}
foreach ($objs as $row) {
foreach ($rows as $row) {
if ($user) $row .= '|'.$set[++$i];
if (substr($row,0,9)=='directory') $dirs[] = $row; else $files[] = $row;
}
unset($rows,$set);
echo "<thead><tr><th>"._('Type')."</th><th class='sorter-text'>"._('Name')."</th><th>"._('Size')."</th><th>"._('Last Modified')."</th><th>"._('Location')."</th></tr></thead>";
if ($link = parent_link()) echo "<tbody class='tablesorter-infoOnly'><tr><td><div><img src='/webGui/icons/folderup.png'></div></td><td>$link</td><td colspan='3'></td></tr></tbody>";
@@ -73,14 +72,13 @@ foreach ($dirs as $row) {
[$type,$name,$size,$time,$set] = explode('|',$row);
$file = pathinfo($name);
$devs = explode(',',$set?:$fix);
$luks = ''; foreach ($devs as $dev) if (substr($disks[$dev]['fsType'],0,5)=='luks:') {$luks = luks($devs); break;}
$mark = my_name($devs).$luks;
$text = my_devs($devs);
echo "<tr>";
echo "<td data=''><div class='icon-dir'></div></td>";
echo "<td><a href=\"/$path?dir=".htmlspecialchars(urlencode_path(trim_slash($dir.'/'.$file['basename'])))."\">".htmlspecialchars($file['basename'])."</a></td>";
echo "<td data='0'>&lt;FOLDER&gt;</td>";
echo "<td data='$time'>".my_time($time,$fmt)."</td>";
echo "<td class='loc'>$mark</td>";
echo "<td class='loc'>$text</td>";
echo "</tr>";
}
if (count($dirs)) echo "</tbody><tbody>";
@@ -88,26 +86,25 @@ foreach ($files as $row) {
[$type,$name,$size,$time,$set] = explode('|',$row);
$file = pathinfo($name);
$devs = explode(',',$set?:$fix);
$luks = ''; foreach ($devs as $dev) if (substr($disks[$dev]['fsType'],0,5)=='luks:') {$luks = luks($devs); break;}
$mark = my_name($devs).$luks;
$tag = strpos($mark,',')===false ? '' : 'warning';
$text = my_devs($devs);
$tag = strpos($text,',')===false ? '' : 'warning';
echo "<tr>";
echo "<td data='{$row['fext']}'><div class='icon-file icon-{$row['fext']}'></div></td>";
echo "<td><a href=\"".htmlspecialchars(trim_slash($dir.'/'.$file['basename']))."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($file['basename'])."</a></td>";
echo "<td data='$size' class='$tag'>".my_scale($size,$unit)." $unit</td>";
echo "<td data='$time' class='$tag'>".my_time($time,$fmt)."</td>";
echo "<td class='loc $tag'>$mark</td>";
echo "<td class='loc $tag'>$text</td>";
echo "</tr>";
$total += $size;
}
echo "</tbody>";
$objs = count($objs);
$dirs = count($dirs);
$files = count($files);
$objs = $dirs + $files;
if ($objs==0 && !exec("find \"$dir\" -maxdepth 0 -empty -exec echo 1 \;")) {
echo "<tfoot><tr><td></td><td colspan='4'>"._('No listing: Too many files')."</td></tr></tfoot>";
} else {
$dirs = count($dirs);
$files = count($files);
$total = ' ('.my_scale($total,$unit).' '.$unit.' '._('total').')';
echo "<tfoot><tr><td></td><td colspan='4'>$objs "._('object'.($objs==1?'':'s')).": $dirs "._('director'.($dirs==1?'y':'ies')).", $files "._('file'.($files==1?'':'s'))."$total</td></tr></tfoot>";
}