renaming project birdingpi

This commit is contained in:
Patrick McGuire
2021-10-08 12:57:28 -04:00
parent cc432e1ada
commit ad6dc4c356
26 changed files with 64 additions and 63 deletions
+4 -4
View File
@@ -105,7 +105,7 @@ REMOTE_RECS_DIR=
## EXTRACTIONS_URL is the URL where the extractions, data-set, and live-stream
## will be web-hosted. If you do not own a domain, or would just prefer to keep
## BirdNET-Lite on your local network, you can set this to http://localhost.
## Birding-Pi on your local network, you can set this to http://localhost.
## Setting this (even to http://localhost) will also allow you to enable the
## GoTTY web logging features below.
@@ -152,10 +152,10 @@ PUSHED_APP_SECRET=
# Keep this EMPTY if you do not want to install NoMachine. #
## INSTALL_NOMACHINE is simply a setting that can be enabled to install
## NoMachine alongside the BirdNET-Lite for remote desktop access. This in-
## NoMachine alongside the Birding-Pi for remote desktop access. This in-
## staller assumes personal use. Please reference the LICENSE file included
## in this repository for more information.
## Set this to Y or y to install NoMachine alongside the BirdNET-Lite
## Set this to Y or y to install NoMachine alongside the Birding-Pi
INSTALL_NOMACHINE=
@@ -195,7 +195,7 @@ EXTRACTED=${RECS_DIR}/Extracted
## change this variable between data-sets to preserve records of disparate
## data-sets according to name.
IDFILE=${HOME}/BirdNET-Lite/IdentifiedSoFar.txt
IDFILE=${HOME}/Birding-Pi/IdentifiedSoFar.txt
## OVERLAP is the value in seconds which BirdNET should use when analyzing
## the data. The values must be between 0.0-2.9.
+2 -2
View File
@@ -22,7 +22,7 @@ if ! diff ${LAST_RUN} ${THIS_RUN};then
done
fi
CUSTOM_LIST="/home/pi/BirdNET-Lite/custom_species_list.txt"
CUSTOM_LIST="/home/pi/Birding-Pi/custom_species_list.txt"
# Create an array of the audio files
# Takes one argument:
@@ -75,7 +75,7 @@ run_analysis() {
WEEK="$(echo "${WEEK_OF_YEAR} + 4" |bc -l)"
fi
cd ${HOME}/BirdNET-Lite || exit 1
cd ${HOME}/Birding-Pi || exit 1
for i in "${files[@]}";do
echo "${1}/${i}" > ./analyzing_now.txt
[ -z ${RECORDING_LENGTH} ] && RECORDING_LENGTH=12
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/clear_all_data.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/clear_all_data.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+5 -5
View File
@@ -15,12 +15,12 @@ echo "Recreating necessary directories"
[ -d ${EXTRACTED}/By_Date ] || sudo -u ${BIRDNET_USER} mkdir -p ${EXTRACTED}/By_Date
[ -d ${EXTRACTED}/By_Common_Name ] || sudo -u ${BIRDNET_USER} mkdir -p ${EXTRACTED}/By_Common_Name
[ -d ${EXTRACTED}/By_Scientific_Name ] || sudo -u ${BIRDNET_USER} mkdir -p ${EXTRACTED}/By_Scientific_Name
sudo -u ${BIRDNET_USER} ln -s /home/pi/BirdNET-Lite/templates/index.html ${EXTRACTED}
sudo -u ${BIRDNET_USER} ln -s /home/pi/Birding-Pi/templates/index.html ${EXTRACTED}
[ -d ${PROCESSED} ] || sudo -u ${BIRDNET_USER} mkdir -p ${PROCESSED}
[ -L ${EXTRACTED}/scripts ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/BirdNET-Lite/scripts ${EXTRACTED}/
[ -L ${EXTRACTED}/spectrogram.php ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/BirdNET-Lite/scripts/spectrogram.php ${EXTRACTED}
[ -L ${EXTRACTED}/spectrogram.sh ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/BirdNET-Lite/scripts/spectrogram.sh ${EXTRACTED}
[ -L ${EXTRACTED}/scripts ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/Birding-Pi/scripts ${EXTRACTED}/
[ -L ${EXTRACTED}/spectrogram.php ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/Birding-Pi/scripts/spectrogram.php ${EXTRACTED}
[ -L ${EXTRACTED}/spectrogram.sh ] || sudo -u ${BIRDNET_USER} ln -s /home/pi/Birding-Pi/scripts/spectrogram.sh ${EXTRACTED}
sudo -u ${BIRDNET_USER} cp ~/BirdNET-Lite/templates/index.html ${EXTRACTED}/
sudo -u ${BIRDNET_USER} cp ~/Birding-Pi/templates/index.html ${EXTRACTED}/
echo "Restarting services"
sudo systemctl restart birdnet_recording.service
+4 -4
View File
@@ -2,7 +2,7 @@
# A comprehensive log dumper
# set -x # Uncomment to debug
source /etc/birdnet/birdnet.conf &> /dev/null
LOG_DIR="${HOME}/BirdNET-Lite/logs"
LOG_DIR="${HOME}/Birding-Pi/logs"
SERVICES=(avahi-alias@.service
birdnet_analysis.service
birdnet_log.service
@@ -29,7 +29,7 @@ for i in "${SERVICES[@]}";do
done
# Create password-removed birdnet.conf
sed -e '/PWD=/d' ${HOME}/BirdNET-Lite/birdnet.conf > ${LOG_DIR}/birdnet.conf
sed -e '/PWD=/d' ${HOME}/Birding-Pi/birdnet.conf > ${LOG_DIR}/birdnet.conf
# Create password-removed Caddyfile
if [ -f /etc/caddy/Caddyfile ];then
@@ -57,6 +57,6 @@ for i in "${CALLS[@]}";do
done
# TAR the logs into a ball
tar --remove-files -cvpzf ${HOME}/BirdNET-Lite/logs.tar.gz ${LOG_DIR} &> /dev/null
tar --remove-files -cvpzf ${HOME}/Birding-Pi/logs.tar.gz ${LOG_DIR} &> /dev/null
# Finished
echo "Your compressed logs are located at ${HOME}/BirdNET-Lite/logs.tar.gz"
echo "Your compressed logs are located at ${HOME}/Birding-Pi/logs.tar.gz"
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/edit_birdnet.conf.sh");
header('Location: http://birdnetsystem.local:9898');
shell_exec("/home/pi/Birding-Pi/scripts/edit_birdnet.conf.sh");
header('Location: http://birdingpi.local:9898');
?>
+5 -5
View File
@@ -7,7 +7,7 @@ trap '${my_dir}/dump_logs.sh && echo -e "\n\nExiting the installation. Goodbye!"
cd $my_dir || exit 1
if [ "$(uname -m)" != "aarch64" ];then
echo "BirdNET-Lite requires a 64-bit OS.
echo "Birding-Pi requires a 64-bit OS.
It looks like your operating system is using $(uname -m),
but would need to be aarch64.
Please take a look at https://birdnetwiki.pmcgui.xyz for more
@@ -46,7 +46,7 @@ install_deps() {
}
install_birdnet() {
cd ~/BirdNET-Lite || exit 1
cd ~/Birding-Pi || exit 1
echo "Upgrading pip, wheel, and setuptools"
sudo pip3 install --upgrade pip wheel setuptools
echo "Fetching the TFLite pre-built binaries"
@@ -65,7 +65,7 @@ install_birdnet() {
read -sp "\
Be sure you have read the software license before installing. This is
available in the BirdNET-Lite directory as "LICENSE"
available in the Birding-Pi directory as "LICENSE"
If you DO NOT want to install BirdNET and the birdnet_analysis.service,
press Ctrl+C to cancel. If you DO wish to install BirdNET and the
birdnet_analysis.service, press ENTER to continue with the installation."
@@ -94,13 +94,13 @@ echo " BirdNet is installed!!
http://birdnetsystem.local to see your extractions,
http://birdlog.local to see the log output of the birdnet_analysis.service,
http://extractionlog.local to see the log output of the extraction.service, and
http://birdstats.local to see the BirdNET-Lite Report"
http://birdstats.local to see the Birding-Pi Report"
echo
read -n1 -p " Would you like to run the birdnet_analysis.service now?" YN
echo
case $YN in
[Yy] ) sudo systemctl start birdnet_analysis.service \
&& journalctl -fu birdnet_analysis;;
* ) echo " Thanks for installing BirdNET-Lite!!
* ) echo " Thanks for installing Birding-Pi!!
I hope it was helpful!";;
esac
+5 -5
View File
@@ -298,7 +298,7 @@ REMOTE_RECS_DIR=${REMOTE_RECS_DIR}
## EXTRACTIONS_URL is the URL where the extractions, data-set, and live-stream
## will be web-hosted. If you do not own a domain, or would just prefer to keep
## BirdNET-Lite on your local network, you can set this to http://localhost.
## Birding-Pi on your local network, you can set this to http://localhost.
## Setting this (even to http://localhost) will also allow you to enable the
## GoTTY web logging features below.
@@ -345,10 +345,10 @@ PUSHED_APP_SECRET=${PUSHED_APP_SECRET}
# Keep this EMPTY if you do not want to install NoMachine. #
## INSTALL_NOMACHINE is simply a setting that can be enabled to install
## NoMachine alongside the BirdNET-Lite for remote desktop access. This in-
## NoMachine alongside the Birding-Pi for remote desktop access. This in-
## staller assumes personal use. Please reference the LICENSE file included
## in this repository for more information.
## Set this to Y or y to install NoMachine alongside the BirdNET-Lite
## Set this to Y or y to install NoMachine alongside the Birding-Pi
INSTALL_NOMACHINE=${INSTALL_NOMACHINE}
@@ -388,7 +388,7 @@ EXTRACTED=${RECS_DIR}/Extracted
## change this variable between data-sets to preserve records of disparate
## data-sets according to name.
IDFILE=${HOME}/BirdNET-Lite/IdentifiedSoFar.txt
IDFILE=${HOME}/Birding-Pi/IdentifiedSoFar.txt
## OVERLAP is the value in seconds which BirdNET should use when analyzing
## the data. The values must be between 0.0-2.9.
@@ -444,7 +444,7 @@ EOF
sudo ln -sf $(dirname ${my_dir})/birdnet.conf /etc/birdnet/birdnet.conf
}
# Checks for a birdnet.conf file in the BirdNET-Lite directory for a
# Checks for a birdnet.conf file in the Birding-Pi directory for a
# non-interactive installation. Otherwise,the installation is interactive.
if [ -f ${BIRDNET_CONF} ];then
source ${BIRDNET_CONF}
+6 -6
View File
@@ -10,7 +10,7 @@ gotty_url="https://github.com/yudai/gotty/releases/download/v1.0.1/gotty_linux_a
CONFIG_FILE="$(dirname ${my_dir})/birdnet.conf"
install_scripts() {
echo "Installing BirdNET-Lite scripts to /usr/local/bin"
echo "Installing Birding-Pi scripts to /usr/local/bin"
ln -sf ${my_dir}/* /usr/local/bin/
rm /usr/local/bin/index.html
}
@@ -207,7 +207,7 @@ ${EXTRACTIONS_URL} {
php_fastcgi unix//run/php/php7.3-fpm.sock
}
http://birdnetsystem.local {
http://birdingpi.local {
root * ${EXTRACTED}
file_server browse
basicauth /Processed* {
@@ -284,7 +284,7 @@ RestartSec=3
Type=simple
User=${USER}
Environment=TERM=xterm-256color
ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Lite Log" journalctl -fu birdnet_analysis.service
ExecStart=/usr/local/bin/gotty -p 8080 --title-format "Birding-Pi Log" journalctl -fu birdnet_analysis.service
[Install]
WantedBy=multi-user.target
@@ -318,7 +318,7 @@ RestartSec=3
Type=simple
User=${USER}
Environment=TERM=xterm-256color
ExecStart=/usr/local/bin/gotty -p 9090 --title-format "BirdNET-Lite Statistics" tmux new -A -s birdstats /usr/local/bin/birdnet_stats.sh
ExecStart=/usr/local/bin/gotty -p 9090 --title-format "Birding-Pi Statistics" tmux new -A -s birdstats /usr/local/bin/birdnet_stats.sh
[Install]
WantedBy=multi-user.target
@@ -378,7 +378,7 @@ RestartSec=3
Type=simple
User=pi
Environment=TERM=xterm-256color
ExecStart=/usr/local/bin/gotty -w -p 9898 --title-format "Edit birdnet.conf" tmux new -A -s editbirdnet nano /home/pi/BirdNET-Lite/birdnet.conf
ExecStart=/usr/local/bin/gotty -w -p 9898 --title-format "Edit birdnet.conf" tmux new -A -s editbirdnet nano /home/pi/Birding-Pi/birdnet.conf
[Install]
WantedBy=multi-user.target
@@ -418,7 +418,7 @@ install_livestream_service() {
echo "Installing Live Stream service"
cat << EOF > /etc/systemd/system/livestream.service
[Unit]
Description=BirdNET-Lite Live Stream
Description=Birding-Pi Live Stream
[Service]
Environment=XDG_RUNTIME_DIR=/run/user/1000
+2 -2
View File
@@ -3,7 +3,7 @@
# ONLY run this additional script if you trust everyone on your
# local network completely as the credentials are sent WITHOUT
# any SSL/TLS encryption. For a secure remote connection to your
# BirdNET-Lite command line, consider enabling SSH on the
# Birding-Pi command line, consider enabling SSH on the
# Raspberry Pi and using another Linux machine or an SSH
# client software, or you can alternately add the 'tls internal'
# directive to the Caddyfile to add a self-signed certificate for TLS/SSL
@@ -46,7 +46,7 @@ install_tmux() {
install_web_terminal() {
cat << EOF | sudo tee /etc/systemd/system/birdterminal.service
[Unit]
Description=A BirdNET-Lite Web Terminal
Description=A Birding-Pi Web Terminal
[Service]
Restart=on-failure
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/reboot_system.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/reboot_system.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+4 -4
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Reconfigure the BirdNET-Lite
# Reconfigure the Birding-Pi
source /etc/birdnet/birdnet.conf
uninstall.sh
${HOME}/BirdNET-Lite/scripts/install_config.sh
sudo ${HOME}/BirdNET-Lite/scripts/install_services.sh
echo "BirdNET-Lite has now been reconfigured."
${HOME}/Birding-Pi/scripts/install_config.sh
sudo ${HOME}/Birding-Pi/scripts/install_services.sh
echo "Birding-Pi has now been reconfigured."
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/restart_birdnet_analysis.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/restart_birdnet_analysis.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/restart_birdnet_recording.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/restart_birdnet_recording.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/restart_caddy.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/restart_caddy.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/restart_extraction.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/restart_extraction.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/restart_services.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/restart_services.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+2 -2
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdNET-Lite/scripts/shutdown_system.sh");
header('Location: http://birdnetsystem.local/scripts/index.html?success=true');
shell_exec("/home/pi/Birding-Pi/scripts/shutdown_system.sh");
header('Location: http://birdingpi.local/scripts/index.html?success=true');
?>
+1 -1
View File
@@ -1,4 +1,4 @@
<?php
shell_exec("/home/pi/BirdSongs/Extracted/spectrogram.sh");
header('Location: http://birdnetsystem.local/spectrogram.png');
header('Location: http://birdingpi.local/spectrogram.png');
?>
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Make sox spectrogram
source /etc/birdnet/birdnet.conf
analyzing_now="$(cat /home/pi/BirdNET-Lite/analyzing_now.txt)"
analyzing_now="$(cat /home/pi/Birding-Pi/analyzing_now.txt)"
spectrogram_png=${EXTRACTED}/spectrogram.png
sudo -u pi sox "${analyzing_now}" -n spectrogram -o "${spectrogram_png}"
+1 -1
View File
@@ -105,5 +105,5 @@ remove_scripts() {
remove_services
remove_scripts
if [ -d /etc/birdnet ];then sudo rm -drf /etc/birdnet;fi
if [ -f ${HOME}/BirdNET-Lite/birdnet.conf ];then sudo rm -f ${HOME}/BirdNET-Lite/birdnet.conf;fi
if [ -f ${HOME}/Birding-Pi/birdnet.conf ];then sudo rm -f ${HOME}/Birding-Pi/birdnet.conf;fi
echo "Uninstall finished. Remove this directory with 'rm -drfv' to finish."
+1 -1
View File
@@ -9,7 +9,7 @@ ${EXTRACTIONS_URL} {
}
reverse_proxy /stream localhost:8000
}
http://birdnetsystem.local {
http://birdingpi.local {
root * ${EXTRACTED}
file_server browse
basicauth ${PROCESSED}* {
+1 -1
View File
@@ -8,7 +8,7 @@ ${EXTRACTIONS_URL} {
birdnet ${HASHWORD}
}
}
http://birdnetsystem.local {
http://birdingpi.local {
root * ${EXTRACTED}
file_server browse
basicauth ${PROCESSED}* {
+1
View File
@@ -1,2 +1,3 @@
#birdnet
0 1 * * * /usr/local/bin/cleanup.sh &> /dev/null
@reboot /usr/local/bin/cleanup.sh &> /dev/null
+1 -1
View File
@@ -1,5 +1,5 @@
[Unit]
Description=BirdNET-Lite Live Stream
Description=Birding-Pi Live Stream
[Service]
Environment=XDG_RUNTIME_DIR=/run/user/1000
Restart=always
+2 -2
View File
@@ -11,12 +11,12 @@ set-window-option -g mode-keys vi
set-option -g status-interval 5
set-option -g status 2
set-option -g status-format[1] '#[bg=cyan,fg=black]#[align=left][BirdNET-Lite] #[bg=cyan]#[align=centre]#(vcgencmd measure_temp) #(vcgencmd get_throttled)#[align=right]#(~/BirdNET-Lite/scripts/disk_usage.sh)%l:%M%p'
set-option -g status-format[1] '#[bg=cyan,fg=black]#[align=left][Birding-Pi] #[bg=cyan]#[align=centre]#(vcgencmd measure_temp) #(vcgencmd get_throttled)#[align=right]#(~/Birding-Pi/scripts/disk_usage.sh)%l:%M%p'
set-option -g status-style bg=magenta,fg=cyan
set-option -g status-justify centre
set-option -g status-left-length 50
set-option -g status-left '#[fg=brightyellow]arm clock #(vcgencmd measure_clock arm)'
set-option -g status-right '#[fg=brightyellow]%A, %B %e#(~/BirdNET-Lite/scripts/pretty_date.sh)'
set-option -g status-right '#[fg=brightyellow]%A, %B %e#(~/Birding-Pi/scripts/pretty_date.sh)'
bind r source-file /etc/tmux.conf \; display "Reloaded!"