Align disk cleaning with disk_species_clean.sh

scripts/disk_check.sh

@@ -1,45 +1,101 @@
 #!/usr/bin/env bash
-set -x
+set -Eeuo pipefail
+
+# =============================================================================
+# BirdNET-Pi Disk Space Management Script
+#
+# PURPOSE:
+#   This script monitors the disk space used by BirdNET-Pi recordings and
+#   automatically purges old files if the used space exceeds a configurable
+#   threshold. It is designed to prevent disk full errors and ensure smooth
+#   operation of BirdNET-Pi services.
+#
+# USAGE:
+#   - The script is intended to be run automatically (e.g., via cron).
+#   - It sources configuration from `/etc/birdnet/birdnet.conf`.
+#   - It respects the `FULL_DISK` environment variable to determine whether to
+#     purge files or stop services when the disk is full.
+#   - Always leaves at least 30 recordings per species.
+#   - Deletes files in steps of 5% of MAX_FILES_SPECIES (minimum 5 files per step).
+#   - Stops core services if disk remains full after purging.
+#
+# =============================================================================
 
 source /etc/birdnet/birdnet.conf
-used="$(df -h ${EXTRACTED} | tail -n1 | awk '{print $5}')"
-purge_threshold="${PURGE_THRESHOLD:-95}"
 
-if [ "${used//%}" -ge "$purge_threshold" ]; then
+# --- tiny helper: sanitize "95", "95.0", "95,0", " 95 " -> integer (or default) ---
+int() {
+  local v="${1:-}" d="${2:-0}"
+  v="${v//[[:space:]]/}"
+  v="${v%%[.,]*}"
+  [[ "$v" =~ ^[0-9]+$ ]] && printf '%s' "$v" || printf '%s' "$d"
+}
 
-  case $FULL_DISK in
-    purge) echo "Removing oldest data"
-        cd ${EXTRACTED}/By_Date/
-        curl localhost/views.php?view=Species%20Stats &>/dev/null
-        if ! grep -qxFe \#\#start $HOME/BirdNET-Pi/scripts/disk_check_exclude.txt; then
-            exit
-        fi
-        filestodelete=$(($(find ${EXTRACTED}/By_Date/* -type f | wc -l) / $(find ${EXTRACTED}/By_Date/* -maxdepth 0 -type d | wc -l)))
-        iter=0
-        for i in */*/*; do
-            if [ $iter -ge $filestodelete ]; then
-                break
-            fi
-            if ! grep -qxFe "$i" $HOME/BirdNET-Pi/scripts/disk_check_exclude.txt; then
-                rm "$i"
-            fi
-            ((iter++))
-        done
-        find ~/BirdSongs/ -type d -empty -mtime +90 -delete
-        find ${EXTRACTED}/By_Date/ -empty -type d -delete;;
-
-       #rm -drfv "$(find ${EXTRACTED}/By_Date/* -maxdepth 1 -type d -prune \
-        # | sort -r | tail -n1)";;
-    keep) echo "Stopping Core Services"
-       /usr/local/bin/stop_core_services.sh;;
-  esac
+# Get the variables
+max_files_species="$(int "${MAX_FILES_SPECIES:-1000}" 1000)"
+purge_threshold="$(int "${PURGE_THRESHOLD:-95}" 95)"
+
+# Remove 10% below the threshold to avoid running the script too often, ensure integer
+purge_threshold_target=$(( purge_threshold * 9 / 10 ))
+
+# Deletion step corresponding to 5% of max_files_species, with at least 5 files, ensure integer
+safe_purge_step=$(( max_files_species * 5 / 100 ))
+(( safe_purge_step >= 5 )) || safe_purge_step=5
+
+# Always leave at least 30 recordings
+safe_files_species="30"
+
+# Get the disk space in %
+base_dir="$(realpath -e "${BIRDNET_BASE_DIR:-$HOME/BirdSongs/Extracted/By_Date}" 2>/dev/null || true)"
+if [[ -z "$base_dir" ]]; then
+  echo "ERROR: base_dir not found/resolvable: ${BIRDNET_BASE_DIR:-$HOME/BirdSongs/Extracted/By_Date}. Stopping core services."
+  /usr/local/bin/stop_core_services.sh || true
+  exit 1
 fi
-sleep 1
-if [ "${used//%}" -ge "$purge_threshold" ]; then
-  case $FULL_DISK in
-    purge) echo "Removing more data"
-       rm -rfv ${PROCESSED}/*;;
-    keep) echo "Stopping Core Services"
-       /usr/local/bin/stop_core_services.sh;;
+
+used_disk() {
+  df -P "$base_dir" | awk 'NR==2 { gsub(/%/,"",$5); print $5 }'
+}
+
+# Prevent concurrent runs (cron overlap)
+lockfile="${LOCK_FILE:-/tmp/birdnet_disk_check.lock}"
+exec 9>"$lockfile"
+flock -n 9 || exit 0
+
+# If the used space is above the threshold
+if (( $(used_disk) >= purge_threshold )); then
+  case "${FULL_DISK:-purge}" in
+    purge)
+      echo "Removing data to stay below threshold of $purge_threshold"
+      # Loop until the value is below 10% of the threshold, to avoid running the script too often
+      max_files_species_loop="$max_files_species"
+      while (( $(used_disk) >= purge_threshold_target )); do
+        max_files_species_loop=$(( max_files_species_loop - safe_purge_step ))
+        if (( max_files_species_loop > safe_files_species )); then
+          bash "$HOME/BirdNET-Pi/scripts/disk_species_clean.sh" "$max_files_species_loop"
+          sleep 5
+        else
+          echo "ERROR : safeguard initiated at $safe_files_species files remaining to make sure that we do not delete too many files. Is there an issue with the path of $base_dir? Stopping core services."
+          /usr/local/bin/stop_core_services.sh || true
+          break
+        fi
+      done
+
+      # If still full after purge attempts, stop core services
+      if (( $(used_disk) >= purge_threshold )); then
+        echo "Disk remains >= threshold after purging. Stopping core services."
+        /usr/local/bin/stop_core_services.sh || true
+      fi
+      ;;
+
+    keep)
+      echo "FULL_DISK=keep → Stopping Core Services."
+      /usr/local/bin/stop_core_services.sh
+      ;;
+
+    *)
+      echo "Unknown FULL_DISK value: ${FULL_DISK:-<unset>}"
+      exit 1
+      ;;
   esac
 fi

scripts/disk_species_clean.sh

@@ -3,10 +3,15 @@
 # KEEP ONLY THE NUMBER OF FILES PER SPECIES DEFINED IN THE OPTIONS
 
 source /etc/birdnet/birdnet.conf
-base_dir="$HOME/BirdSongs/Extracted/By_Date"
+base_dir="$(realpath -e "$HOME/BirdSongs/Extracted/By_Date")"
 max_files_species="${MAX_FILES_SPECIES:-1000}"
 cd "$base_dir" || true
 
+# Check if the first argument is a valid integer
+if [[ "$1" =~ ^[0-9]+$ ]]; then
+  max_files_species="$1"
+fi
+
 # If max_files_species is not higher than 1, exit
 if [[ "$max_files_species" -lt 1 ]]; then
     exit 0