Commit Graph

1594 Commits

Author SHA1 Message Date
ehpersonal38 00ad025d96 Merge pull request #836 from jaredb7/More-Misc-Fixes-and-Enhancements_mcguire
More misc fixes and enhancements
2023-04-10 21:19:32 -04:00
ehpersonal38 513d093523 fix sox spectrogram title on non ASCII names 2023-04-10 16:38:46 -04:00
jaredb7 ad28127f6c Fix comments on birdnet_recording.sh 2023-04-09 23:24:57 +10:00
jaredb7 9a97d16883 Make the Spectrogram service run as a loop
The Spectrogram service was stopping after it completed it's work (no issue here) and the system would start it again 10 seconds later, sometimes it would stop and start multiple times a second (no file to analyse maybe)

Added a while loop to that it would just keep running and sleeping for the number of seconds of the recording length setting.
2023-04-09 22:49:53 +10:00
jaredb7 421902684f Quieten System logs
Attempt to quieten the amount of log noise being generated by some of the birdnet services visible in the syslog and daemon.log

Recording service
When using RTSP streams the recording service  is generating massive amounts of noise in the logs as it's basically outputting all it's startup info and also outputting stream and export info.
- Set the log level to only output errors

Also the birdnet_recoding service script is outputting it;s contents, I assume was doing this because of the set -x option at the beginning,
-Commenting this fixed that issue

Analysis Service
Small change to this it doesn't output a error when it can't find today's recording directory. It's a non issue if your recording via sound card but it pops up a bit when using RTSP streams as that directory is never created.

Livestream Service
Same treatment as the recording service, set log level to error. It was previously set to info and would occasionally output a massive chunk of output.. presumably abut the encoding processes.
2023-04-09 22:26:04 +10:00
jaredb7 f534accaae Merge branch 'BirdNET-pi-main' into More-Misc-Fixes-and-Enhancements_mcguire 2023-04-09 18:46:25 +10:00
ehpersonal38 6334367ac0 40% faster updates 2023-04-08 17:41:52 -04:00
jaredb7 9988acfdbd Check RTSP stream selection control is valid
Add a check to make sure the RTSP Stream control is valid before adding the 'onchange' event to avoid breaking the other controls
2023-04-08 14:13:44 +10:00
ehpersonal38 56f168a280 remove trailing birdnet_url slash, if there is one 2023-04-07 21:29:12 -04:00
ehpersonal38 f8e68551a3 Revert "Revert "Merge pull request #829 from lloydbayley/main""
This reverts commit 712f4b034a.
2023-04-07 21:24:49 -04:00
jaredb7 d16d4f60a3 Fix error when restarting the Live Stream service
Changed command to use systemctl to restart the icecast2 service, the error wasn't fatal but just made it look like restarting the live stream service had failed.
2023-04-08 11:14:04 +10:00
ehpersonal38 712f4b034a Revert "Merge pull request #829 from lloydbayley/main"
This reverts commit 3abc483ef5, reversing
changes made to 21beea2f2d.
2023-04-07 21:08:42 -04:00
jaredb7 f1d440cda6 Merge branch 'BirdNET-pi-main' into More-Misc-Fixes-and-Enhancements_mcguire 2023-04-08 11:07:19 +10:00
ehpersonal38 3abc483ef5 Merge pull request #829 from lloydbayley/main
Tidy up some UI things that were bugging me.
2023-04-07 20:57:15 -04:00
ehpersonal38 21beea2f2d perms 2023-04-07 15:01:34 -04:00
ehpersonal38 fecfe40760 perms 2023-04-07 15:01:21 -04:00
ehpersonal38 bf6bee2e67 syntax error 2023-04-07 13:05:18 -04:00
lloydbayley 0acb3cec62 Update advanced.php
Missed a capitalisation...oops!
2023-04-07 23:35:34 +10:00
lloydbayley a4b18fb066 Update config.php
Tidy Up UI
2023-04-07 23:22:47 +10:00
lloydbayley 3c421aae62 Update advanced.php
Tidy Up UI
2023-04-07 23:22:38 +10:00
jaredb7 1018fbf40d Fix Excluded Species search for Chrome
Appears to be a issue scrolling a select list option into view and then setting it's selected state to true (as if the user had clicked on it) this seems to break all future calls of scrollIntoView on any options, regardless if the selected state if removed from all options.

scrollIntoView works perfectly otherwise and opted to apply a style to visually highlight the option. This turned out way better
2023-04-07 19:19:05 +10:00
ehpersonal38 9b6d3d7f0a Merge pull request #821 from Normanras/audio_errors
Created try/except statement around reading the audio data
2023-04-06 20:15:10 -04:00
jaredb7 8b33cee93d Enhancement - Update Spectrogram page to show detection labels on RTSP streams
Added in logic to handle finding the correct 'newest' detection's CSV file for the stream being listened to, the script will look in the sound card recordings location as usual, if it finds nothing there, then look in the StreamData folder for files matching the currently listened stream

Updated spectrogram.sh to not execute sox if the file mentioned in analyzing now does not exist, this is just to try reduce noise in the logs

Fixed my mis-spelling of RTSP again

Small tweak to the Javascript responsible for drawing the labels on the spectrogram to accommodate the inclusion of RTSP_X in the streams filename
2023-04-07 09:46:31 +10:00
jaredb7 bb1ac2dd70 Fix alignment of new RTSP stream URL input field
Remove style that was indenting the input field, this isn't needed anymore since we aren't trying to align with the label
2023-04-07 08:59:58 +10:00
jaredb7 7972452d61 Merge branch 'BirdNET-pi-main' into Misc-Fixes-and-Enhancements__mcguirepr89- 2023-04-07 08:50:29 +10:00
ehpersonal38 99c308827b Merge branch 'main' of https://github.com/mcguirepr89/BirdNET-Pi 2023-04-06 14:05:08 -04:00
ehpersonal38 32539a65a6 fix git diff --stat
previously it would show changes between the current HEAD and the previous HEAD, which would neglect to show all the file changes from multiple commits, only the most recent one. this makes sure we store the HEAD hash from before the system is updated, and then compared to HEAD after it's updated.

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
2023-04-06 14:04:51 -04:00
ehpersonal38 c05ce2685d fix git diff --stat
previously it would show changes between the current HEAD and the previous HEAD, which would neglect to show all the file changes from multiple commits, only the most recent one. this makes sure we store the HEAD hash from before the system is updated, and then compared to HEAD after it's updated.

Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
2023-04-06 13:36:01 -04:00
ehpersonal38 825e3926fa Lloyd's suggestions
Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
2023-04-06 13:26:31 -04:00
Norm Rasmussen 8afaf66ea7 Create try/except statement around reading the audio data from the recordings. See the issue linked in the PR. By clearing the text in analyzing_now, my system moves past the error-causing file and continues processing. 2023-04-03 22:04:38 -04:00
jaredb7 8fbc8fdb16 Slight cosmetic change to the RTSP input boxes
Move the first input box down one line instead of being inline with the label. Makes alignment simple and work on mobile
2023-04-03 20:22:30 +10:00
jaredb7 cded6dd031 Update spelling for the RTSP acronym 2023-04-01 22:46:05 +10:00
jaredb7 ae94cbc189 Enhancement to allow simultaneous RTSP stream recording
Updated birdnet_recording.sh
With a functional change around how ffmpeg is used to make use if it's functionality to accept multiple input streams and map each to a output file.
Due to the original implementation generating a  filename that contain the date/time streams would be writing to the same file - a small change was make each stream go to it's one file with unique filenames.

Updated livestream.sh & spectrogram.php
The Livestream service would fail if the RTSP stream setting was more than 1 stream (i.e comma separated list of streams)
Made some improvements so streaming is possible from any of the URL's, The Spectrogram page received a new control and some Javascript that allows the user to change between streams, the setting gets saved and the livestream service restarted so it uses's the correct stream.
This control is not visible if there are no RTSP streams configured
By default the livestream service will stream the the first RTSP URL, if the setting is not set or invalid

Updated advanced.php
With a small GUI change around RTSP steam entry by providing a input field for each URL and a button to add more fields.
In the background nothing changes as we use some Javascript to extract the valus entered and fill in the original rtsp_stream value with the correct comma separated string

Updated server.py
To work with the recording filename changes so that the correct filename is stored in the DB

Updated update_birdnet_snippets.sh
To support a new setting RTSP_STREAM_TO_LIVESTREAM on the Spectrogram page and in the livestream service
2023-04-01 22:29:02 +10:00
jaredb7 b51b6df1af If vcgencmd is not installed don't try to execute it
More a x86 fix as this package is not installed nor will it return any useful info.
2023-04-01 22:14:37 +10:00
jaredb7 3cdc9634aa Search Enhancement for Excluded Species List
Added basic functionality for the user to fileter/search for specie labels when looking for species to exclude. When a result is found, that option is selected and scrolled into view for the user to see.
2023-04-01 22:14:37 +10:00
jaredb7 b7928e2f41 Misc element fixes - no functional changes 2023-04-01 22:14:36 +10:00
jaredb7 2efc15eb94 Some element tag fixes and added a link to the recording when on mobile
On mobile a new icon has been added to allow the user to jump to the detection's recording. Allowing the user listed to the recording as no playback controls are available when on mobile.
This is the same function available for the most recent recording
2023-04-01 22:14:35 +10:00
jaredb7 698cce0b65 Update config.php
Fix the request URL used to restart php once the settings have been saved
2023-04-01 22:14:35 +10:00
ehpersonal38 a45018b473 making things more secure 2023-03-30 14:15:01 -04:00
ehpersonal38 5f4fd66835 Revert "Revert "perms""
This reverts commit 11b6c11e49.
2023-03-29 20:51:05 -04:00
ehpersonal38 11b6c11e49 Revert "perms"
This reverts commit 90e82c948f.
2023-03-29 20:44:30 -04:00
ehpersonal38 90e82c948f perms 2023-03-29 20:09:00 -04:00
Jurriaan Pruis 6c40e00d87 Fix nocache param in history.php 2023-03-29 19:14:03 +02:00
Patrik Winroth ceba1fdc27 Update server.py 2023-03-29 10:38:48 +02:00
ehpersonal38 f1fed278e8 Limit 5 => Limit 15, more time for spectrograms to be created 2023-03-27 16:04:59 -04:00
ehpersonal38 2a1d1693fe Fixing time display issues 2023-03-27 16:03:25 -04:00
ehpersonal38 af8e7d433f clarifying some language 2023-03-24 14:46:48 -04:00
ehpersonal38 1b2f3e16b3 Backlog clarification 2023-03-24 13:41:34 -04:00
ehpersonal38 cff6e9ae17 Fix custom image displaying when its not set
Co-Authored-By: lloydbayley <21309308+lloydbayley@users.noreply.github.com>
2023-03-23 11:51:10 -04:00
ehpersonal38 44edeab688 hopefully these perms work 2023-03-23 11:43:18 -04:00