Symlink

2026-01-22 12:36:29 +01:00 · 2025-03-21 07:54:08 +01:00
parent dd9c9f0c70
commit c4ad319d50
32 changed files with 0 additions and 8651 deletions
--- a/battybirdnet-pi/rootfs/rootfs
+++ b/battybirdnet-pi/rootfs/rootfs
--- a/battybirdnet-pi/rootfs/custom-services.d/00-php_pfm.sh
+++ b/battybirdnet-pi/rootfs/custom-services.d/00-php_pfm.sh
@@ -1,12 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# Correct /config permissions after startup
-chown pi:pi /config
-
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-echo "Starting service: php pfm"
-exec /usr/sbin/php-fpm* -F
--- a/battybirdnet-pi/rootfs/custom-services.d/01-avahi.sh
+++ b/battybirdnet-pi/rootfs/custom-services.d/01-avahi.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# Waiting for dbus
-until [[ -e /var/run/dbus/system_bus_socket ]]; do
-    sleep 1s
-done
-
-echo "Starting service: avahi daemon"
-exec \
-    avahi-daemon --no-chroot
--- a/battybirdnet-pi/rootfs/custom-services.d/02-caddy.sh
+++ b/battybirdnet-pi/rootfs/custom-services.d/02-caddy.sh
@@ -1,21 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-
-# Dependencies
-sockfile="empty"
-until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e "$sockfile" ]]; do
-    sleep 1s
-    sockfile="$(find /run/php -name "*.sock")"
-done
-
-# Correct fpm.sock
-chown caddy:caddy /run/php/php*-fpm.sock
-sed -i "s|/run/php/php-fpm.sock|$sockfile|g" /helpers/caddy_ingress.sh
-sed -i "s|/run/php/php-fpm.sock|$sockfile|g" /etc/caddy/Caddyfile
-sed -i "s|/run/php/php-fpm.sock|$sockfile|g" "$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh
-
-# Update caddyfile with password
-/."$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh &>/dev/null || true
-
-echo "Starting service: caddy"
-/usr/bin/caddy run --config /etc/caddy/Caddyfile
--- a/battybirdnet-pi/rootfs/custom-services.d/02-nginx.sh
+++ b/battybirdnet-pi/rootfs/custom-services.d/02-nginx.sh
@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-echo "Starting service: nginx"
-nginx
--- a/battybirdnet-pi/rootfs/custom-services.d/30-monitoring.sh
+++ b/battybirdnet-pi/rootfs/custom-services.d/30-monitoring.sh
@@ -1,261 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck shell=bash
-# Improved BirdNET-Pi Monitoring Script with Recovery Alerts and Condensed Logs
-
-HOME="/home/pi"
-
-########################################
-# Logging Functions (color-coded for terminal clarity)
-########################################
-log_green()   { echo -e "\033[32m$1\033[0m"; }
-log_red()     { echo -e "\033[31m$1\033[0m"; }
-log_yellow()  { echo -e "\033[33m$1\033[0m"; }
-log_blue()    { echo -e "\033[34m$1\033[0m"; }
-
-########################################
-# Read configuration
-########################################
-set +u
-# shellcheck disable=SC1091
-source /etc/birdnet/birdnet.conf
-
-########################################
-# Wait 5 minutes for system stabilization
-########################################
-sleep 5m
-
-log_green "Starting service: throttlerecording"
-
-########################################
-# Define Directories, Files, and Constants
-########################################
-INGEST_DIR="$(readlink -f "$HOME/BirdSongs/StreamData")"
-ANALYZING_NOW_FILE="$INGEST_DIR/analyzing_now.txt"
-touch "$ANALYZING_NOW_FILE"
-BIRDSONGS_DIR="$(readlink -f "$HOME/BirdSongs/Extracted/By_Date")"
-
-# Ensure directories and set permissions
-mkdir -p "$INGEST_DIR" || { log_red "Failed to create directory: $INGEST_DIR"; exit 1; }
-chown -R pi:pi "$INGEST_DIR" || log_yellow "Could not change ownership for $INGEST_DIR"
-chmod -R 755 "$INGEST_DIR" || log_yellow "Could not set permissions for $INGEST_DIR"
-
-# Services to monitor
-SERVICES=(birdnet_analysis chart_viewer spectrogram_viewer birdnet_recording birdnet_log birdnet_stats)
-
-########################################
-# Notification settings
-########################################
-NOTIFICATION_INTERVAL=1800  # 30 minutes in seconds
-NOTIFICATION_INTERVAL_IN_MINUTES=$(( NOTIFICATION_INTERVAL / 60 ))
-last_notification_time=0
-issue_reported=0  # 1 = an issue was reported, 0 = system is normal
-declare -A SERVICE_INACTIVE_COUNT=()
-
-# Disk usage threshold (percentage)
-DISK_USAGE_THRESHOLD=95
-
-# "Analyzing" file check variables
-same_file_counter=0
-SAME_FILE_THRESHOLD=2
-if [[ -f "$ANALYZING_NOW_FILE" ]]; then
-    analyzing_now=$(<"$ANALYZING_NOW_FILE")
-else
-    analyzing_now=""
-fi
-
-########################################
-# Notification Functions
-########################################
-apprisealert() {
-    local issue_message="$1"
-    local current_time
-    current_time=$(date +%s)
-
-    # Calculate time_diff in minutes since last notification
-    local time_diff=$(( (current_time - last_notification_time) / 60 ))
-
-    # Throttle notifications
-    if (( time_diff < NOTIFICATION_INTERVAL_IN_MINUTES )); then
-        log_yellow "Notification suppressed (last sent ${time_diff} minutes ago)."
-        return
-    fi
-
-    local stopped_service="<br><b>Stopped services:</b> "
-    for service in "${SERVICES[@]}"; do
-        if [[ "$(systemctl is-active "$service")" != "active" ]]; then
-            stopped_service+="$service; "
-        fi
-    done
-
-    local notification="<b>Issue:</b> $issue_message"
-    notification+="$stopped_service"
-    notification+="<br><b>System:</b> ${SITE_NAME:-$(hostname)}"
-    notification+="<br>Available disk space: $(df -h "$BIRDSONGS_DIR" | awk 'NR==2 {print $4}')"
-    notification+="<br>----Last log lines----"
-    notification+="<br> $(timeout 15 cat /proc/1/fd/1 | head -n 5)"
-    notification+="<br>----------------------"
-    [[ -n "$BIRDNETPI_URL" ]] && notification+="<br><a href=\"$BIRDNETPI_URL\">Access your BirdNET-Pi</a>"
-
-    local TITLE="BirdNET-Analyzer Alert"
-    if [[ -f "$HOME/BirdNET-Pi/birdnet/bin/apprise" && -s "$HOME/BirdNET-Pi/apprise.txt" ]]; then
-        "$HOME/BirdNET-Pi/birdnet/bin/apprise" -vv -t "$TITLE" -b "$notification" \
-            --input-format=html --config="$HOME/BirdNET-Pi/apprise.txt"
-        last_notification_time=$current_time
-        issue_reported=1
-    else
-        log_red "Apprise not configured or missing!"
-    fi
-}
-
-apprisealert_recovery() {
-    # Only send a recovery message if we had previously reported an issue
-    if (( issue_reported == 1 )); then
-        log_green "$(date) INFO: System is back to normal. Sending recovery notification."
-
-        local TITLE="BirdNET-Pi System Recovered"
-        local notification="<b>All monitored services are back to normal.</b><br>"
-        notification+="<b>System:</b> ${SITE_NAME:-$(hostname)}<br>"
-        notification+="Available disk space: $(df -h "$BIRDSONGS_DIR" | awk 'NR==2 {print $4}')"
-
-        if [[ -f "$HOME/BirdNET-Pi/birdnet/bin/apprise" && -s "$HOME/BirdNET-Pi/apprise.txt" ]]; then
-            "$HOME/BirdNET-Pi/birdnet/bin/apprise" -vv -t "$TITLE" -b "$notification" \
-                --input-format=html --config="$HOME/BirdNET-Pi/apprise.txt"
-        fi
-        issue_reported=0
-    fi
-}
-
-########################################
-# Helper Checks
-########################################
-
-check_disk_space() {
-    local current_usage
-    current_usage=$(df -h "$BIRDSONGS_DIR" | awk 'NR==2 {print $5}' | sed 's/%//')
-
-    if (( current_usage >= DISK_USAGE_THRESHOLD )); then
-        log_red "$(date) INFO: Disk usage is at ${current_usage}% (CRITICAL!)"
-        apprisealert "Disk usage critical: ${current_usage}%"
-        return 1
-    else
-        log_green "$(date) INFO: Disk usage is within acceptable limits (${current_usage}%)."
-        return 0
-    fi
-}
-
-check_analyzing_now() {
-    local current_file
-    current_file=$(cat "$ANALYZING_NOW_FILE" 2>/dev/null)
-    if [[ "$current_file" == "$analyzing_now" ]]; then
-        (( same_file_counter++ ))
-    else
-        same_file_counter=0
-        analyzing_now="$current_file"
-    fi
-
-    if (( same_file_counter >= SAME_FILE_THRESHOLD )); then
-        log_red "$(date) INFO: 'analyzing_now' file unchanged for $SAME_FILE_THRESHOLD iterations."
-        apprisealert "No change in analyzing_now for ${SAME_FILE_THRESHOLD} iterations"
-        "$HOME/BirdNET-Pi/scripts/restart_services.sh"
-        same_file_counter=0
-        return 1
-    else
-        # Only log if it changed this iteration
-        if (( same_file_counter == 0 )); then
-            log_green "$(date) INFO: 'analyzing_now' file has been updated."
-        fi
-        return 0
-    fi
-}
-
-check_queue() {
-    local wav_count
-    wav_count=$(find -L "$INGEST_DIR" -maxdepth 1 -name '*.wav' | wc -l)
-
-    log_green "$(date) INFO: Queue is at a manageable level (${wav_count} wav files)."
-
-    if (( wav_count > 50 )); then
-        log_red "$(date) INFO: Queue >50. Stopping recorder + restarting analyzer."
-        apprisealert "Queue exceeded 50: stopping recorder, restarting analyzer."
-        sudo systemctl stop birdnet_recording
-        sudo systemctl restart birdnet_analysis
-        return 1
-    elif (( wav_count > 30 )); then
-        log_red "$(date) INFO: Queue >30. Restarting analyzer."
-        apprisealert "Queue exceeded 30: restarting analyzer."
-        sudo systemctl restart birdnet_analysis
-        return 1
-    fi
-    return 0
-}
-
-check_services() {
-    local any_inactive=0
-
-    for service in "${SERVICES[@]}"; do
-        if [[ "$(systemctl is-active "$service")" != "active" ]]; then
-            SERVICE_INACTIVE_COUNT["$service"]=$(( SERVICE_INACTIVE_COUNT["$service"] + 1 ))
-
-            if (( SERVICE_INACTIVE_COUNT["$service"] == 1 )); then
-                # First time inactive => Try to start
-                log_yellow "$(date) INFO: Service '$service' is inactive. Attempting to start..."
-                systemctl start "$service"
-                any_inactive=1
-            elif (( SERVICE_INACTIVE_COUNT["$service"] == 2 )); then
-                # Second consecutive time => Send an alert
-                log_red "$(date) INFO: Service '$service' is still inactive after restart attempt."
-                apprisealert "Service '$service' remains inactive after restart attempt."
-                any_inactive=1
-            else
-                # Beyond second check => keep logging or do advanced actions
-                log_red "$(date) INFO: Service '$service' inactive for ${SERVICE_INACTIVE_COUNT["$service"]} checks in a row."
-                any_inactive=1
-            fi
-        else
-            # Service is active => reset counter
-            if (( SERVICE_INACTIVE_COUNT["$service"] > 0 )); then
-                log_green "$(date) INFO: Service '$service' is back to active. Resetting counter."
-            fi
-            SERVICE_INACTIVE_COUNT["$service"]=0
-        fi
-    done
-
-    if (( any_inactive == 0 )); then
-        log_green "$(date) INFO: All services are active"
-        return 0
-    else
-        log_red "$(date) INFO: One or more services are inactive"
-        return 1
-    fi
-}
-
-########################################
-# Main Monitoring Loop
-########################################
-while true; do
-    sleep 61
-    log_blue "----------------------------------------"
-    log_blue "$(date) INFO: Starting monitoring check"
-    any_issue=0
-
-    # 1) Disk usage
-    check_disk_space || any_issue=1
-
-    # 2) 'analyzing_now' file
-    check_analyzing_now || any_issue=1
-
-    # 3) Queue check
-    check_queue || any_issue=1
-
-    # 4) Services check
-    check_services || any_issue=1
-
-    # Final summary
-    if (( any_issue == 0 )); then
-        log_green "$(date) INFO: All systems are functioning normally"
-        apprisealert_recovery
-    else
-        log_red "$(date) INFO: Issues detected. System status is not fully operational."
-    fi
-    log_blue "----------------------------------------"
-done
--- a/battybirdnet-pi/rootfs/etc/cont-finish.d/savestreamdata.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-finish.d/savestreamdata.sh
@@ -1,51 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-
-# Maximum file size in bytes (50MB)
-MAX_SIZE=$((50 * 1024 * 1024))
-
-# Function to check if a file is a valid WAV
-is_valid_wav() {
-    local file="$1"
-    # Check if the file contains a valid WAV header
-    file "$file" | grep -qE 'WAVE audio'
-}
-
-if [ -d "$HOME"/BirdSongs/StreamData ]; then
-    bashio::log.fatal "Container stopping, saving temporary files."
-
-    # Stop the services in parallel
-    if systemctl is-active --quiet birdnet_analysis; then
-        bashio::log.info "Stopping birdnet_analysis service."
-        systemctl stop birdnet_analysis &
-    fi
-
-    if systemctl is-active --quiet birdnet_recording; then
-        bashio::log.info "Stopping birdnet_recording service."
-        systemctl stop birdnet_recording &
-    fi
-
-    # Wait for both services to stop
-    wait
-
-    # Create the destination directory
-    mkdir -p /data/StreamData
-
-    # Move only valid WAV files under 50MB
-    shopt -s nullglob  # Prevent errors if no files match
-    for file in "$HOME"/BirdSongs/StreamData/*.wav; do
-        if [ -f "$file" ] && [ "$(stat --format="%s" "$file")" -lt "$MAX_SIZE" ] && is_valid_wav "$file"; then
-            if mv -v "$file" /data/StreamData/; then
-                bashio::log.info "Moved valid WAV file: $(basename "$file")"
-            else
-                bashio::log.error "Failed to move: $(basename "$file")"
-            fi
-        else
-            bashio::log.warning "Skipping invalid or large file: $(basename "$file")"
-        fi
-    done
-
-    bashio::log.info "... files safe, allowing container to stop."
-else
-    bashio::log.info "No StreamData directory to process."
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/01-structure.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/01-structure.sh
@@ -1,115 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-###############
-# SET /CONFIG #
-###############
-
-bashio::log.info "Ensuring the file structure is correct:"
-
-# Create default configuration files if not present
-echo "... creating default files"
-DEFAULT_FILES=("apprise.txt" "exclude_species_list.txt" "IdentifiedSoFar.txt" "disk_check_exclude.txt" "confirmed_species_list.txt" "blacklisted_images.txt" "whitelist_species_list.txt")
-for file in "${DEFAULT_FILES[@]}"; do
-    if [ ! -f "/config/$file" ]; then
-        echo "" > "/config/$file"
-    fi
-done
-touch /config/include_species_list.txt # Ensure this is always created
-
-# Set BirdSongs folder location from configuration if specified
-BIRDSONGS_FOLDER="/config/BirdSongs"
-if bashio::config.has_value "BIRDSONGS_FOLDER"; then
-    BIRDSONGS_FOLDER_OPTION="$(bashio::config "BIRDSONGS_FOLDER")"
-    echo "... BIRDSONGS_FOLDER set to $BIRDSONGS_FOLDER_OPTION"
-    mkdir -p "$BIRDSONGS_FOLDER_OPTION" || bashio::log.fatal "...... folder couldn't be created"
-    chown -R pi:pi "$BIRDSONGS_FOLDER_OPTION" || bashio::log.fatal "...... folder couldn't be given permissions for 1000:1000"
-    if [ -d "$BIRDSONGS_FOLDER_OPTION" ] && [ "$(stat -c '%u:%g' "$BIRDSONGS_FOLDER_OPTION")" == "1000:1000" ]; then
-        BIRDSONGS_FOLDER="$BIRDSONGS_FOLDER_OPTION"
-    else
-        bashio::log.warning "BIRDSONGS_FOLDER reverted to /config/BirdSongs"
-    fi
-fi
-
-# Create default folders
-echo "... creating default folders; it is highly recommended to store these on an SSD"
-mkdir -p "$BIRDSONGS_FOLDER/By_Date" "$BIRDSONGS_FOLDER/Charts"
-
-# Use tmpfs if installed
-if df -T /tmp | grep -q "tmpfs"; then
-    echo "... tmpfs detected, using it for StreamData and Processed to reduce disk wear"
-    mkdir -p /tmp/StreamData /tmp/Processed
-    [ -d "$HOME/BirdSongs/StreamData" ] && rm -r "$HOME/BirdSongs/StreamData"
-    [ -d "$HOME/BirdSongs/Processed" ] && rm -r "$HOME/BirdSongs/Processed"
-    sudo -u pi ln -fs /tmp/StreamData "$HOME/BirdSongs/StreamData"
-    sudo -u pi ln -fs /tmp/Processed "$HOME/BirdSongs/Processed"
-fi
-
-# Set permissions for created files and folders
-echo "... setting permissions for user pi"
-chown -R pi:pi /config /etc/birdnet "$BIRDSONGS_FOLDER" /tmp
-chmod -R 755 /config /etc/birdnet "$BIRDSONGS_FOLDER" /tmp
-
-# Backup default birdnet.conf for sanity check
-cp "$HOME/BirdNET-Pi/birdnet.conf" "$HOME/BirdNET-Pi/birdnet.bak"
-
-# Create default birdnet.conf if not existing
-if [ ! -f /config/birdnet.conf ]; then
-    cp -f "$HOME/BirdNET-Pi/birdnet.conf" /config/
-fi
-
-# Create default birds.db
-if [ ! -f /config/birds.db ]; then
-    echo "... creating initial db"
-    "$HOME/BirdNET-Pi/scripts/createdb.sh"
-    cp "$HOME/BirdNET-Pi/scripts/birds.db" /config/
-elif [ "$(stat -c%s /config/birds.db)" -lt 10240 ]; then
-    echo "... your db is corrupted, creating new one"
-    rm /config/birds.db
-    "$HOME/BirdNET-Pi/scripts/createdb.sh"
-    cp "$HOME/BirdNET-Pi/scripts/birds.db" /config/
-fi
-
-# Symlink configuration files
-echo "... creating symlinks for configuration files"
-CONFIG_FILES=("$HOME/BirdNET-Pi/birdnet.conf" "$HOME/BirdNET-Pi/scripts/whitelist_species_list.txt" "$HOME/BirdNET-Pi/blacklisted_images.txt" "$HOME/BirdNET-Pi/scripts/birds.db" "$HOME/BirdNET-Pi/BirdDB.txt" "$HOME/BirdNET-Pi/scripts/disk_check_exclude.txt" "$HOME/BirdNET-Pi/apprise.txt" "$HOME/BirdNET-Pi/exclude_species_list.txt" "$HOME/BirdNET-Pi/include_species_list.txt" "$HOME/BirdNET-Pi/IdentifiedSoFar.txt" "$HOME/BirdNET-Pi/scripts/confirmed_species_list.txt")
-
-for file in "${CONFIG_FILES[@]}"; do
-    filename="${file##*/}"
-    [ ! -f "/config/$filename" ] && touch "/config/$filename"
-    [ -e "$file" ] && rm "$file"
-    sudo -u pi ln -fs "/config/$filename" "$file"
-    sudo -u pi ln -fs "/config/$filename" "$HOME/BirdNET-Pi/scripts/$filename"
-    sudo -u pi ln -fs "/config/$filename" "/etc/birdnet/$filename"
-done
-
-# Symlink BirdSongs folders
-for folder in By_Date Charts; do
-    echo "... creating symlink for $BIRDSONGS_FOLDER/$folder"
-    [ -d "$HOME/BirdSongs/Extracted/${folder:?}" ] && rm -r "$HOME/BirdSongs/Extracted/$folder"
-    sudo -u pi ln -fs "$BIRDSONGS_FOLDER/$folder" "$HOME/BirdSongs/Extracted/$folder"
-done
-
-# Set permissions for newly created files and folders
-echo "... checking and setting permissions"
-chmod -R 755 /config/*
-chmod 777 /config
-
-# Create folder for matplotlib
-echo "... setting up Matplotlabdir"
-mkdir -p "$HOME"/.cache/matplotlib
-chown -R "pi:pi" "$HOME"/.cache/matplotlib
-chmod 777 "$HOME"/.cache/matplotlib
-
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/02-restorestreamdata.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/02-restorestreamdata.sh
@@ -1,52 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-######################
-# RESTORE STREAMDATA #
-######################
-
-if [ -d /config/TemporaryFiles ]; then
-
-    # Check if there are .wav files in /config/TemporaryFiles
-    if find /config/TemporaryFiles -type f -name "*.wav" | grep -q .; then
-        bashio::log.warning "Container was stopped while files were still being analyzed."
-        echo "... restoring .wav files from /config/TemporaryFiles to $HOME/BirdSongs/StreamData."
-
-        # Create the destination directory if it does not exist
-        mkdir -p "$HOME"/BirdSongs/StreamData
-
-        # Count the number of .wav files to be moved
-        file_count=$(find /config/TemporaryFiles -type f -name "*.wav" | wc -l)
-        echo "... found $file_count .wav files to restore."
-
-        # Move the .wav files using `mv` to avoid double log entries
-        mv -v /config/TemporaryFiles/*.wav "$HOME"/BirdSongs/StreamData/
-        rm -r /config/TemporaryFiles
-
-        # Update permissions only if files were moved successfully
-        if [ "$file_count" -gt 0 ]; then
-            chown -R pi:pi "$HOME"/BirdSongs/StreamData
-        fi
-
-        echo "... $file_count files restored successfully."
-    else
-        echo "... no .wav files found to restore."
-    fi
-
-    # Clean up the source folder if it is empty
-    if [ -z "$(ls -A /config/TemporaryFiles)" ]; then
-        rm -r /config/TemporaryFiles
-    fi
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/31-checks.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/31-checks.sh
@@ -1,75 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-######################
-# CHECK BIRDNET.CONF #
-######################
-
-bashio::log.info "Checking your birdnet.conf file integrity"
-
-# Set variables
-configcurrent="$HOME"/BirdNET-Pi/birdnet.conf
-configtemplate="$HOME"/BirdNET-Pi/birdnet.bak
-
-# Ensure both files exist before proceeding
-if [ ! -f "$configcurrent" ] || [ ! -f "$configtemplate" ]; then
-    bashio::log.fatal "Missing required birdnet.conf or birdnet.bak file. Please ensure both are present."
-    exit 1
-fi
-
-# Extract variable names from config template and read each one
-grep -o '^[^#=]*=' "$configtemplate" | sed 's/=//' | while read -r var; do
-    # Check if the variable is in configcurrent, if not, append it
-    if ! grep -q "^$var=" "$configcurrent"; then
-        bashio::log.warning "...$var was missing from your birdnet.conf file, it was re-added"
-        grep "^$var=" "$configtemplate" >> "$configcurrent"
-    fi
-    # Check for duplicates
-    if [ "$(grep -c "^$var=" "$configcurrent")" -gt 1 ]; then
-        bashio::log.error "Duplicate variable $var found in $configcurrent, all were commented out except for the first one"
-        sed -i "0,/^$var=/!s/^$var=/#$var=/" "$configcurrent"
-    fi
-done
-
-##############
-# CHECK PORT #
-##############
-
-if [[ "$(bashio::addon.port "80")" == 3000 ]]; then
-    bashio::log.fatal "This is crazy but your port is set to 3000 and streamlit doesn't accept this port! You need to change it from the addon options and restart. Thanks"
-    sleep infinity
-fi
-
-##################
-# PERFORM UPDATE #
-##################
-
-bashio::log.info "Performing potential updates"
-
-# Adapt update_birdnet_snippets
-sed -i "s|systemctl list-unit-files|false \&\& echo|g" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Avoid systemctl
-sed -i "/systemctl /d" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Avoid systemctl
-sed -i "/install_tmp_mount/d" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Use HA tmp
-sed -i "/find /d" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Not useful
-sed -i "/set -x/d" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Not useful
-sed -i "/restart_services/d" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh  # Not useful
-sed -i "s|/etc/birdnet/birdnet.conf|/config/birdnet.conf|g" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh
-sed -i "/update_caddyfile/c echo \"yes\"" "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh # Avoid systemctl
-
-# Execute update_birdnet_snippets
-export RECS_DIR="$HOME/BirdSongs"
-export EXTRACTED="$HOME/BirdSongs/Extracted"
-chmod +x "$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh
-"$HOME"/BirdNET-Pi/scripts/update_birdnet_snippets.sh
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/33-mqtt.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/33-mqtt.sh
@@ -1,84 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-############
-# SET MQTT #
-############
-
-# Function to perform common setup steps
-common_steps () {
-    # Attempt to connect to the MQTT broker
-    TOPIC="birdnet"
-    if mosquitto_pub -h "$MQTT_HOST" -p "$MQTT_PORT" -t "$TOPIC" -m "test" -u "$MQTT_USER" -P "$MQTT_PASS" -q 1 -d --will-topic "$TOPIC" --will-payload "Disconnected" --will-qos 1 --will-retain > /dev/null 2>&1; then
-        # Adapt script with MQTT settings
-        sed -i "s|%%mqtt_server%%|$MQTT_HOST|g" /helpers/birdnet_to_mqtt.py
-        sed -i "s|%%mqtt_port%%|$MQTT_PORT|g" /helpers/birdnet_to_mqtt.py
-        sed -i "s|%%mqtt_user%%|$MQTT_USER|g" /helpers/birdnet_to_mqtt.py
-        sed -i "s|%%mqtt_pass%%|$MQTT_PASS|g" /helpers/birdnet_to_mqtt.py
-
-        # Copy script to the appropriate directory
-        cp /helpers/birdnet_to_mqtt.py "$HOME"/BirdNET-Pi/scripts/utils/birdnet_to_mqtt.py
-        chown pi:pi "$HOME"/BirdNET-Pi/scripts/utils/birdnet_to_mqtt.py
-        chmod +x "$HOME"/BirdNET-Pi/scripts/utils/birdnet_to_mqtt.py
-
-        # Add hooks to the main analysis script
-        sed -i "/load_global_model, run_analysis/a from utils.birdnet_to_mqtt import automatic_mqtt_publish" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-        sed -i '/write_to_db(/a\                automatic_mqtt_publish(file, detection, os.path.basename(detection.file_name_extr))' "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    else
-        bashio::log.fatal "MQTT connection failed, it will not be configured"
-    fi
-}
-
-# Check if MQTT service is available and not disabled
-if bashio::services.available 'mqtt' && ! bashio::config.true 'MQTT_DISABLED'; then
-    bashio::log.green "---"
-    bashio::log.blue "MQTT addon is active on your system! Birdnet-pi is now automatically configured to send its output to MQTT"
-    bashio::log.blue "MQTT user : $(bashio::services "mqtt" "username")"
-    bashio::log.blue "MQTT password : $(bashio::services "mqtt" "password")"
-    bashio::log.blue "MQTT broker : tcp://$(bashio::services "mqtt" "host"):$(bashio::services "mqtt" "port")"
-    bashio::log.green "---"
-    bashio::log.blue "Data will be posted to the topic : 'birdnet'"
-    bashio::log.blue "Json data : {'Date', 'Time', 'ScientificName', 'CommonName', 'Confidence', 'SpeciesCode', 'ClipName', 'url'}"
-    bashio::log.blue "---"
-
-    # Apply MQTT settings
-    MQTT_HOST="$(bashio::services "mqtt" "host")"
-    MQTT_PORT="$(bashio::services "mqtt" "port")"
-    MQTT_USER="$(bashio::services "mqtt" "username")"
-    MQTT_PASS="$(bashio::services "mqtt" "password")"
-
-    # Perform common setup steps
-    common_steps
-
-# Check if manual MQTT configuration is provided
-elif bashio::config.has_value "MQTT_HOST_manual" && bashio::config.has_value "MQTT_PORT_manual"; then
-    bashio::log.green "---"
-    bashio::log.blue "MQTT is manually configured in the addon options"
-    bashio::log.blue "Birdnet-pi is now automatically configured to send its output to MQTT"
-    bashio::log.green "---"
-    bashio::log.blue "Data will be posted to the topic : 'birdnet'"
-    bashio::log.blue "Json data : {'Date', 'Time', 'ScientificName', 'CommonName', 'Confidence', 'SpeciesCode', 'ClipName', 'url'}"
-    bashio::log.blue "---"
-
-    # Apply manual MQTT settings
-    MQTT_HOST="$(bashio::config "MQTT_HOST_manual")"
-    MQTT_PORT="$(bashio::config "MQTT_PORT_manual")"
-    MQTT_USER="$(bashio::config "MQTT_USER_manual")"
-    MQTT_PASS="$(bashio::config "MQTT_PASSWORD_manual")"
-
-    # Perform common setup steps
-    common_steps
-
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh
@@ -1,66 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-################
-# ADD FEATURES #
-################
-
-bashio::log.info "Adding optional features"
-
-# Enable the Processed folder
-#############################
-
-if bashio::config.true "PROCESSED_FOLDER_ENABLED" && ! grep -q "processed_size" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py; then
-    echo "... Enabling the Processed folder : the last 15 wav files will be stored there"
-    # Adapt config.php
-    sed -i "/GET\[\"info_site\"\]/a\  \$processed_size = \$_GET\[\"processed_size\"\];" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\$contents = file_get_contents/a\  \$contents = preg_replace\(\"/PROCESSED_SIZE=\.\*/\", \"PROCESSED_SIZE=\$processed_size\", \$contents\);" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      <table class=\"settingstable\"><tr><td>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      <h2>Processed folder management </h2>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      <label for=\"processed_size\">Amount of files to keep after analysis :</label>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      <input name=\"processed_size\" type=\"number\" style=\"width:6em;\" max=\"90\" min=\"0\" step=\"1\" value=\"<\?php print(\$config\['PROCESSED_SIZE'\]);?>\"/>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      </td></tr><tr><td>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      Processed is the directory where the formerly 'Analyzed' files are moved after extractions, mostly for troubleshooting purposes.<br>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      This value defines the maximum amount of files that are kept before replacement with new files.<br>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i      </td></tr></table>" "$HOME"/BirdNET-Pi/scripts/config.php
-    sed -i "/\"success\"/i\      <br>" "$HOME"/BirdNET-Pi/scripts/config.php
-    # Adapt birdnet_analysis.py - move_to_processed
-    sed -i "/log.info('handle_reporting_queue done')/a\        os.remove(files.pop(0))" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    while len(files) > processed_size:" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    files.sort(key=os.path.getmtime)" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    files = glob.glob(os.path.join(processed_dir, '*'))" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    os.rename(file_name, os.path.join(processed_dir, os.path.basename(file_name)))" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    processed_dir = os.path.join(get_settings()['RECS_DIR'], 'Processed')" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\def move_to_processed(file_name, processed_size):" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\ " "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    # Adapt birdnet_analysis.py - get_processed_size
-    sed -i "/log.info('handle_reporting_queue done')/a\        return 0" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    except (ValueError, TypeError):" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\        return processed_size if isinstance(processed_size, int) else 0" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\        processed_size = get_settings().getint('PROCESSED_SIZE')" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\    try:" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\def get_processed_size():" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/log.info('handle_reporting_queue done')/a\ " "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    # Modify calls
-    sed -i "/from subprocess import CalledProcessError/a\import glob" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/from subprocess import CalledProcessError/a\import time" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    # Modify main code
-    sed -i "/os.remove(file.file_name)/i\            processed_size = get_processed_size()" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/os.remove(file.file_name)/i\            if processed_size > 0:" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/os.remove(file.file_name)/i\                move_to_processed(file.file_name, processed_size)" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/os.remove(file.file_name)/i\            else:" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-    sed -i "/os.remove(file.file_name)/c\	            os.remove(file.file_name)" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
-fi || true
-
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/81-modifications.sh
@@ -1,139 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash disable=SC2016
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-################
-# MODIFY WEBUI #
-################
-
-bashio::log.info "Adapting webui"
-
-# Remove services tab from webui
-echo "... removing System Controls from webui as should be used from HA"
-sed -i '/>System Controls/d' "$HOME/BirdNET-Pi/homepage/views.php"
-
-# Remove Ram drive option from webui
-echo "... removing Ram drive from webui as it is handled from HA"
-if grep -q "Ram drive" "$HOME/BirdNET-Pi/scripts/service_controls.php"; then
-    sed -i '/Ram drive/{n;s/center"/center" style="display: none;"/;}' "$HOME/BirdNET-Pi/scripts/service_controls.php"
-    sed -i '/Ram drive/d' "$HOME/BirdNET-Pi/scripts/service_controls.php"
-fi
-
-# Correct services to start as user pi
-echo "... updating services to start as user pi"
-if ! grep -q "/usr/bin/sudo" "$HOME/BirdNET-Pi/templates/birdnet_log.service"; then
-    while IFS= read -r file; do
-        if [[ "$(basename "$file")" != "birdnet_log.service" ]]; then
-            sed -i "s|ExecStart=|ExecStart=/usr/bin/sudo -u pi |g" "$file"
-        fi
-    done < <(find "$HOME/BirdNET-Pi/templates/" -name "birdnet*.service" -print)
-fi
-
-# Send services log to container logs
-echo "... redirecting services logs to container logs"
-while IFS= read -r file; do
-    sed -i "/StandardError/d" "$file"
-    sed -i "/StandardOutput/d" "$file"
-    sed -i "/\[Service/a StandardError=append:/proc/1/fd/1" "$file"
-    sed -i "/\[Service/a StandardOutput=append:/proc/1/fd/1" "$file"
-done < <(find "$HOME/BirdNET-Pi/templates/" -name "*.service" -print)
-
-# Avoid preselection in include and exclude lists
-echo "... disabling preselecting options in include and exclude lists"
-sed -i "s|option selected|option disabled|g" "$HOME/BirdNET-Pi/scripts/include_list.php"
-sed -i "s|option selected|option disabled|g" "$HOME/BirdNET-Pi/scripts/exclude_list.php"
-
-# Preencode API key
-if ! grep -q "221160312" "$HOME/BirdNET-Pi/scripts/common.php"; then
-    sed -i "/return \$_SESSION\['my_config'\];/i\ \ \ \ if (isset(\$_SESSION\['my_config'\]) \&\& empty(\$_SESSION\['my_config'\]\['FLICKR_API_KEY'\])) {\n\ \ \ \ \ \ \ \ \$_SESSION\['my_config'\]\['FLICKR_API_KEY'\] = \"221160312e1c22\";\n\ \ \ \ }" "$HOME"/BirdNET-Pi/scripts/common.php
-    sed -i "s|e1c22|e1c22ec60ecf336951b0e77|g" "$HOME"/BirdNET-Pi/scripts/common.php
-fi
-
-# Correct log services to show /proc/1/fd/1
-echo "... redirecting birdnet_log service output to /logs"
-sed -i "/User=pi/d" "$HOME/BirdNET-Pi/templates/birdnet_log.service"
-sed -i "s|birdnet_log.sh|cat /proc/1/fd/1|g" "$HOME/BirdNET-Pi/templates/birdnet_log.service"
-
-# Correct backup script
-echo "... correct backup script"
-sed -i "/PHP_SERVICE=/c PHP_SERVICE=\$(systemctl list-unit-files -t service --no-pager | grep 'php' | grep 'fpm' | awk '{print \$1}')" "$HOME/BirdNET-Pi/scripts/backup_data.sh"
-
-# Caddyfile modifications
-echo "... modifying Caddyfile configurations"
-caddy fmt --overwrite /etc/caddy/Caddyfile
-#Change port to leave 80 free for certificate requests
-if ! grep -q "http://:8081" /etc/caddy/Caddyfile; then
-    sed -i "s|http://|http://:8081|g" /etc/caddy/Caddyfile
-    sed -i "s|http://|http://:8081|g" "$HOME/BirdNET-Pi/scripts/update_caddyfile.sh"
-    if [ -f /etc/caddy/Caddyfile.original ]; then
-        rm /etc/caddy/Caddyfile.original
-    fi
-fi
-
-# Correct webui paths
-echo "... correcting webui paths"
-if ! grep -q "/stats/" "$HOME/BirdNET-Pi/homepage/views.php"; then
-    sed -i "s|/stats|/stats/|g" "$HOME/BirdNET-Pi/homepage/views.php"
-    sed -i "s|/log|/log/|g" "$HOME/BirdNET-Pi/homepage/views.php"
-fi
-
-# Check if port 80 is correctly configured
-if [ -n "$(bashio::addon.port "80")" ] && [ "$(bashio::addon.port "80")" != 80 ]; then
-    bashio::log.fatal "The port 80 is enabled, but should still be 80 if you want automatic SSL certificates generation to work."
-fi
-
-# Correct systemctl path
-#echo "... updating systemctl path"
-#if [[ -f /helpers/systemctl3.py ]]; then
-#    mv /helpers/systemctl3.py /bin/systemctl
-#    chmod a+x /bin/systemctl
-#fi
-
-# Improve streamlit cache
-#echo "... add streamlit cache"
-#sed -i "/def get_data/i \\@st\.cache_resource\(\)" "$HOME/BirdNET-Pi/scripts/plotly_streamlit.py"
-
-# Allow reverse proxy for streamlit
-echo "... allow reverse proxy for streamlit"
-sed -i "s|plotly_streamlit.py --browser.gatherUsageStats|plotly_streamlit.py --server.enableXsrfProtection=false --server.enableCORS=false --browser.gatherUsageStats|g" "$HOME/BirdNET-Pi/templates/birdnet_stats.service"
-
-# Clean saved mp3 files
-echo ".. add highpass and lowpass to sox extracts"
-sed -i "s|f'={stop}']|f'={stop}', 'highpass', '250', 'lowpass', '15000']|g" "$HOME/BirdNET-Pi/scripts/utils/reporting.py"
-sed -i '/sox.*-V1/s/spectrogram/highpass 250 spectrogram/' "$HOME/BirdNET-Pi/scripts/spectrogram.sh"
-
-# Correct timedatectl path
-echo "updating timedatectl path"
-if [[ -f /helpers/timedatectl ]]; then
-    mv /helpers/timedatectl /usr/bin/timedatectl
-    chown pi:pi /usr/bin/timedatectl
-    chmod a+x /usr/bin/timedatectl
-fi
-
-# Correct timezone showing in config.php
-# shellcheck disable=SC2016
-echo "... updating timezone in config.php"
-sed -i -e '/<option disabled selected>/s/selected//' \
-       -e '/\$current_timezone = trim(shell_exec("timedatectl show --value --property=Timezone"));/d' \
-       -e "/\$date = new DateTime('now');/i \$current_timezone = trim(shell_exec(\"timedatectl show --value --property=Timezone\"));" \
-       -e "/\$date = new DateTime('now');/i date_default_timezone_set(\$current_timezone);" "$HOME/BirdNET-Pi/scripts/config.php"
-
-# Correct language labels according to birdnet.conf
-echo "... adapting labels according to birdnet.conf"
-if export "$(grep "^DATABASE_LANG" /config/birdnet.conf)"; then
-    bashio::log.info "Setting language to ${DATABASE_LANG:-en}"
-    "$HOME/BirdNET-Pi/scripts/install_language_label_nm.sh" -l "${DATABASE_LANG:-}" &>/dev/null || bashio::log.warning "Failed to update language labels"
-else
-    bashio::log.warning "DATABASE_LANG not found in configuration. Using default labels."
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/91-nginx_ingress.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/91-nginx_ingress.sh
@@ -1,74 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-#################
-# NGINX SETTING #
-#################
-
-# Variables
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-ingress_entry=$(bashio::addon.ingress_entry)
-
-# Quits if ingress is not active
-if [[ "$ingress_entry" != "/api"* ]]; then
-    bashio::log.info "Ingress entry is not set, exiting configuration."
-    sed -i "1a sleep infinity" /custom-services.d/02-nginx.sh
-    exit 0
-fi
-
-bashio::log.info "Adapting for ingress"
-echo "... setting up nginx"
-
-# Check if the NGINX configuration file exists
-nginx_conf="/etc/nginx/servers/ingress.conf"
-if [ -f "$nginx_conf" ]; then
-    sed -i "s/%%port%%/${ingress_port}/g" "$nginx_conf"
-    sed -i "s/%%interface%%/${ingress_interface}/g" "$nginx_conf"
-    sed -i "s|%%ingress_entry%%|${ingress_entry}|g" "$nginx_conf"
-else
-    bashio::log.error "NGINX configuration file not found: $nginx_conf"
-    exit 1
-fi
-
-# Disable log
-sed -i "/View Log/d" "$HOME/BirdNET-Pi/homepage/views.php"
-
-echo "... ensuring restricted area access"
-echo "${ingress_entry}" > /ingress_url
-
-# Modify PHP file safely
-php_file="$HOME/BirdNET-Pi/scripts/common.php"
-if [ -f "$php_file" ]; then
-    sed -i "/function is_authenticated/a if (strpos(\$_SERVER['HTTP_REFERER'], '/api/hassio_ingress') !== false && strpos(\$_SERVER['HTTP_REFERER'], trim(file_get_contents('/ingress_url'))) !== false) { \$ret = true; return \$ret; }" "$php_file"
-else
-    bashio::log.error "PHP file not found: $php_file"
-    exit 1
-fi
-
-echo "... adapting Caddyfile for ingress"
-chmod +x /helpers/caddy_ingress.sh
-
-# Correct script execution
-/helpers/caddy_ingress.sh
-
-# Update the Caddyfile if update script exists
-caddy_update_script="$HOME/BirdNET-Pi/scripts/update_caddyfile.sh"
-if [ -f "$caddy_update_script" ]; then
-    sed -i "/sudo caddy fmt --overwrite/i /helpers/caddy_ingress.sh" "$caddy_update_script"
-else
-    bashio::log.error "Caddy update script not found: $caddy_update_script"
-    exit 1
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/92-ssl.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/92-ssl.sh
@@ -1,50 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-###############
-# SSL SETTING #
-###############
-
-if bashio::config.true 'ssl'; then
-    bashio::log.info "SSL is enabled using addon options, setting up NGINX and Caddy."
-
-    # Check required SSL configurations
-    bashio::config.require.ssl
-    certfile=$(bashio::config 'certfile')
-    keyfile=$(bashio::config 'keyfile')
-
-    # Ensure Caddyfile exists before modifying
-    caddyfile="/etc/caddy/Caddyfile"
-    if [ -f "$caddyfile" ]; then
-        sed -i "2a\    tls /ssl/${certfile} /ssl/${keyfile}" "$caddyfile"
-        sed -i "s|http://:8081|https://:8081|g" "$caddyfile"
-    else
-        bashio::log.error "Caddyfile not found at $caddyfile, skipping SSL configuration."
-        exit 1
-    fi
-
-    # Ensure update_caddyfile.sh exists before modifying
-    update_script="$HOME/BirdNET-Pi/scripts/update_caddyfile.sh"
-    if [ -f "$update_script" ]; then
-        sed -i "s|http://:8081|https://:8081|g" "$update_script"
-        if ! grep -q "tls /ssl/${certfile} /ssl/${keyfile}" "$update_script"; then
-            sed -i "/https:/a\    tls /ssl/${certfile} /ssl/${keyfile}" "$update_script"
-        fi
-    else
-        bashio::log.error "Update script not found: $update_script, skipping SSL setup for update."
-        exit 1
-    fi
-fi
-
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/98-oldcpu.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/98-oldcpu.sh
@@ -1,37 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash disable=SC1091
-set -e
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-######################
-# INSTALL TENSORFLOW #
-######################
-
-# Check if the CPU supports AVX2
-if [[ "$(uname -m)" = "x86_64" ]]; then
-  if lscpu | grep -q "Flags"; then
-    if ! lscpu | grep -q "avx2"; then
-        bashio::log.warning "NON SUPPORTED CPU DETECTED"
-        bashio::log.warning "Your cpu doesn't support avx2, the analyzer service will likely won't work"
-        bashio::log.warning "Trying to install tensorflow instead of tflite_runtime instead. This might take some time (up to 5 minutes)."
-        bashio::log.warning "You could try also Birdnet-Go which should supports your cpu"
-        source /home/pi/BirdNET-Pi/birdnet/bin/activate
-        mkdir -p /home/pi/.cache/pip || true &>/dev/null
-        chmod 777 /home/pi/.cache/pip || true &>/dev/null
-        pip3 uninstall -y tflite_runtime
-        pip install --upgrade packaging==23.2
-        pip3 install --upgrade --force-reinstall "https://github.com/snowzach/tensorflow-multiarch/releases/download/v2.16.1/tensorflow-2.16.1-cp311-cp311-linux_x86_64.whl"
-        deactivate
-    fi
-  fi
-fi
--- a/battybirdnet-pi/rootfs/etc/cont-init.d/99-run.sh
+++ b/battybirdnet-pi/rootfs/etc/cont-init.d/99-run.sh
@@ -1,82 +0,0 @@
-#!/command/with-contenv bashio
-# shellcheck shell=bash
-
-set -eu
-
-##################
-# ALLOW RESTARTS #
-##################
-
-if [[ "${BASH_SOURCE[0]}" == /etc/cont-init.d/* ]]; then
-    mkdir -p /etc/scripts-init
-    sed -i "s|/etc/cont-init.d|/etc/scripts-init|g" /ha_entrypoint.sh
-    sed -i "/ rm/d" /ha_entrypoint.sh
-    cp "${BASH_SOURCE[0]}" /etc/scripts-init/
-fi
-
-##############
-# SET SYSTEM #
-##############
-
-# Set password
-bashio::log.info "Setting password for the user pi"
-if bashio::config.has_value "pi_password"; then
-    echo "pi:$(bashio::config "pi_password")" | chpasswd
-fi
-bashio::log.info "Password set successfully for user pi."
-
-# Use timezone defined in add-on options if available
-bashio::log.info "Setting timezone :"
-if bashio::config.has_value 'TZ'; then
-    TZ_VALUE="$(bashio::config 'TZ')"
-    if timedatectl set-timezone "$TZ_VALUE"; then
-        echo "... timezone set to $TZ_VALUE as defined in add-on options (BirdNET config ignored)."
-    else
-        bashio::log.warning "Couldn't set timezone to $TZ_VALUE. Refer to the list of valid timezones: https://manpages.ubuntu.com/manpages/focal/man3/DateTime::TimeZone::Catalog.3pm.html"
-        timedatectl set-ntp true &>/dev/null
-    fi
-# Use BirdNET-defined timezone if no add-on option is provided
-elif [ -f /data/timezone ]; then
-    BIRDN_CONFIG_TZ="$(cat /data/timezone)"
-    timedatectl set-ntp false &>/dev/null
-    if timedatectl set-timezone "$BIRDN_CONFIG_TZ"; then
-        echo "... set to $BIRDN_CONFIG_TZ as defined in BirdNET config."
-    else
-        bashio::log.warning "Couldn't set timezone to $BIRDN_CONFIG_TZ. Reverting to automatic timezone."
-        timedatectl set-ntp true &>/dev/null
-    fi
-# Fallback to automatic timezone if no manual settings are found
-else
-    if timedatectl set-ntp true &>/dev/null; then
-        bashio::log.info "... automatic timezone enabled."
-    else
-        bashio::log.fatal "Couldn't set automatic timezone! Please set a manual one from the options."
-    fi
-fi || true
-
-# Fix timezone as per installer
-CURRENT_TIMEZONE="$(timedatectl show --value --property=Timezone)"
-[ -f /etc/timezone ] && echo "$CURRENT_TIMEZONE" | sudo tee /etc/timezone > /dev/null
-
-bashio::log.info "Starting system services"
-
-bashio::log.info "Starting cron service"
-systemctl start cron >/dev/null
-
-bashio::log.info "Starting dbus service"
-service dbus start >/dev/null
-
-bashio::log.info "Starting BirdNET-Pi services"
-chmod +x "$HOME/BirdNET-Pi/scripts/restart_services.sh" >/dev/null
-"$HOME/BirdNET-Pi/scripts/restart_services.sh" >/dev/null
-
-# Start livestream services if enabled in configuration
-if bashio::config.true "LIVESTREAM_BOOT_ENABLED"; then
-    echo "... starting livestream services"
-    systemctl enable icecast2 >/dev/null
-    systemctl start icecast2.service >/dev/null
-    systemctl enable --now livestream.service >/dev/null
-fi
-
-# Start
-bashio::log.info "✅ Setup complete."
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/mime.types
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/mime.types
@@ -1,96 +0,0 @@
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    font/woff                                        woff;
-    font/woff2                                       woff2;
-
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/proxy_params.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/proxy_params.conf
@@ -1,16 +0,0 @@
-proxy_http_version          1.1;
-proxy_ignore_client_abort   off;
-proxy_read_timeout          86400s;
-proxy_redirect              off;
-proxy_send_timeout          86400s;
-proxy_max_temp_file_size    0;
-
-proxy_hide_header X-Frame-Options;
-proxy_set_header Accept-Encoding "";
-proxy_set_header Connection $connection_upgrade;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Host $http_host;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header X-NginX-Proxy true;
-proxy_set_header X-Real-IP $remote_addr; 
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/resolver.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/resolver.conf
@@ -1 +0,0 @@
-resolver 127.0.0.11 ipv6=off;
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/server_params.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/server_params.conf
@@ -1,6 +0,0 @@
-root            /dev/null;
-server_name     $hostname;
-
-add_header X-Content-Type-Options nosniff;
-add_header X-XSS-Protection "1; mode=block";
-add_header X-Robots-Tag none;
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/ssl_params.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/ssl_params.conf
@@ -1,9 +0,0 @@
-ssl_protocols TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
-ssl_ecdh_curve secp384r1;
-ssl_session_timeout  10m;
-ssl_session_cache shared:SSL:10m;
-ssl_session_tickets off;
-ssl_stapling on;
-ssl_stapling_verify on;
--- a/battybirdnet-pi/rootfs/etc/nginx/includes/upstream.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/includes/upstream.conf
@@ -1,3 +0,0 @@
-upstream backend {
-    server 127.0.0.1:80;
-}
--- a/battybirdnet-pi/rootfs/etc/nginx/nginx.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/nginx.conf
@@ -1,78 +0,0 @@
-
-# Run nginx in foreground.
-daemon off;
-
-# This is run inside Docker.
-user root;
-
-# Pid storage location.
-pid /var/run/nginx.pid;
-
-# Set number of worker processes.
-worker_processes auto;
-
-# Enables the use of JIT for regular expressions to speed-up their processing.
-pcre_jit on;
-
-# Write error log to Hass.io add-on log.
-error_log /proc/1/fd/1 error;
-
-# Load allowed environment vars
-env HASSIO_TOKEN;
-
-# Load dynamic modules.
-include /etc/nginx/modules/*.conf;
-
-# Max num of simultaneous connections by a worker process.
-events {
-    worker_connections 8192;
-}
-
-http {
-    include /etc/nginx/includes/mime.types;
-
-    # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/
-    server_names_hash_bucket_size 64;
-    gzip_disable            "msie6";
-    gzip_comp_level         6;
-    gzip_min_length         1100;
-    gzip_buffers            16 8k;
-    gzip_proxied            any;
-    gzip_types
-      text/plain
-      text/css
-      text/js
-      text/xml
-      text/javascript
-      application/javascript
-      application/x-javascript
-      application/json
-      application/xml
-      application/rss+xml
-      image/svg+xml;
-    proxy_connect_timeout 1h;
-
-    log_format hassio '[$time_local] $status '
-                        '$http_x_forwarded_for($remote_addr) '
-                        '$request ($http_user_agent)';
-
-    access_log              /proc/1/fd/1 hassio;
-    client_max_body_size    4G;
-    default_type            application/octet-stream;
-    gzip                    on;
-    keepalive_timeout       65;
-    sendfile                on;
-    server_tokens           off;
-    tcp_nodelay             on;
-    tcp_nopush              on;
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    include /etc/nginx/includes/resolver.conf;
-    include /etc/nginx/includes/upstream.conf;
-
-    include /etc/nginx/servers/*.conf;
-}
--- a/battybirdnet-pi/rootfs/etc/nginx/servers/ingress.conf
+++ b/battybirdnet-pi/rootfs/etc/nginx/servers/ingress.conf
@@ -1,41 +0,0 @@
-server {
-    listen %%interface%%:%%port%% default_server;
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-
-    proxy_buffering off;
-    auth_basic_user_file /home/pi/.htpasswd;
-
-    location / {
-      # Proxy pass
-      proxy_pass http://localhost:8082;
-
-      # Next three lines allow websockets
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-
-      # Adjust any Location headers in backend redirects
-      absolute_redirect off;
-      proxy_redirect /stats %%ingress_entry%%/stats;
-      proxy_redirect /log %%ingress_entry%%/log;
-      proxy_redirect /terminal %%ingress_entry%%/terminal;
-
-      # Correct base_url
-      proxy_set_header Accept-Encoding "";
-      sub_filter_once off;
-      sub_filter_types *;
-      sub_filter /spectrogram %%ingress_entry%%/spectrogram;
-      sub_filter /By_Date/ %%ingress_entry%%/By_Date/;
-      sub_filter /Charts/ %%ingress_entry%%/Charts/;
-      sub_filter /stats/ %%ingress_entry%%/stats/;
-      sub_filter /log/ %%ingress_entry%%/log/;
-      sub_filter /terminal/ %%ingress_entry%%/terminal/;
-      sub_filter "url = '/" "url = '%%ingress_entry%%/";
-      sub_filter /todays %%ingress_entry%%/todays;
-      sub_filter href=\"/ href=\"%%ingress_entry%%/;
-      sub_filter src=\"/ src=\"%%ingress_entry%%/;
-      sub_filter hx-get=\"/ hx-get=\"%%ingress_entry%%/;
-      sub_filter action=\"/ action=\"%%ingress_entry%%/;
-      }
-}
--- a/battybirdnet-pi/rootfs/helpers/birdnet_to_mqtt.py
+++ b/battybirdnet-pi/rootfs/helpers/birdnet_to_mqtt.py
@@ -1,108 +0,0 @@
-#! /usr/bin/env python3
-# birdnet_to_mqtt.py
-
-import time
-import re
-import datetime
-import json
-import logging
-import paho.mqtt.client as mqtt
-import requests
-import sys
-import os
-
-sys.path.append('/home/pi/BirdNET-Pi/scripts/utils')
-from helpers import get_settings
-
-# Setup basic configuration for logging
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger(__name__)
-
-# Used in flickrimage
-flickr_images = {}
-conf = get_settings()
-settings_dict = dict(conf)
-
-# MQTT server configuration
-mqtt_server = "%%mqtt_server%%"
-mqtt_user = "%%mqtt_user%%"
-mqtt_pass = "%%mqtt_pass%%"
-mqtt_port = %%mqtt_port%%
-mqtt_topic = 'birdnet'
-bird_lookup_url_base = 'http://en.wikipedia.org/wiki/'
-
-def on_connect(client, userdata, flags, rc ): #, properties=None):
-    """ Callback for when the client receives a CONNACK response from the server. """
-    if rc == 0:
-        log.info("Connected to MQTT Broker!")
-    else:
-        log.error(f"Failed to connect, return code {rc}\n")
-
-def get_bird_code(scientific_name):
-    with open('/home/pi/BirdNET-Pi/scripts/ebird.php', 'r') as file:
-        data = file.read()
-
-    array_str = re.search(r'\$ebirds = \[(.*?)\];', data, re.DOTALL).group(1)
-
-    bird_dict = {re.search(r'"(.*?)"', line).group(1): re.search(r'=> "(.*?)"', line).group(1)
-                 for line in array_str.split('\n') if '=>' in line}
-
-    return bird_dict.get(scientific_name)
-
-def automatic_mqtt_publish(file, detection, path):
-    bird = {}
-    bird['Date'] = detection.date
-    bird['Time'] = detection.time
-    bird['ScientificName'] = detection.scientific_name.replace('_', ' ')
-    bird['CommonName'] = detection.common_name
-    bird['Confidence'] = detection.confidence
-    bird['SpeciesCode'] = get_bird_code(detection.scientific_name)
-    bird['ClipName'] = path
-    bird['url'] = bird_lookup_url_base + detection.scientific_name.replace(' ', '_')
-
-    # Flickimage
-    image_url = ""
-    common_name = detection.common_name
-    if len(settings_dict.get('FLICKR_API_KEY')) > 0:
-        if common_name not in flickr_images:
-            try:
-                headers = {'User-Agent': 'Python_Flickr/1.0'}
-                url = ('https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=' + str(settings_dict.get('FLICKR_API_KEY')) +
-                       '&text=' + str(common_name) + ' bird&sort=relevance&per_page=5&media=photos&format=json&license=2%2C3%2C4%2C5%2C6%2C9&nojsoncallback=1')
-                resp = requests.get(url=url, headers=headers, timeout=10)
-
-                resp.encoding = "utf-8"
-                data = resp.json()["photos"]["photo"][0]
-
-                image_url = 'https://farm'+str(data["farm"])+'.static.flickr.com/'+str(data["server"])+'/'+str(data["id"])+'_'+str(data["secret"])+'_n.jpg'
-                flickr_images[common_name] = image_url
-            except Exception as e:
-                print("FLICKR API ERROR: "+str(e))
-                image_url = ""
-        else:
-            image_url = flickr_images[common_name]
-
-        bird['FlickrImage'] = image_url
-
-        json_bird = json.dumps(bird)
-        mqttc.reconnect()
-        mqttc.publish(mqtt_topic, json_bird, 1) 
-        log.info("Posted to MQTT: ok")
-
-mqttc = mqtt.Client('birdnet_mqtt')
-mqttc.username_pw_set(mqtt_user, mqtt_pass)
-mqttc.on_connect = on_connect
-
-try:
-    mqttc.connect(mqtt_server, mqtt_port)
-    mqttc.loop_start()
-
-    # Assuming `file` and `detections` are provided from somewhere
-    # automatic_mqtt_publish(file, detections)
-
-except Exception as e:
-    log.error("Cannot post mqtt: %s", e)
-
-finally:
-    mqttc.loop_stop()
-    mqttc.disconnect()
--- a/battybirdnet-pi/rootfs/helpers/caddy_ingress.sh
+++ b/battybirdnet-pi/rootfs/helpers/caddy_ingress.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# shellcheck shell=bash
-
-# Get values
-set +u
-source /etc/birdnet/birdnet.conf
-
-# Create ingress configuration for Caddyfile
-  cat << EOF >> /etc/caddy/Caddyfile
-:8082 {
-  root * ${EXTRACTED}
-  file_server browse
-  handle /By_Date/* {
-    file_server browse
-  }
-  handle /Charts/* {
-    file_server browse
-  }
-  reverse_proxy /stream localhost:8000
-  php_fastcgi unix//run/php/php-fpm.sock
-  reverse_proxy /log* localhost:8080
-  reverse_proxy /stats* localhost:8501
-  reverse_proxy /terminal* localhost:8888
-}
-EOF
--- a/battybirdnet-pi/rootfs/helpers/journalctl3.py
+++ b/battybirdnet-pi/rootfs/helpers/journalctl3.py
@@ -1,31 +0,0 @@
-#! /usr/bin/python3
-
-import argparse
-import os
-import sys
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-u', '--unit', metavar='unit', type=str, required=True, help='Systemd unit to display')
-parser.add_argument('-f', '--follow', default=False, action='store_true', help='Follows the log')
-parser.add_argument('-n', '--lines', metavar='num', type=int, help='Num of lines to display')
-parser.add_argument('--no-pager', default=False, action='store_true', help='Do not pipe through a pager')
-parser.add_argument('--system', default=False, action='store_true', help='Show system units')
-parser.add_argument('--user', default=False, action='store_true', help='Show user units')
-parser.add_argument('--root', metavar='path', type=str, help='Use subdirectory path')
-parser.add_argument('-x', default=False, action='store_true', help='Switch on verbose mode')
-args = parser.parse_args()
-
-systemctl_py = "systemctl3.py"
-path = os.path.dirname(sys.argv[0])
-systemctl = os.path.join(path, systemctl_py)
-
-cmd = [ systemctl, "log", args.unit ] # drops the -u
-if args.follow: cmd += [ "-f" ]
-if args.lines: cmd += [ "-n", str(args.lines) ]
-if args.no_pager: cmd += [ "--no-pager" ]
-if args.system: cmd += [ "--system" ]
-elif args.user: cmd += [ "--user" ]
-if args.root: cmd += [ "--root", start(args.root) ]
-if args.x: cmd += [ "-vvv" ]
-
-os.execvp(cmd[0], cmd)
--- a/battybirdnet-pi/rootfs/helpers/spectral_analysis.py
+++ b/battybirdnet-pi/rootfs/helpers/spectral_analysis.py
@@ -1,70 +0,0 @@
-import numpy as np
-import scipy.io.wavfile as wavfile
-import matplotlib.pyplot as plt
-import os
-import glob
-import sys  # Import the sys module
-
-from utils.helpers import get_settings
-
-# Dependencies /usr/bin/pip install numpy scipy matplotlib
-
-# Define the directory containing the WAV files
-conf = get_settings()
-input_directory = os.path.join(conf['RECS_DIR'], 'StreamData')
-output_directory = os.path.join(conf['RECS_DIR'], 'Extracted/Charts')
-
-# Ensure the output directory exists
-if not os.path.exists(output_directory):
-    os.makedirs(output_directory)
-
-# Check if a command-line argument is provided
-if len(sys.argv) > 1:
-    # If an argument is provided, use it as the file to analyze
-    wav_files = [sys.argv[1]]
-else:
-    # If no argument is provided, analyze all WAV files in the directory
-    wav_files = glob.glob(os.path.join(input_directory, '*.wav'))
-
-# Process each file
-for file_path in wav_files:
-    # Load the WAV file
-    sample_rate, audio_data = wavfile.read(file_path)
-
-    # If stereo, select only one channel
-    if len(audio_data.shape) > 1:
-        audio_data = audio_data[:, 0]
-
-    # Apply the Hamming window to the audio data
-    hamming_window = np.hamming(len(audio_data))
-    windowed_data = audio_data * hamming_window
-
-    # Compute the FFT of the windowed audio data
-    audio_fft = np.fft.fft(windowed_data)
-    audio_fft = np.abs(audio_fft)
-
-    # Compute the frequencies associated with the FFT values
-    frequencies = np.fft.fftfreq(len(windowed_data), d=1/sample_rate)
-
-    # Select the range of interest
-    idx = np.where((frequencies >= 150) & (frequencies <= 15000))
-
-    # Calculate the saturation threshold based on the bit depth
-    bit_depth = audio_data.dtype.itemsize * 8
-    max_amplitude = 2**(bit_depth - 1) - 1
-    saturation_threshold = 0.8 * max_amplitude
-
-    # Plot the spectrum with a logarithmic Y-axis
-    plt.figure(figsize=(10, 6))
-    plt.semilogy(frequencies[idx], audio_fft[idx], label='Spectrum')
-    plt.axhline(y=saturation_threshold, color='r', linestyle='--', label='Saturation Threshold')
-    plt.xlabel("Frequency (Hz)")
-    plt.ylabel("Amplitude (Logarithmic)")
-    plt.title(f"Frequency Spectrum (150 - 15000 Hz) - {os.path.basename(file_path)}")
-    plt.legend()
-    plt.grid(True)
-
-    # Save the plot as a PNG file
-    output_filename = os.path.basename(file_path).replace('.wav', '_spectrum.png')
-    plt.savefig(os.path.join(output_directory, output_filename))
-    plt.close()  # Close the figure to free memory
--- a/battybirdnet-pi/rootfs/helpers/spectral_analysis.sh
+++ b/battybirdnet-pi/rootfs/helpers/spectral_analysis.sh
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# Performs the recording from the specified RTSP stream or soundcard
-set +u
-source /etc/birdnet/birdnet.conf
-
-# Read the logging level from the configuration option
-LOGGING_LEVEL="${LogLevel_BirdnetRecordingService}"
-# If empty for some reason default to log level of error
-[ -z "$LOGGING_LEVEL" ] && LOGGING_LEVEL='error'
-# Additionally if we're at debug or info level then allow printing of script commands and variables
-if [ "$LOGGING_LEVEL" == "info" ] || [ "$LOGGING_LEVEL" == "debug" ];then
-  # Enable printing of commands/variables etc to terminal for debugging
-  set -x
-fi
-
-[ -z "$RECORDING_LENGTH" ] && RECORDING_LENGTH=15
-[ -d "$RECS_DIR"/StreamData ] || mkdir -p "$RECS_DIR"/StreamData
-
-filename="Spectrum_$(date "+%Y-%m-%d_%H:%M").wav"
-
-if [ ! -z "$RTSP_STREAM" ];then
-  # Explode the RSPT steam setting into an array so we can count the number we have
-  RTSP_STREAMS_EXPLODED_ARRAY=("${RTSP_STREAM//,/ }")
-
-  while true;do
-
-    # Initially start the count off at 1 - our very first stream
-    RTSP_STREAMS_STARTED_COUNT=1
-    FFMPEG_PARAMS=""
-
-    # Loop over the streams
-    for i in "${RTSP_STREAMS_EXPLODED_ARRAY[@]}"
-    do
-      # Map id used to map input to output (first stream being 0), this is 0 based in ffmpeg so decrement our counter (which is more human readable) by 1
-      MAP_ID="$((RTSP_STREAMS_STARTED_COUNT-1))"
-      # Build up the parameters to process the RSTP stream, including mapping for the output
-      FFMPEG_PARAMS+="-vn -thread_queue_size 512 -i ${i} -map ${MAP_ID}:a:0 -t ${RECORDING_LENGTH} -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$filename "
-      # Increment counter
-      ((RTSP_STREAMS_STARTED_COUNT += 1))
-    done
-
-  # Make sure were passing something valid to ffmpeg, ffmpeg will run interactive and control our loop by waiting ${RECORDING_LENGTH} between loops because it will stop once that much has been recorded
-  if [ -n "$FFMPEG_PARAMS" ];then
-    ffmpeg -hide_banner -loglevel "$LOGGING_LEVEL" -nostdin "$FFMPEG_PARAMS"
-  fi
-
-  done
-else
-  if pgrep arecord &> /dev/null ;then
-    echo "Recording"
-  else
-    if [ -z "${REC_CARD}" ];then
-      arecord -f S16_LE -c"${CHANNELS}" -r48000 -t wav --max-file-time "${RECORDING_LENGTH}"\
-	      	      	       --use-strftime "${RECS_DIR}"/StreamData/"$filename"
-    else
-      arecord -f S16_LE -c"${CHANNELS}" -r48000 -t wav --max-file-time "${RECORDING_LENGTH}"\
-        -D "${REC_CARD}" --use-strftime "${RECS_DIR}"/StreamData/"$filename"
-    fi
-  fi
-fi
-
-# Create the spectral analysis
-"$PYTHON_VIRTUAL_ENV" "$HOME"/BirdNET-Pi/scripts/spectral_analysis.py
--- a/battybirdnet-pi/rootfs/helpers/systemctl3.py
+++ b/battybirdnet-pi/rootfs/helpers/systemctl3.py
--- a/battybirdnet-pi/rootfs/helpers/timedatectl
+++ b/battybirdnet-pi/rootfs/helpers/timedatectl
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-# Function to show the current timezone using two alternative methods
-show_timezone() {
-    if [ -f /data/timezone ]; then
-        cat /data/timezone
-    elif [ -f /etc/timezone ]; then
-        cat /etc/timezone
-    elif [ -f /etc/localtime ]; then
-        readlink /etc/localtime | sed 's|/usr/share/zoneinfo/||'
-    else
-        echo "Cannot determine timezone."
-    fi
-}
-
-# Function to set the timezone
-set_timezone() {
-    local new_timezone="$1"
-    if [ ! -f "/usr/share/zoneinfo/$new_timezone" ]; then
-        echo "Invalid timezone: $new_timezone"
-        return 1
-    fi
-
-    echo "$new_timezone" > /data/timezone
-    echo "$new_timezone" > /etc/timezone
-    ln -sf "/usr/share/zoneinfo/$new_timezone" /etc/localtime
-
-    # Update /etc/environment if it exists
-    if [ -f /etc/environment ]; then
-        sed -i "/^TZ=/c\TZ=$new_timezone" /etc/environment
-    fi
-
-    # Update s6 container environment if it exists
-    if [ -d /var/run/s6/container_environment ]; then
-        echo "$new_timezone" > /var/run/s6/container_environment/TZ
-    fi
-
-    echo "Timezone set to: $new_timezone"
-}
-
-# Function to enable or disable NTP
-set_ntp() {
-    case "$1" in
-        "false")
-            systemctl stop systemd-timesyncd
-            systemctl disable systemd-timesyncd
-            echo "NTP disabled"
-            ;;
-        "true")
-            systemctl start systemd-timesyncd
-            systemctl enable systemd-timesyncd
-
-            # Remove the /data/timezone file when NTP is enabled
-            if [ -f /data/timezone ]; then
-                rm -f /data/timezone
-                echo "Timezone configuration file /data/timezone deleted."
-            fi
-
-            echo "NTP enabled"
-            ;;
-        *)
-            echo "Invalid argument for set-ntp. Use 'false' or 'true'."
-            ;;
-    esac
-}
-
-# Function to show detailed time settings
-show_time_details() {
-    local local_time
-    local utc_time
-    local time_zone
-    local ntp_status="no"
-    local ntp_service="inactive"
-
-    local_time="$(date)"
-    utc_time="$(date -u)"
-    time_zone="$(show_timezone)"
-    
-    # Check if NTP is used
-    if systemctl is-active --quiet systemd-timesyncd; then
-        ntp_status="yes"
-        ntp_service="active"
-    fi
-
-    # Print the information
-    echo "Local time: $local_time"
-    echo "Universal time: $utc_time"
-    echo "Time zone: $time_zone"
-    echo "Network time on: $ntp_status"
-    echo "NTP service: $ntp_service"
-}
-
-# Main script logic
-case "$1" in
-    "set-ntp")
-        set_ntp "$2"
-        ;;
-    "show")
-        show_timezone
-        ;;
-    "set-timezone")
-        set_timezone "$2"
-        ;;
-    *)
-        show_time_details
-        ;;
-esac