mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 18:07:06 +01:00
Krzysztof kuhy Rudnicki
466b074dd7
adb_trusted.sh (136) the enrolled-device record: save, list, forget, match,
and refuse to act on an unenrolled phone
adb_locking.sh (76) the single-instance run lock and the cooldown markers
Both are sourced at the end of adb_common.sh from its own directory, so every
consumer keeps getting the whole API from the one source line it already has.
No consumer was edited. Nothing deploys a copy of this lib elsewhere, so the
deployed-copy blocker that stops install_leechblock.sh does not apply.
Picked the seam by coverage, not size: 13 of 23 functions are named by
test_adb_common.sh, and both extracted groups sit inside that covered set.
One real edit. _matches_trusted_record used to shadow TRUSTED_DEVICE_FILE with
a `local` so _load_trusted_device_values would read it; across a file boundary
shellcheck can't see that and reported SC2034. Fixed by making the function
take the path as an argument, which is what the caller meant -- not by a
suppression. shellcheck passes with none added, at a hook that runs with no
severity filter.
16/16 tests still pass, and sourcing adb_common.sh alone still defines every
function from all three files.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011w2Pj4Ek3ZNMQVYcFHgXDY
77 lines
2.0 KiB
Bash
Executable File
77 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# lib/adb_locking.sh — single-instance run lock and per-marker cooldowns.
|
|
# Sourced by adb_common.sh; do not execute directly, and do not source it
|
|
# on its own: it reads LOCK_DIR, LAST_RUN_DIR and LOCK_FILE, and calls the
|
|
# _info/_warn/_fatal helpers, all of which adb_common.sh defines first.
|
|
|
|
_adb_release_lock() {
|
|
if [[ -n "${LOCK_FILE}" && -d "${LOCK_FILE}" ]]; then
|
|
rm -rf "${LOCK_FILE}"
|
|
fi
|
|
}
|
|
|
|
adb_acquire_lock() {
|
|
local lock_pid_file=""
|
|
local old_pid=""
|
|
|
|
mkdir -p "${LOCK_DIR}"
|
|
LOCK_FILE="${LOCK_DIR}/run_phone.lock"
|
|
lock_pid_file="${LOCK_FILE}/pid"
|
|
|
|
if mkdir "${LOCK_FILE}" 2>/dev/null; then
|
|
printf '%s\n' "$$" >"${lock_pid_file}"
|
|
trap _adb_release_lock EXIT INT TERM
|
|
_info "Acquired run lock (PID $$)"
|
|
return 0
|
|
fi
|
|
|
|
old_pid="$(cat "${lock_pid_file}" 2>/dev/null || printf '')"
|
|
if [[ -n "${old_pid}" ]] && kill -0 "${old_pid}" 2>/dev/null; then
|
|
_fatal "Another run_phone.sh instance is already running (PID ${old_pid}). Aborting."
|
|
fi
|
|
|
|
_warn "Stale lock directory found (PID ${old_pid} no longer running). Removing."
|
|
rm -rf "${LOCK_FILE}"
|
|
|
|
if ! mkdir "${LOCK_FILE}" 2>/dev/null; then
|
|
_fatal "Could not acquire run lock at ${LOCK_FILE}. Another process may have raced us."
|
|
fi
|
|
|
|
printf '%s\n' "$$" >"${lock_pid_file}"
|
|
trap _adb_release_lock EXIT INT TERM
|
|
_info "Acquired run lock (PID $$)"
|
|
}
|
|
|
|
adb_check_cooldown() {
|
|
local cooldown_secs="${1:-300}"
|
|
local elapsed=0
|
|
local last_run=0
|
|
local marker_name="${2:-default}"
|
|
local marker="${LAST_RUN_DIR}/${marker_name}"
|
|
local now=0
|
|
|
|
mkdir -p "${LAST_RUN_DIR}"
|
|
if [[ -f "${marker}" ]]; then
|
|
last_run="$(cat "${marker}")"
|
|
if [[ "${last_run}" =~ ^[0-9]+$ ]]; then
|
|
now="$(date +%s)"
|
|
elapsed=$((now - last_run))
|
|
if ((elapsed < cooldown_secs)); then
|
|
_info "Cooldown active: last run ${elapsed}s ago, cooldown is ${cooldown_secs}s. Skipping."
|
|
return 1
|
|
fi
|
|
else
|
|
_warn "Ignoring invalid cooldown marker: ${marker}"
|
|
fi
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
adb_mark_last_run() {
|
|
local marker_name="${1:-default}"
|
|
|
|
mkdir -p "${LAST_RUN_DIR}"
|
|
date +%s >"${LAST_RUN_DIR}/${marker_name}"
|
|
}
|