Skip to content

Commit 2b7e94a

Browse files
committed
fix: support legacy tdarr launchd labels in checks/healer
1 parent d644b48 commit 2b7e94a

2 files changed

Lines changed: 60 additions & 12 deletions

File tree

scripts/auto-heal.sh

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,48 @@ for name in $CONTAINERS; do
8484
done
8585

8686
if [[ "$TDARR_MODE" == "native" ]]; then
87+
tdarr_server_label=""
88+
tdarr_node_label=""
89+
for candidate in com.media-stack.tdarr.server com.duglis.media.tdarr.server; do
90+
if launchctl print "gui/$UID/$candidate" >/dev/null 2>&1; then
91+
tdarr_server_label="$candidate"
92+
break
93+
fi
94+
done
95+
for candidate in com.media-stack.tdarr.node com.duglis.media.tdarr.node; do
96+
if launchctl print "gui/$UID/$candidate" >/dev/null 2>&1; then
97+
tdarr_node_label="$candidate"
98+
break
99+
fi
100+
done
101+
87102
tdarr_ok=true
88-
if ! launchctl print "gui/$UID/com.media-stack.tdarr.server" >/dev/null 2>&1; then
103+
if [[ -z "$tdarr_server_label" ]]; then
89104
tdarr_ok=false
90105
log "WARN: tdarr-server launchd job missing. Attempting load..."
91-
launchctl load "$HOME/Library/LaunchAgents/com.media-stack.tdarr.server.plist" >> "$LOG" 2>&1 || true
92-
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.server" >> "$LOG" 2>&1 || true
106+
if [[ -f "$HOME/Library/LaunchAgents/com.media-stack.tdarr.server.plist" ]]; then
107+
launchctl load "$HOME/Library/LaunchAgents/com.media-stack.tdarr.server.plist" >> "$LOG" 2>&1 || true
108+
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.server" >> "$LOG" 2>&1 || true
109+
tdarr_server_label="com.media-stack.tdarr.server"
110+
elif [[ -f "$HOME/Library/LaunchAgents/com.duglis.media.tdarr.server.plist" ]]; then
111+
launchctl load "$HOME/Library/LaunchAgents/com.duglis.media.tdarr.server.plist" >> "$LOG" 2>&1 || true
112+
launchctl kickstart -k "gui/$UID/com.duglis.media.tdarr.server" >> "$LOG" 2>&1 || true
113+
tdarr_server_label="com.duglis.media.tdarr.server"
114+
fi
93115
((HEALED++))
94116
fi
95-
if ! launchctl print "gui/$UID/com.media-stack.tdarr.node" >/dev/null 2>&1; then
117+
if [[ -z "$tdarr_node_label" ]]; then
96118
tdarr_ok=false
97119
log "WARN: tdarr-node launchd job missing. Attempting load..."
98-
launchctl load "$HOME/Library/LaunchAgents/com.media-stack.tdarr.node.plist" >> "$LOG" 2>&1 || true
99-
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.node" >> "$LOG" 2>&1 || true
120+
if [[ -f "$HOME/Library/LaunchAgents/com.media-stack.tdarr.node.plist" ]]; then
121+
launchctl load "$HOME/Library/LaunchAgents/com.media-stack.tdarr.node.plist" >> "$LOG" 2>&1 || true
122+
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.node" >> "$LOG" 2>&1 || true
123+
tdarr_node_label="com.media-stack.tdarr.node"
124+
elif [[ -f "$HOME/Library/LaunchAgents/com.duglis.media.tdarr.node.plist" ]]; then
125+
launchctl load "$HOME/Library/LaunchAgents/com.duglis.media.tdarr.node.plist" >> "$LOG" 2>&1 || true
126+
launchctl kickstart -k "gui/$UID/com.duglis.media.tdarr.node" >> "$LOG" 2>&1 || true
127+
tdarr_node_label="com.duglis.media.tdarr.node"
128+
fi
100129
((HEALED++))
101130
fi
102131

@@ -107,9 +136,13 @@ if [[ "$TDARR_MODE" == "native" ]]; then
107136
fi
108137
else
109138
log "WARN: Tdarr UI check failed (HTTP $tdarr_http). Restarting tdarr launchd jobs..."
110-
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.server" >> "$LOG" 2>&1 || true
139+
if [[ -n "$tdarr_server_label" ]]; then
140+
launchctl kickstart -k "gui/$UID/$tdarr_server_label" >> "$LOG" 2>&1 || true
141+
fi
111142
sleep 3
112-
launchctl kickstart -k "gui/$UID/com.media-stack.tdarr.node" >> "$LOG" 2>&1 || true
143+
if [[ -n "$tdarr_node_label" ]]; then
144+
launchctl kickstart -k "gui/$UID/$tdarr_node_label" >> "$LOG" 2>&1 || true
145+
fi
113146
((HEALED++))
114147
fi
115148
fi

scripts/health-check.sh

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,30 @@ check_service "FlareSolverr" "http://localhost:8191"
101101
echo ""
102102
echo "Tdarr:"
103103
if [[ "$TDARR_MODE" == "native" ]]; then
104-
if launchctl print "gui/$UID/com.media-stack.tdarr.server" >/dev/null 2>&1; then
105-
echo -e " ${GREEN}OK${NC} tdarr-server launchd job loaded"
104+
tdarr_server_label=""
105+
tdarr_node_label=""
106+
for candidate in com.media-stack.tdarr.server com.duglis.media.tdarr.server; do
107+
if launchctl print "gui/$UID/$candidate" >/dev/null 2>&1; then
108+
tdarr_server_label="$candidate"
109+
break
110+
fi
111+
done
112+
for candidate in com.media-stack.tdarr.node com.duglis.media.tdarr.node; do
113+
if launchctl print "gui/$UID/$candidate" >/dev/null 2>&1; then
114+
tdarr_node_label="$candidate"
115+
break
116+
fi
117+
done
118+
119+
if [[ -n "$tdarr_server_label" ]]; then
120+
echo -e " ${GREEN}OK${NC} tdarr-server launchd job loaded ($tdarr_server_label)"
106121
((PASS++))
107122
else
108123
echo -e " ${RED}FAIL${NC} tdarr-server launchd job missing"
109124
((FAIL++))
110125
fi
111-
if launchctl print "gui/$UID/com.media-stack.tdarr.node" >/dev/null 2>&1; then
112-
echo -e " ${GREEN}OK${NC} tdarr-node launchd job loaded"
126+
if [[ -n "$tdarr_node_label" ]]; then
127+
echo -e " ${GREEN}OK${NC} tdarr-node launchd job loaded ($tdarr_node_label)"
113128
((PASS++))
114129
else
115130
echo -e " ${RED}FAIL${NC} tdarr-node launchd job missing"

0 commit comments

Comments
 (0)