Harden utility script args and health-check HTTP handling

Author: liamvibecodes

scripts/franchise-sort.py

@@ -12,6 +12,7 @@
   python3 franchise-sort.py                                    # uses env vars
   PLEX_URL=http://localhost:32400 PLEX_TOKEN=xxx python3 franchise-sort.py
   python3 franchise-sort.py --url http://localhost:32400 --token xxx
+  python3 franchise-sort.py --path ~/Media/logs               # custom log dir
   python3 franchise-sort.py --section 2                        # TV library
   python3 franchise-sort.py --dry-run                          # preview only
 """
@@ -34,18 +35,24 @@ def parse_args():
     global PLEX_URL, PLEX_TOKEN, SECTION_ID, LOG_DIR, DRY_RUN
     args = sys.argv[1:]
     i = 0
+    def require_arg(flag: str) -> str:
+        nonlocal i
+        if i + 1 >= len(args) or args[i + 1].startswith("--"):
+            print(f"Missing value for {flag}")
+            sys.exit(1)
+        return args[i + 1]
     while i < len(args):
-        if args[i] == "--url" and i + 1 < len(args):
-            PLEX_URL = args[i + 1]
+        if args[i] == "--url":
+            PLEX_URL = require_arg("--url")
             i += 2
-        elif args[i] == "--token" and i + 1 < len(args):
-            PLEX_TOKEN = args[i + 1]
+        elif args[i] == "--token":
+            PLEX_TOKEN = require_arg("--token")
             i += 2
-        elif args[i] == "--section" and i + 1 < len(args):
-            SECTION_ID = args[i + 1]
+        elif args[i] == "--section":
+            SECTION_ID = require_arg("--section")
             i += 2
-        elif args[i] == "--log-dir" and i + 1 < len(args):
-            LOG_DIR = args[i + 1]
+        elif args[i] in ("--log-dir", "--path"):
+            LOG_DIR = require_arg(args[i])
             i += 2
         elif args[i] == "--dry-run":
             DRY_RUN = True

scripts/health-check.sh

@@ -13,7 +13,7 @@ FAIL=0
 check_service() {
     local name="$1" url="$2"
     status=$(curl -s -o /dev/null -w "%{http_code}" --max-time 5 "$url" 2>/dev/null)
-    if [[ "$status" =~ ^(200|301|302)$ ]]; then
+    if [[ "$status" =~ ^[23][0-9][0-9]$ ]]; then
         echo -e "  ${GREEN}OK${NC}  $name"
         ((PASS++))
     else

scripts/log-prune.sh

@@ -18,10 +18,20 @@ usage() {
     exit 0
 }
 
+require_arg() {
+    local flag="$1"
+    local value="${2:-}"
+    if [[ -z "$value" || "$value" == --* ]]; then
+        echo "Missing value for $flag" >&2
+        exit 1
+    fi
+    echo "$value"
+}
+
 while [[ $# -gt 0 ]]; do
     case "$1" in
-        --path) MEDIA_DIR="$2"; shift 2 ;;
-        --days) RETENTION_DAYS="$2"; shift 2 ;;
+        --path) MEDIA_DIR="$(require_arg --path "${2:-}")"; shift 2 ;;
+        --days) RETENTION_DAYS="$(require_arg --days "${2:-}")"; shift 2 ;;
         -h|--help) usage ;;
         *) echo "Unknown option: $1"; exit 1 ;;
     esac

scripts/music-cleanup.py

@@ -44,12 +44,18 @@ def parse_args():
     global MUSIC_ROOT, DRY_RUN
     args = sys.argv[1:]
     i = 0
+    def require_arg(flag: str) -> str:
+        nonlocal i
+        if i + 1 >= len(args) or args[i + 1].startswith("--"):
+            print(f"Missing value for {flag}")
+            sys.exit(1)
+        return args[i + 1]
     while i < len(args):
         if args[i] == "--apply":
             DRY_RUN = False
             i += 1
-        elif args[i] == "--path" and i + 1 < len(args):
-            MUSIC_ROOT = args[i + 1]
+        elif args[i] == "--path":
+            MUSIC_ROOT = require_arg("--path")
             i += 2
         elif args[i] in ("-h", "--help"):
             print(__doc__.strip())