Enhance stack management, sortable functionality, and YAML support

.vscode/settings.json

@@ -7,10 +7,21 @@
         "files.eol": "\n"
     },
 
-    // PHPUnit Test Explorer settings
-    "phpunit.php": "php",
-    "phpunit.phpunit": "vendor/bin/phpunit",
-    "phpunit.args": ["--testdox"],
+    // Plugin Tests extension settings
+    // Restrict test discovery to this folder in multi-root workspaces.
+    "pluginTests.workspaceFolders": ["compose_plugin"],
+
+    // PHPUnit settings
+    "pluginTests.phpunit.enabled": true,
+    "pluginTests.phpunit.pattern": "tests/**/*Test.php",
+    "pluginTests.phpunit.exclude": "**/vendor/**,**/node_modules/**,tests/framework/**",
+    "pluginTests.phpunit.executable": "vendor/bin/phpunit",
+
+    // BATS settings
+    "pluginTests.bats.enabled": true,
+    "pluginTests.bats.pattern": "tests/**/*.bats",
+    "pluginTests.bats.exclude": "**/vendor/**,**/node_modules/**,tests/framework/**",
+    "pluginTests.bats.useDocker": false,
 
     // PHP settings
     "php.validate.enable": true,
@@ -28,7 +39,6 @@
         "*.cfg": "ini"
     },
 
-    // BATS - use framework's Docker wrapper for cross-platform consistency
-    "bats-test-runner.testPattern": "**/*.bats",
-    "bats-test-runner.batsExecutable": "${workspaceFolder}/tests/framework/bin/run-bats.cmd"
+    // Optional test timeout (ms)
+    "pluginTests.timeout": 30000
 }

build.ps1

@@ -18,7 +18,7 @@
     Skip running tests before building. Not recommended.
 
 .PARAMETER ComposeVersion
-    Docker Compose version to include. Default: 5.0.2
+    Docker Compose version to include. Default: 5.1.2
 
 .EXAMPLE
     ./build.ps1
@@ -58,7 +58,7 @@ if (Test-Path $versionsFile) {
         if ($_ -match '^COMPOSE_VERSION=(.+)$' -and -not $ComposeVersion) { $ComposeVersion = $Matches[1].Trim() }
     }
 }
-if (-not $ComposeVersion) { $ComposeVersion = "5.0.2" }
+if (-not $ComposeVersion) { $ComposeVersion = "5.1.2" }
 
 # Generate dev version with timestamp if -Dev flag is used
 if ($Dev) {

build.sh

@@ -42,7 +42,7 @@ if [[ -z "$COMPOSE_VERSION" && -f "$VERSIONS_FILE" ]]; then
         fi
     done < "$VERSIONS_FILE"
 fi
-: "${COMPOSE_VERSION:=5.0.2}"
+: "${COMPOSE_VERSION:=5.1.2}"
 
 # Generate dev version with timestamp if requested
 if [[ "$DEV" = true ]]; then
@@ -89,8 +89,9 @@ s|^\s*<!ENTITY[[:space:]]+pkgBUILD[[:space:]]+"[^"]*"|<!ENTITY pkgBUILD "$BUILD_
 s|^\s*<!ENTITY[[:space:]]+packageName[[:space:]]+"[^"]*"|<!ENTITY packageName "$PACKAGE_BASENAME"|
 s|^\s*<!ENTITY[[:space:]]+packagefile[[:space:]]+"[^"]*"|<!ENTITY packagefile "$PACKAGE_NAME"|
 s|^\s*<!ENTITY[[:space:]]+packageURL[[:space:]]+"[^"]*"|<!ENTITY packageURL "file:///tmp/$PACKAGE_NAME"|
-s|^\s*<FILE[[:space:]]+Name=['"]?[^'">]+['"]?.*|<FILE Name='/tmp/$PACKAGE_NAME' Run='upgradepkg --install-new'>|
-s|^\s*<URL>.*</URL>|<URL>file:///tmp/$PACKAGE_NAME</URL>|
+# Only rewrite the package-install FILE block (the one with upgradepkg), not Ace or other FILE blocks
+s|^\s*<FILE[[:space:]]+Name=['"]?[^'">]+['"]?[[:space:]]+Run=['"]upgradepkg[^'"]*['"]>|<FILE Name='/tmp/$PACKAGE_NAME' Run='upgradepkg --install-new'>|
+/upgradepkg/,/<\/FILE>/{ s|^\s*<URL>.*</URL>|<URL>file:///tmp/$PACKAGE_NAME</URL>| }
 SEDEOF
 sed -E -f "$SED_SCRIPT" "$PLG_FILE" > "$TEMP_PLG"
 rm -f "$SED_SCRIPT"
@@ -298,7 +299,7 @@ if [[ -f "$PACKAGE_PATH" ]]; then
     SED_MD5=$(mktemp)
     cat > "$SED_MD5" << SEDEOF
 s|^\s*<!ENTITY[[:space:]]+packageMD5[[:space:]]+"[^"]*"|<!ENTITY packageMD5 "$MD5"|
-s|^\s*<MD5>.*</MD5>|<MD5>$MD5</MD5>|
+/upgradepkg/,/<\/FILE>/{ s|^\s*<MD5>.*</MD5>|<MD5>$MD5</MD5>| }
 SEDEOF
     sed -i -E -f "$SED_MD5" "$TEMP_PLG"
     rm -f "$SED_MD5"

build_in_docker.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC1091
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 [ -f "${SCRIPT_DIR}/versions.env" ] && source "${SCRIPT_DIR}/versions.env"
-[ -z "$COMPOSE_VERSION" ] && COMPOSE_VERSION=5.0.2
+[ -z "$COMPOSE_VERSION" ] && COMPOSE_VERSION=5.1.2
 [ -z "$PKG_VERSION" ] && PKG_VERSION="$(date +%Y.%m.%d)"
 [ -z "$PKG_BUILD" ] && PKG_BUILD="$(date +%H%M)"
 docker run --rm --tmpfs /tmp \

compose.manager.plg

@@ -2,20 +2,25 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name "compose.manager">
 <!ENTITY author "mstrhakr">
-<!ENTITY version     "2026.04.10">
+<!ENTITY version     "2026.04.16.0728">
 <!ENTITY launch "Settings/&name;.settings">
 <!ENTITY packageVER "&version;">
-<!ENTITY packageMD5  "ad0053b8361f39c14abc0bf824eb16e4">
-<!ENTITY pkgBUILD    "2116">
+<!ENTITY packageMD5  "488f6075d715293b85da70c87ca6fccf">
+<!ENTITY pkgBUILD    "0728">
 <!ENTITY packageName "&name;-&packageVER;-noarch-&pkgBUILD;">
 <!ENTITY packagefile "&packageName;.txz">
 <!ENTITY github "mstrhakr/compose_plugin">
-<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/&name;.plg">
+<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/dev/&name;.plg">
 <!ENTITY packageURL "https://github.com/&github;/releases/download/v&version;/&packagefile;">
-<!ENTITY pluginLOC "/boot/config/plugins/&name;">
-<!ENTITY emhttpLOC "/usr/local/emhttp/plugins/&name;">
+<!ENTITY pluginsPATH "/boot/config/plugins">
+<!ENTITY pluginLOC "&pluginsPATH;/&name;">
+<!ENTITY emhttpPATH "/usr/local/emhttp/plugins">
+<!ENTITY emhttpLOC "&emhttpPATH;/&name;">
+<!ENTITY pluginsInstalledPATH "/var/log/packages">
 <!ENTITY aceVER    "1.43.5">
 <!ENTITY aceURL    "https://github.com/ajaxorg/ace-builds/archive/refs/tags/v&aceVER;.zip">
+<!ENTITY aceZIP    "ace-v&aceVER;.zip">
+<!ENTITY aceSHA256 "40169719746a5f83dcfb6e73a838221d34b91b75a939569217d62fb7d8175562">
 ]>
 
 <PLUGIN  name="&name;"
@@ -31,20 +36,22 @@
 >
 
 <CHANGES>
-###2026.04.10
-- Bug Fixes (stack): detect existing compose files via getComposeFilePath before creating default; fixes #91
-- [View all changes](https://github.com/mstrhakr/compose_plugin/compare/v2026.04.08...v2026.04.10)
+###2026.04.16.0728
+- Features: add clearIconCache action to remove service icons from cache
+- [PR #93](https://github.com/mstrhakr/compose_plugin/pull/93)
+- [beta release diff](https://github.com/mstrhakr/compose_plugin/compare/v2026.04.10...v2026.04.16.0728)
 </CHANGES>
 
 <!-- The 'pre-install' script. -->
 <FILE Run="/bin/bash">
 <INLINE>
-# Remove old 'source' files
+# Remove all but current package file and ace zip from plugin root
 rm -f $(ls &pluginLOC;/&name;*.txz 2>/dev/null|grep -v '&packageVER;')
+rm -f $(ls &pluginLOC;/ace-v*.zip 2>/dev/null|grep -v '&aceZIP;')
 
 # Clean up legacy package entries (compose.manager-package-*) left by older builds
 # that used non-standard Slackware naming and weren't removed by upgradepkg
-for pkg in /var/log/packages/&name;-package-*; do
+for pkg in &pluginsInstalledPATH;/&name;-package-*; do
     [ -e "$pkg" ] &amp;&amp; removepkg "$(basename "$pkg")" 2>/dev/null || true
 done
 
@@ -53,145 +60,116 @@ mkdir -p &pluginLOC;/projects
 </INLINE>
 </FILE>
 
+<!-- The 'install' script. -->
 <FILE Name="&pluginLOC;/&packagefile;" Run="upgradepkg --install-new">
 <URL>&packageURL;</URL>
 <MD5>&packageMD5;</MD5>
 </FILE>
 
 <FILE Run="/bin/bash">
 <INLINE>
-# Download Ace editor if not already provided by Unraid (Unraid 7.0.0+ includes it via Dynamix)
-ACE_DYNAMIX_PATH="/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js"
-ACE_PLUGIN_DIR="&emhttpLOC;/javascript/ace"
-
-if [ -f "$ACE_DYNAMIX_PATH" ]; then
-    echo "Ace editor found at $ACE_DYNAMIX_PATH (Unraid 7.0.0+), skipping download."
-else
-    echo "Ace editor not found in Dynamix (pre-7.0.0 Unraid), downloading v&aceVER;..."
-    mkdir -p "$ACE_PLUGIN_DIR"
-    TMPDIR_ACE="/tmp/ace-install-$$"
-    mkdir -p "$TMPDIR_ACE"
-    WGET_CERT_OPTS=""
-    if [ ! -f /etc/ssl/certs/ca-certificates.crt ] &amp;&amp; [ ! -d /etc/ssl/certs ]; then
-        echo "WARNING: No system CA bundle found; downloading Ace with TLS verification disabled."
-        WGET_CERT_OPTS="--no-check-certificate"
-    fi
-    if wget $WGET_CERT_OPTS -q -O "$TMPDIR_ACE/ace.zip" "&aceURL;"; then
-        if unzip -q "$TMPDIR_ACE/ace.zip" \
-            "ace-builds-&aceVER;/src-min-noconflict/ace.js" \
-            "ace-builds-&aceVER;/src-min-noconflict/mode-yaml.js" \
-            "ace-builds-&aceVER;/src-min-noconflict/mode-sh.js" \
-            "ace-builds-&aceVER;/src-min-noconflict/theme-tomorrow.js" \
-            "ace-builds-&aceVER;/src-min-noconflict/theme-tomorrow_night.js" \
-            -d "$TMPDIR_ACE/extracted"; then
-            if cp "$TMPDIR_ACE/extracted/ace-builds-&aceVER;/src-min-noconflict/"*.js "$ACE_PLUGIN_DIR/"; then
-                if [ -f "$ACE_PLUGIN_DIR/ace.js" ]; then
-                    echo "Ace editor v&aceVER; installed to $ACE_PLUGIN_DIR"
-                else
-                    echo "WARNING: Ace editor files not found in $ACE_PLUGIN_DIR after install. Editor will lack syntax highlighting."
-                fi
-            else
-                echo "WARNING: Failed to copy Ace editor files. Editor will lack syntax highlighting."
-            fi
-        else
-            echo "WARNING: Failed to extract Ace editor archive. Editor will lack syntax highlighting."
-        fi
-    else
-        echo "WARNING: Failed to download Ace editor. The YAML/env editor will not have syntax highlighting."
-    fi
-    rm -rf "$TMPDIR_ACE"
-fi
+echo ""
+echo "----------------------------------------------------"
+echo ""
+echo "  Ace editor v&aceVER; will only be downloaded and"
+echo "       installed for pre-7.0 Unraid versions."
+echo ""
+echo "  If on 7.0 or later, Ace editor files are included"
+echo "      by default and skips will be shown below."
+echo ""
+echo "----------------------------------------------------"
+echo ""
+</INLINE>
+</FILE>
+
+<!-- Ace editor fallback for pre-7.0: download zip to flash cache -->
+<FILE Name="&pluginLOC;/cache-&aceZIP;" Max="6.99.99">
+<URL>&aceURL;</URL>
+<SHA256>&aceSHA256;</SHA256>
+</FILE>
+
+<!-- Ace editor fallback for pre-7.0: copy cached zip to /tmp for extraction -->
+<FILE Name="/tmp/temp-&aceZIP;" Max="6.99.99">
+<LOCAL>&pluginLOC;/cache-&aceZIP;</LOCAL>
+<SHA256>&aceSHA256;</SHA256>
+</FILE>
+
+<!-- Ace editor fallback for pre-7.0: extract needed JS files into plugin dir -->
+<FILE Name="/tmp/ace-editor-install.sh" Run="/bin/bash" Max="6.99.99">
+<INLINE>
+&emhttpLOC;/scripts/install-ace.sh /tmp/temp-&aceZIP; &emhttpLOC; &aceVER;
+rm -f /tmp/ace-editor-install.sh
 </INLINE>
 </FILE>
 
 <FILE Run="/bin/bash">
 <INLINE>
-# Use the new patch utility during install to cleanup and optionally apply patches
-patch_script=/usr/local/emhttp/plugins/compose.manager/scripts/patch.sh
-config_file=/boot/config/plugins/compose.manager/compose.manager.cfg
-if [ -f "$patch_script" ]; then
-    if [ -f "$config_file" ]; then
-        #Grab the contents of our config file.
-        source &lt;(grep = $config_file)
-        patch_ui=${PATCH_UI:='false'}
-        # Parse /etc/unraid-version into numeric form: M*10000 + m*100 + p
-        # Handles formats like: 6.10.2 or "7.2.3" by extracting the first X.Y.Z
-        ver=$(grep -oE '[0-9]+(\.[0-9]+){0,2}' /etc/unraid-version | head -n1)
-        IFS=. read -r major minor patch &lt;&lt;&lt; "$ver"
-        major=${major:-0}; minor=${minor:-0}; patch=${patch:-0}
-        unraid_version=$((major*10000 + minor*100 + patch))
-
-        if [ $unraid_version -ge 61000 ] &amp;&amp; [ $unraid_version -le 69999 ] &amp;&amp; [ $patch_ui == 'true' ]; then
-            echo ""
-            echo "----------------------------------------------------"
-            echo " Applying WebUI Patches because PATCH_UI=true"
-            echo "----------------------------------------------------"
-            echo ""
-            #Remove patchs if already applied
-            $patch_script -r
-
-            #Apply Patches
-            $patch_script apply || true
-        fi
-        if [ $unraid_version -ge 61000 ] &amp;&amp; [ $unraid_version -le 69999 ] &amp;&amp; [ $patch_ui != 'true' ]; then
-            echo ""
-            echo "----------------------------------------------------"
-            echo " Removing WebUI Patches because PATCH_UI=false"
-            echo " To enable the WebUI, set PATCH_UI=true in &name;.cfg"
-            echo " and apply patches from the plugin settings page."
-            echo "----------------------------------------------------"
-            echo ""
-            $patch_script -r
-        fi
-    fi
-fi
+echo ""
+echo "----------------------------------------------------"
+echo ""
+echo "          Patches are only installed for"
+echo "             pre-6.12 Unraid versions."
+echo ""
+echo "     If on 6.12 or later, patches are not needed"
+echo "          and skips will be shown below."
+echo ""
+echo "----------------------------------------------------"
+echo ""
+</INLINE>
+</FILE>
+
+<!-- Patch utility installation for pre-6.12: install or remove patches -->
+<FILE Name="/tmp/patch-util-install.sh" Run="/bin/bash" Max="6.11.99">
+<INLINE>
+&emhttpLOC;/scripts/install-patch.sh install &emhttpLOC; &pluginLOC;
+rm -f /tmp/patch-util-install.sh
 </INLINE>
 </FILE>
 
 <FILE Run="/bin/bash">
 <INLINE>
 echo ""
 echo "----------------------------------------------------"
+echo ""
 echo "      Compose Manager Plus has been installed."
-echo "                Version: &version;"
+echo "               Version: &version;"
+echo ""
 echo "----------------------------------------------------"
 echo ""
 </INLINE>
 </FILE>
 
 <FILE Run="/bin/bash" Method="remove">
 <INLINE>
-# Use the new patch utility during install to cleanup and optionally apply patches
-patch_script=/usr/local/emhttp/plugins/compose.manager/scripts/patch.sh
-config_file=/boot/config/plugins/compose.manager/compose.manager.cfg
-if [ -f "$patch_script" ]; then
-    if [ -f "$config_file" ]; then
-        #Grab the contents of our config file.
-        source &lt;(grep = $config_file)
-        patch_ui=${PATCH_UI:='false'}
-        # Parse /etc/unraid-version into numeric form: M*10000 + m*100 + p
-        # Handles formats like: 6.10.2 or "7.2.3" by extracting the first X.Y.Z
-        ver=$(grep -oE '[0-9]+(\.[0-9]+){0,2}' /etc/unraid-version | head -n1)
-        IFS=. read -r major minor patch &lt;&lt;&lt; "$ver"
-        major=${major:-0}; minor=${minor:-0}; patch=${patch:-0}
-        unraid_version=$((major*10000 + minor*100 + patch))
-
-        if [ $unraid_version -ge 61000 ] &amp;&amp; [ $unraid_version -le 69999 ] &amp;&amp; [ $patch_ui == 'true' ]; then
-            echo ""
-            echo "----------------------------------------------------"
-            echo " Removing WebUI Patches because plugin is being removed"
-            echo "----------------------------------------------------"
-            echo ""
-            #Remove patchs if already applied
-            $patch_script -r
-        fi
-    fi
-fi
+echo ""
+echo "----------------------------------------------------"
+echo ""
+echo "           Patches are only modified for"
+echo "             pre-6.12 Unraid versions."
+echo ""
+echo "     If on 6.12 or later, patches are not needed"
+echo "          and skips will be shown below."
+echo ""
+echo "----------------------------------------------------"
+echo ""
+</INLINE>
+</FILE>
+
+<!-- Patch utility removal for pre-6.12: remove patches -->
+<FILE Name="/tmp/patch-util-remove.sh" Run="/bin/bash" Method="remove" Max="6.11.99">
+<INLINE>
+&emhttpLOC;/scripts/install-patch.sh remove &emhttpLOC; &pluginLOC;
+rm -f /tmp/patch-util-remove.sh
+</INLINE>
+</FILE>
 
+<!-- Uninstall script; plus cleanup old/unused packages -->
+<FILE Run="/bin/bash" Method="remove">
+<INLINE>
 # Remove all Slackware package entries for this plugin.
 # Handles both new naming (compose.manager-VERSION-noarch-1) and
 # legacy naming (compose.manager-package-VERSION) left by older builds.
-for pkg in /var/log/packages/&name;-*; do
+for pkg in &pluginsInstalledPATH;/&name;-*; do
     [ -e "$pkg" ] &amp;&amp; removepkg "$(basename "$pkg")" 2>/dev/null || true
 done
 

deploy.ps1

@@ -66,7 +66,7 @@ param(
 	[string]$RemoteDir = "/tmp",
 	[string]$PackagePath,
 	[switch]$SkipBuild,
-	[string]$ComposeVersion = "5.0.2",
+	[string]$ComposeVersion = "5.1.2",
 	[string]$AceVersion = "1.43.5",
 	[switch]$Quick
 )

deploy.sh

@@ -9,7 +9,7 @@ USER_NAME="root"
 REMOTE_DIR="/tmp"
 PACKAGE_PATH=""
 SKIP_BUILD=false
-COMPOSE_VERSION="5.0.2"
+COMPOSE_VERSION="5.1.2"
 QUICK=false
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"