mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 02:31:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow user sorting preference for containers and VMs

Browse Source 
Sorting preference also dictates the sequence in which containers and
VMs are started and stopped (reversed)
This commit is contained in:
bergware
2018-03-17 13:53:05 +01:00
parent f9a1d237cc
commit a3fe701dfe
11 changed files with 136 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/include/DashboardApps.php
+18 -10
View File
@@ -20,14 +20,22 @@ require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
$display = $_POST['display'];
if (pgrep('dockerd')!==false && ($display=='icons' || $display=='docker')) {
$DockerClient = new DockerClient();
$user_prefs = $dockerManPaths['user-prefs'];
$DockerClient = new DockerClient();
$DockerTemplates = new DockerTemplates();
$containers = $DockerClient->getDockerContainers() ?: [];
$Allinfo = $DockerTemplates->getAllInfo();
$all_containers = $DockerClient->getDockerContainers();
$all_info = $DockerTemplates->getAllInfo();
$menu = [];
foreach ($containers as $ct) {
if (file_exists($user_prefs)) {
$prefs = parse_ini_file($user_prefs); $sort = [];
foreach ($all_containers as $ct) $sort[] = array_search($ct['Name'],$prefs) ?? 999;
array_multisort($sort,SORT_NUMERIC,$all_containers);
}
foreach ($all_containers as $ct) {
$name = $ct['Name'];
$info = &$Allinfo[$name];
$info = &$all_info[$name];
$id = $ct['Id'];
$imageID = $ct['ImageId'];
$is_autostart = $info['autostart'] ? 'true':'false';
@@ -50,14 +58,14 @@ if (pgrep('dockerd')!==false && ($display=='icons' || $display=='docker')) {
}
if (pgrep('libvirtd')!==false && ($display=='icons' || $display=='vms')) {
$txt = '/boot/config/plugins/dynamix.vm.manager/userprefs.txt';
$user_prefs = '/boot/config/plugins/dynamix.vm.manager/userprefs.cfg';
$vms = $lv->get_domains();
if (file_exists($txt)) {
$prefs = parse_ini_file($txt); $sort = [];
foreach ($vms as $vm) $sort[] = $prefs[$vm] ?? 999;
if (file_exists($user_prefs)) {
$prefs = parse_ini_file($user_prefs); $sort = [];
foreach ($vms as $vm) $sort[] = array_search($vm,$prefs) ?? 999;
array_multisort($sort,SORT_NUMERIC,$vms);
} else {
natsort($vms);
natcasesort($vms);
}
foreach ($vms as $vm) {
$res = $lv->get_domain_by_name($vm);