Harden qbt-relink.sh after a live incident: unchecked setLocation
let a torrent start re-downloading Batch-relinking 9 torrents, one setLocation call silently failed (status ignored) while the script declared success and moved on. Its recheck then ran against the original (now-empty) path, found 0% match, and qBittorrent started re-downloading the whole torrent from scratch into its incomplete-files staging area. No lasting harm (separate path from the real hardlinked copy, cleaned up), but caught only by watching qBittorrent directly, not by anything the script reported. Fixes: every mutating call now goes through an api_call() helper that checks the HTTP status and aborts on failure; the torrent is stopped before any location/rename calls (qBittorrent 5.x renamed pause/resume to stop/start) and left stopped after recheck rather than auto-resuming, so a bad relink can never turn into an active download. setLocation's effect is also verified via a follow-up GET before proceeding to renameFile. Claude-Session: https://claude.ai/code/session_01HZQK6jHmdTpFjFZM8FUnqA
This commit is contained in:
+45
-7
@@ -57,6 +57,30 @@ if [[ "$login_status" != "200" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# api_call <label> <path> [curl data args...]
|
||||
# Every write call goes through this - checks the HTTP status explicitly
|
||||
# instead of trusting a silent curl call, which is exactly how a stalled
|
||||
# torrent went back to actively downloading (a failed setLocation was never
|
||||
# checked, so the script declared success and moved on anyway).
|
||||
api_call() {
|
||||
local label="$1" path="$2"
|
||||
shift 2
|
||||
local status
|
||||
status=$(curl -s -o /dev/null -w "%{http_code}" -b "$COOKIE_JAR" -X POST "$QBITTORRENT_URL/api/v2/$path" "$@")
|
||||
if [[ "$status" != "200" ]]; then
|
||||
echo "Error: $label failed (http $status)" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Stop the torrent FIRST, before touching its location/files at all. A
|
||||
# recheck runs fine on a stopped torrent, and this guarantees qBittorrent
|
||||
# can never decide to start downloading missing pieces mid-relink - the
|
||||
# failure mode that hit Babylon 5 S05. (qBittorrent 5.x renamed pause/resume
|
||||
# to stop/start; the old /pause endpoint 404s silently on this version.)
|
||||
echo "Stopping torrent (safety - no download can start while relinking)..."
|
||||
api_call "stop" "torrents/stop" --data-urlencode "hashes=$HASH"
|
||||
|
||||
# Current files inside the torrent (relative paths, in qBittorrent's index order)
|
||||
old_files_json=$(curl -s -b "$COOKIE_JAR" -G "$QBITTORRENT_URL/api/v2/torrents/files" --data-urlencode "hash=$HASH")
|
||||
|
||||
@@ -98,24 +122,38 @@ echo
|
||||
echo "--- Applying ---"
|
||||
|
||||
echo "setLocation -> $NEW_FOLDER"
|
||||
curl -s -b "$COOKIE_JAR" -X POST "$QBITTORRENT_URL/api/v2/torrents/setLocation" \
|
||||
api_call "setLocation" "torrents/setLocation" \
|
||||
--data-urlencode "hashes=$HASH" \
|
||||
--data-urlencode "location=$NEW_FOLDER" > /dev/null
|
||||
--data-urlencode "location=$NEW_FOLDER"
|
||||
|
||||
# Don't just trust the 200 - confirm the torrent's save_path actually changed
|
||||
# before touching anything else. This is exactly the check that was missing
|
||||
# when Babylon 5 S05 silently kept its old location and started re-downloading.
|
||||
actual_path=$(curl -s -b "$COOKIE_JAR" -G "$QBITTORRENT_URL/api/v2/torrents/info" --data-urlencode "hashes=$HASH" \
|
||||
| python3 -c "import json,sys; print(json.load(sys.stdin)[0]['save_path'])")
|
||||
if [[ "$actual_path" != "$NEW_FOLDER" ]]; then
|
||||
echo "Error: setLocation did not take effect (save_path is still '$actual_path'). Torrent is stopped - not proceeding." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo " confirmed: save_path is now $actual_path"
|
||||
|
||||
# setLocation above already moved the torrent's root to $NEW_FOLDER itself
|
||||
# (the season folder) - so new paths here are bare filenames, not prefixed
|
||||
# with the season folder name again.
|
||||
while IFS=$'\t' read -r old new; do
|
||||
curl -s -b "$COOKIE_JAR" -X POST "$QBITTORRENT_URL/api/v2/torrents/renameFile" \
|
||||
api_call "renameFile" "torrents/renameFile" \
|
||||
--data-urlencode "hash=$HASH" \
|
||||
--data-urlencode "oldPath=$old" \
|
||||
--data-urlencode "newPath=$new" > /dev/null
|
||||
--data-urlencode "newPath=$new"
|
||||
echo " renamed: $old -> $new"
|
||||
done < /tmp/qbt_relink_flat.tsv
|
||||
|
||||
echo "recheck..."
|
||||
curl -s -b "$COOKIE_JAR" -X POST "$QBITTORRENT_URL/api/v2/torrents/recheck" \
|
||||
--data-urlencode "hashes=$HASH" > /dev/null
|
||||
api_call "recheck" "torrents/recheck" --data-urlencode "hashes=$HASH"
|
||||
|
||||
echo "Done. Recheck is running in the background - poll with:"
|
||||
echo "Done. Torrent is left STOPPED so nothing can auto-resume downloading"
|
||||
echo "before you've verified the recheck passed. Poll with:"
|
||||
echo " bash ~/.claude/plugins/cache/claude-homelab/homelab-core/*/skills/qbittorrent/scripts/qbit-api.sh info $HASH"
|
||||
echo "Once it shows 100% progress / stoppedUP (not stoppedDL - stoppedDL means the"
|
||||
echo "recheck found missing/mismatched pieces, do not resume), start it again from"
|
||||
echo "the qBittorrent WebUI (this script does not auto-resume, on purpose)."
|
||||
|
||||
Reference in New Issue
Block a user