Skip to content

Commit

Permalink
Update 71-newfeatures.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbelgium
alexbelgium authored Oct 5, 2024
1 parent 35b9a8d commit c181051
Showing 1 changed file with 48 additions and 51 deletions.
99 changes: 48 additions & 51 deletions birdnet-pi/rootfs/etc/cont-init.d/71-newfeatures.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,58 +9,55 @@ set -e
echo " "
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 to include Processed folder settings
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
# Add move_to_processed function in birdnet_analysis.py
sed -i "/log.info('handle_reporting_queue done')/a\
def move_to_processed(file_name, processed_size):\n\
processed_dir = os.path.join(get_settings()['RECS_DIR'], 'Processed')\n\
os.rename(file_name, os.path.join(processed_dir, os.path.basename(file_name)))\n\
files = glob.glob(os.path.join(processed_dir, '*'))\n\
files.sort(key=os.path.getmtime)\n\
while len(files) > processed_size:\n\
os.remove(files.pop(0))\n\
" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
# Denoiser
#if bashio::config.true "DENOISER_ANALYSIS_ENABLED"; then
# sed -i "s|ar 48000|ar 48000 -af \"arnndn=m=sample.rnnn\"|g" "$HOME"/BirdNET-Pi/scripts/birdnet_recording.sh
# sed -i "s|ar 48000|ar 48000 -af afftdn=nr=30:nt=w:om=o|g" "$HOME"/BirdNET-Pi/scripts/birdnet_recording.sh
#fi

# Add get_processed_size function in birdnet_analysis.py
sed -i "/log.info('handle_reporting_queue done')/a\
def get_processed_size():\n\
try:\n\
processed_size = get_settings().getint('PROCESSED_SIZE')\n\
return processed_size if isinstance(processed_size, int) else 0\n\
except (ValueError, TypeError):\n\
return 0\n\
" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
# Add imports at the top of birdnet_analysis.py
sed -i "/from subprocess import CalledProcessError/a\
import glob\n\
import time\n\
" "$HOME"/BirdNET-Pi/scripts/birdnet_analysis.py
# Enable the Processed folder
#############################

# Modify main analysis logic to include Processed folder handling
sed -i "/os.remove(file.file_name)/i\
processed_size = get_processed_size()\n\
if processed_size > 0:\n\
move_to_processed(file.file_name, processed_size)\n\
else:\n\
" "$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
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

echo " "

0 comments on commit c181051

Please sign in to comment.