gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Add standalone manifest apps to list_apps wizard display (v0.6.0-r20)

Browse Source 
- Modified list_apps RPC method to include apps from plugin manifests
- Previously only catalog apps could have has_wizard flag
- Now scans /usr/share/secubox/plugins/*/manifest.json files
- Adds apps with wizard.fields to the apps list even if not in catalog
- If app exists in catalog, adds has_wizard flag
- If app not in catalog, creates new app entry with manifest data
- Fixes wizard page showing "No manifests detected"
- Apps domoticz and lyrion now appear with Configure button

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-01-07 13:15:56 +01:00
parent 2997ee51b6
commit 8b3627777f
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox
View File

@ -472,39 +472,60 @@ case "$1" in
;; ;;
list_apps) list_apps)
# Returns apps from catalog and marks apps with wizards # Returns apps from catalog and adds apps from manifests with wizards
CATALOG_FILE="/usr/share/secubox/catalog.json" CATALOG_FILE="/usr/share/secubox/catalog.json"
PLUGINS_DIR="/usr/share/secubox/plugins" PLUGINS_DIR="/usr/share/secubox/plugins"
if [ -f "$CATALOG_FILE" ]; then if [ -f "$CATALOG_FILE" ]; then
# Get base apps from catalog # Get base apps from catalog
APPS_JSON=$(jq '.plugins' "$CATALOG_FILE") APPS_JSON=$(jq '.plugins' "$CATALOG_FILE")
else
APPS_JSON='[]'
fi
# Check each plugin directory for manifest with wizard # Scan plugin manifests and add apps with wizards
for plugin_dir in "$PLUGINS_DIR"/*; do for plugin_dir in "$PLUGINS_DIR"/*; do
[ -d "$plugin_dir" ] || continue [ -d "$plugin_dir" ] || continue
manifest="$plugin_dir/manifest.json" manifest="$plugin_dir/manifest.json"
[ -f "$manifest" ] || continue [ -f "$manifest" ] || continue
# Get app ID from manifest # Get app ID from manifest
app_id=$(jq -r '.id // empty' "$manifest" 2>/dev/null) app_id=$(jq -r '.id // empty' "$manifest" 2>/dev/null)
[ -n "$app_id" ] || continue [ -n "$app_id" ] || continue
# Check if manifest has wizard configuration # Check if manifest has wizard configuration
has_wizard=$(jq -e '.wizard.fields | length > 0' "$manifest" >/dev/null 2>&1 && echo "true" || echo "false") has_wizard=$(jq -e '.wizard.fields | length > 0' "$manifest" >/dev/null 2>&1 && echo "true" || echo "false")
# Add has_wizard flag to matching app in catalog if [ "$has_wizard" = "true" ]; then
if [ "$has_wizard" = "true" ]; then # Check if app already exists in catalog
app_exists=$(echo "$APPS_JSON" | jq --arg id "$app_id" 'map(select(.id == $id)) | length')
if [ "$app_exists" -gt 0 ]; then
# Update existing catalog app with has_wizard flag
APPS_JSON=$(echo "$APPS_JSON" | jq --arg id "$app_id" \ APPS_JSON=$(echo "$APPS_JSON" | jq --arg id "$app_id" \
'map(if .id == $id then . + {has_wizard: true} else . end)') 'map(if .id == $id then . + {has_wizard: true} else . end)')
else
# Add new app from manifest
app_data=$(jq '{
id: .id,
name: .name,
description: .description,
version: .version,
icon: "📦",
has_wizard: true,
state: "available"
}' "$manifest")
APPS_JSON=$(echo "$APPS_JSON" | jq --argjson app "$app_data" '. + [$app]')
fi fi
done fi
done
# Return modified apps list # Return modified apps list
if [ -f "$CATALOG_FILE" ]; then
jq -n --argjson apps "$APPS_JSON" --argjson cats "$(jq '.categories // {}' "$CATALOG_FILE")" \ jq -n --argjson apps "$APPS_JSON" --argjson cats "$(jq '.categories // {}' "$CATALOG_FILE")" \
'{apps: $apps, categories: $cats}' '{apps: $apps, categories: $cats}'
else else
echo '{"apps":[],"categories":{}}' jq -n --argjson apps "$APPS_JSON" '{apps: $apps, categories: {}}'
fi fi
;; ;;