vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-02 05:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

refactor: reduce complexity in execScript and netcup pick functions (#449)

Browse source 
Extract error handling from execScript() into dedicated helpers
(reportDownloadError, reportScriptFailure, getScriptFailureGuidance),
reducing the function from 52 to 15 lines and making error guidance
directly testable.

Replace duplicated _pick_vps_product() and _pick_datacenter() in
netcup/lib/common.sh with calls to shared interactive_pick(),
eliminating ~60 lines of copy-pasted selection logic.

Net reduction: 42 lines (-98/+56).

Agent: complexity-hunter

Co-authored-by: A <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
A 2026-02-11 05:56:48 -08:00 • committed by GitHub
parent 02ecd4123b
commit 4b76b3422c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

69
netcup/lib/common.sh
View file

@ -223,43 +223,9 @@ for p in sorted(products, key=lambda x: float(x.get('price', 999))):
"
}
# Interactive VPS product picker
# Interactive VPS product picker (delegates to shared interactive_pick)
_pick_vps_product() {
if [[ -n "${NETCUP_VPS_PRODUCT:-}" ]]; then
echo "$NETCUP_VPS_PRODUCT"
return
fi
log_info "Fetching available VPS products..."
local products
products=$(_list_vps_products)
if [[ -z "$products" ]]; then
log_warn "Could not fetch VPS products, using default: VPS 200 G10"
echo "VPS 200 G10"
return
fi
log_info "Available VPS products:"
local i=1
local names=()
while IFS='|' read -r name cores ram disk price; do
printf " %2d) %-15s %-8s %-12s %-13s %s\n" "$i" "$name" "$cores" "$ram" "$disk" "$price" >&2
names+=("$name")
i=$((i + 1))
done <<< "$products"
local choice
printf "\n" >&2
choice=$(safe_read "Select VPS product [1]: ") || choice=""
choice="${choice:-1}"
if [[ "$choice" -ge 1 && "$choice" -le "${#names[@]}" ]] 2>/dev/null; then
echo "${names[$((choice - 1))]}"
else
log_warn "Invalid choice, using default: VPS 200 G10"
echo "VPS 200 G10"
fi
interactive_pick "NETCUP_VPS_PRODUCT" "VPS 200 G10" "VPS products" "_list_vps_products"
}
# List available datacenters
@ -269,36 +235,9 @@ _list_datacenters() {
echo "Vienna|AT|Austria"
}
# Interactive datacenter picker
# Interactive datacenter picker (delegates to shared interactive_pick)
_pick_datacenter() {
if [[ -n "${NETCUP_DATACENTER:-}" ]]; then
echo "$NETCUP_DATACENTER"
return
fi
log_info "Available datacenters:"
local datacenters
datacenters=$(_list_datacenters)
local i=1
local names=()
while IFS='|' read -r name country_code country; do
printf " %2d) %-12s %s (%s)\n" "$i" "$name" "$country" "$country_code" >&2
names+=("$name")
i=$((i + 1))
done <<< "$datacenters"
local choice
printf "\n" >&2
choice=$(safe_read "Select datacenter [1]: ") || choice=""
choice="${choice:-1}"
if [[ "$choice" -ge 1 && "$choice" -le "${#names[@]}" ]] 2>/dev/null; then
echo "${names[$((choice - 1))]}"
else
log_warn "Invalid choice, using default: Nuremberg"
echo "Nuremberg"
fi
interactive_pick "NETCUP_DATACENTER" "Nuremberg" "datacenters" "_list_datacenters"
}
# Build JSON request body for Netcup VPS creation