From f3e377e80c3dd9ef75f7a530ecbbcca6a73317ca Mon Sep 17 00:00:00 2001 From: frederik Date: Thu, 12 May 2022 20:37:27 +0200 Subject: [PATCH 01/25] cleanup: remove unused imports --- scripts/server.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/server.py b/scripts/server.py index 6c96e12..3ad3f45 100755 --- a/scripts/server.py +++ b/scripts/server.py @@ -9,19 +9,15 @@ try: except: from tensorflow import lite as tflite -import argparse import operator import librosa import numpy as np import math import time -from decimal import Decimal import json import requests import sqlite3 import datetime -from time import sleep -import pytz from tzlocal import get_localzone from pathlib import Path import apprise From e7bc33ca4b9e05aec704b0304a3b453f750b31e4 Mon Sep 17 00:00:00 2001 From: frederik Date: Thu, 12 May 2022 20:38:55 +0200 Subject: [PATCH 02/25] use "localhost" like all other internal services do --- scripts/analyze.py | 2 +- scripts/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze.py b/scripts/analyze.py index 4f36e80..b07021d 100755 --- a/scripts/analyze.py +++ b/scripts/analyze.py @@ -5,7 +5,7 @@ HEADER = 64 PORT = 5050 FORMAT = 'utf-8' DISCONNECT_MESSAGE = "!DISCONNECT" -SERVER = "127.0.1.1" +SERVER = "localhost" ADDR = (SERVER, PORT) client = socket.socket(socket.AF_INET, socket.SOCK_STREAM) diff --git a/scripts/server.py b/scripts/server.py index 3ad3f45..3c50ce4 100755 --- a/scripts/server.py +++ b/scripts/server.py @@ -25,7 +25,7 @@ import apprise HEADER = 64 PORT = 5050 -SERVER = socket.gethostbyname(socket.gethostname()) +SERVER = "localhost" ADDR = (SERVER, PORT) FORMAT = 'utf-8' DISCONNECT_MESSAGE = "!DISCONNECT" From 1fdaf8775e96a6367eb8f83d556dfe08612db83b Mon Sep 17 00:00:00 2001 From: frederik Date: Thu, 12 May 2022 22:24:08 +0200 Subject: [PATCH 03/25] appease flake8 --- scripts/server.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/server.py b/scripts/server.py index 3c50ce4..05c04d6 100755 --- a/scripts/server.py +++ b/scripts/server.py @@ -1,14 +1,6 @@ -import socket +import socket import threading import os -os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3' -os.environ['CUDA_VISIBLE_DEVICES'] = '' - -try: - import tflite_runtime.interpreter as tflite -except: - from tensorflow import lite as tflite - import operator import librosa import numpy as np @@ -22,6 +14,13 @@ from tzlocal import get_localzone from pathlib import Path import apprise +os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3' +os.environ['CUDA_VISIBLE_DEVICES'] = '' +try: + import tflite_runtime.interpreter as tflite +except ImportError: + from tensorflow import lite as tflite + HEADER = 64 PORT = 5050 From 62ca6fc5c920cf4d13f35117e2f2a7c031216b9b Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Fri, 13 May 2022 14:23:34 -0400 Subject: [PATCH 04/25] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 213a5bd..32d7351 100644 --- a/README.md +++ b/README.md @@ -90,10 +90,7 @@ Please take a look at the [wiki](https://github.com/mcguirepr89/BirdNET-Pi/wiki) ## Updating -Since the change in RaspiOS that has discontinued the default `pi` user, the recommended update instructions for installations that _do_ have the default `pi` user: -1. Go to "Tools" > "Web Terminal" -2. Type ```git pull``` -3. Go to "Tools" > "System Controls" > "Update" > "OK" +Use the web interface and go to "Tools" > "System Controls" > "Update." If you encounter any issues with that, or suspect that the update did not work for some reason, please save its output and post it in an issue where we can help. ## Uninstallation ``` From 040b3070ad0b3588339c6b581c3d0d157cdee606 Mon Sep 17 00:00:00 2001 From: mcguirepr89 Date: Fri, 13 May 2022 16:57:41 -0400 Subject: [PATCH 05/25] that line is no longer necessary --- scripts/restart_services.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/restart_services.sh b/scripts/restart_services.sh index 728127e..f0cead9 100755 --- a/scripts/restart_services.sh +++ b/scripts/restart_services.sh @@ -7,7 +7,6 @@ my_dir=$HOME/BirdNET-Pi/scripts sudo systemctl stop birdnet_server.service sudo pkill server.py sudo systemctl stop birdnet_recording.service -sudo rm -rf ${RECS_DIR}/$(date +%B-%Y/%d-%A)/* services=(web_terminal.service spectrogram_viewer.service pushed_notifications.service From 40cb838342f556a503e29317a15259b2ca6caebe Mon Sep 17 00:00:00 2001 From: Patrick McGuire <60325264+mcguirepr89@users.noreply.github.com> Date: Fri, 13 May 2022 17:50:27 -0400 Subject: [PATCH 06/25] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index b1123ac..c6f51a4 100644 --- a/LICENSE +++ b/LICENSE @@ -713,7 +713,7 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. ============================================================================= -Caddy, ,Streamlit, and Adminer use the Apache License Version 2.0 +Caddy, WiFi-Connect,Streamlit, and Adminer use the Apache License Version 2.0 ============================================================================= Apache License Version 2.0, January 2004 From 14fdd02ca39f9b570f03a18cb1d7862b714a7102 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Sat, 14 May 2022 09:24:47 -0400 Subject: [PATCH 07/25] Update config.php whats this doing here --- scripts/config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/config.php b/scripts/config.php index 9374319..f592448 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -164,9 +164,10 @@ https://discordapp.com/api/webhooks/{WebhookID}/{WebhookToken}

+ -