mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-11 19:34:03 +01:00
Krzysztof kuhy Rudnicki
4f2b0ccdf7
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
92 lines
2.5 KiB
Bash
Executable File
92 lines
2.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# lib/hosts_cache.sh — keep the local copy of the upstream StevenBlack list
|
||
# current.
|
||
#
|
||
# The cache holds the RAW upstream file, without our own entries, so a refresh
|
||
# never has to re-derive what we added. Sourced by install.sh.
|
||
|
||
# Helpers
|
||
extract_date_epoch_from_file() {
|
||
# Grep "# Date:" line and convert to epoch seconds (UTC)
|
||
local f="$1"
|
||
local line
|
||
line=$(grep -m1 '^# Date:' "$f" 2>/dev/null | sed -E 's/^# Date:[[:space:]]*(.*)[[:space:]]*\(UTC\).*/\1 UTC/')
|
||
if [[ -n $line ]]; then
|
||
date -u -d "$line" +%s 2>/dev/null || echo ""
|
||
else
|
||
echo ""
|
||
fi
|
||
}
|
||
|
||
fetch_remote_header() {
|
||
# Try to fetch only the first ~4KB using HTTP Range; fallback to piping to head
|
||
local out="$1"
|
||
if curl -LfsS --max-time 10 -H 'Range: bytes=0-4095' "$URL" -o "$out"; then
|
||
return 0
|
||
fi
|
||
# Fallback – may download more, but we only keep first lines
|
||
if curl -LfsS --max-time 10 "$URL" | head -n 20 >"$out"; then
|
||
return 0
|
||
fi
|
||
return 1
|
||
}
|
||
|
||
download_remote_full_to() {
|
||
local out="$1"
|
||
curl -LfsS "$URL" -o "$out"
|
||
}
|
||
|
||
# Decide whether the cached upstream blocklist is current, and re-download
|
||
# it if not. The cache holds the RAW upstream file, without our additions.
|
||
refresh_upstream_cache() {
|
||
# Decide whether to use cache or update
|
||
TMP_REMOTE_HEAD=$(mktemp)
|
||
trap 'rm -f "$TMP_REMOTE_HEAD"' EXIT
|
||
|
||
REMOTE_AVAILABLE=0
|
||
if fetch_remote_header "$TMP_REMOTE_HEAD"; then
|
||
REMOTE_AVAILABLE=1
|
||
fi
|
||
|
||
NEED_UPDATE=0
|
||
|
||
if [[ -f $LOCAL_CACHE ]]; then
|
||
local_epoch=$(extract_date_epoch_from_file "$LOCAL_CACHE")
|
||
else
|
||
local_epoch=""
|
||
fi
|
||
|
||
if [[ $REMOTE_AVAILABLE -eq 1 ]]; then
|
||
remote_epoch=$(extract_date_epoch_from_file "$TMP_REMOTE_HEAD")
|
||
if [[ -n $local_epoch && -n $remote_epoch && $local_epoch -ge $remote_epoch ]]; then
|
||
echo "Using cached StevenBlack hosts (up-to-date)."
|
||
else
|
||
echo "Cached version is missing or outdated; downloading latest StevenBlack hosts..."
|
||
NEED_UPDATE=1
|
||
fi
|
||
else
|
||
if [[ -f $LOCAL_CACHE ]]; then
|
||
echo "No internet; using cached StevenBlack hosts."
|
||
else
|
||
echo "Error: No internet and no cached StevenBlack hosts found." >&2
|
||
exit 1
|
||
fi
|
||
fi
|
||
|
||
# Ensure we have a fresh cache if needed
|
||
if [[ $NEED_UPDATE -eq 1 ]]; then
|
||
TMP_DL=$(mktemp)
|
||
if download_remote_full_to "$TMP_DL"; then
|
||
# Save raw upstream to cache
|
||
sudo mv "$TMP_DL" "$LOCAL_CACHE"
|
||
sudo chmod 644 "$LOCAL_CACHE"
|
||
echo "Saved latest StevenBlack hosts to cache: $LOCAL_CACHE"
|
||
else
|
||
rm -f "$TMP_DL"
|
||
echo "Error: Failed to download latest StevenBlack hosts." >&2
|
||
exit 1
|
||
fi
|
||
fi
|
||
|
||
}
|