Merge branch 'mcguirepr89:main' into main
This commit is contained in:
+1
-1
@@ -17,7 +17,7 @@ body::-webkit-scrollbar {
|
|||||||
display:none
|
display:none
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<link rel="stylesheet" href="style.css?v=8.05.22">
|
<link rel="stylesheet" href="style.css?v=1.20.23">
|
||||||
<link rel="stylesheet" type="text/css" href="static/dialog-polyfill.css" />
|
<link rel="stylesheet" type="text/css" href="static/dialog-polyfill.css" />
|
||||||
<body>
|
<body>
|
||||||
<div class="banner">
|
<div class="banner">
|
||||||
|
|||||||
@@ -576,6 +576,7 @@ button:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
button.legacyview {
|
button.legacyview {
|
||||||
|
display: none;
|
||||||
color:gray;
|
color:gray;
|
||||||
margin:5px;
|
margin:5px;
|
||||||
float:right;
|
float:right;
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ if (file_exists('./scripts/thisrun.txt')) {
|
|||||||
$config = parse_ini_file('./scripts/firstrun.ini');
|
$config = parse_ini_file('./scripts/firstrun.ini');
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<link rel="stylesheet" href="style.css?v=8.05.22">
|
<link rel="stylesheet" href="style.css?v=1.20.23">
|
||||||
<style>
|
<style>
|
||||||
body::-webkit-scrollbar {
|
body::-webkit-scrollbar {
|
||||||
display:none
|
display:none
|
||||||
|
|||||||
Binary file not shown.
@@ -8,7 +8,7 @@ if [ ! -z $RTSP_STREAM ];then
|
|||||||
[ -d $RECS_DIR/StreamData ] || mkdir -p $RECS_DIR/StreamData
|
[ -d $RECS_DIR/StreamData ] || mkdir -p $RECS_DIR/StreamData
|
||||||
while true;do
|
while true;do
|
||||||
for i in ${RTSP_STREAM//,/ };do
|
for i in ${RTSP_STREAM//,/ };do
|
||||||
ffmpeg -i ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
|
ffmpeg -nostdin -i ${i} -t ${RECORDING_LENGTH} -vn -acodec pcm_s16le -ac 2 -ar 48000 file:${RECS_DIR}/StreamData/$(date "+%F")-birdnet-$(date "+%H:%M:%S").wav
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -5,11 +5,11 @@ source /etc/birdnet/birdnet.conf
|
|||||||
if [ -z ${REC_CARD} ];then
|
if [ -z ${REC_CARD} ];then
|
||||||
echo "Stream not supported"
|
echo "Stream not supported"
|
||||||
elif [[ ! -z ${RTSP_STREAM} ]];then
|
elif [[ ! -z ${RTSP_STREAM} ]];then
|
||||||
ffmpeg -loglevel 32 -ac ${CHANNELS} -i ${RTSP_STREAM} -acodec libmp3lame \
|
ffmpeg -nostdin -loglevel 32 -ac ${CHANNELS} -i ${RTSP_STREAM} -acodec libmp3lame \
|
||||||
-b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
|
-b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
|
||||||
-f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
|
-f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
|
||||||
else
|
else
|
||||||
ffmpeg -loglevel 32 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
|
ffmpeg -nostdin -loglevel 32 -ac ${CHANNELS} -f alsa -i ${REC_CARD} -acodec libmp3lame \
|
||||||
-b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
|
-b:a 320k -ac ${CHANNELS} -content_type 'audio/mpeg' \
|
||||||
-f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
|
-f mp3 icecast://source:${ICE_PWD}@localhost:8000/stream -re
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -350,7 +350,28 @@ die();
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<h3>Number of Detections</h3>
|
<h3>Number of Detections</h3>
|
||||||
<div id="todaystats"></div>
|
<div id="todaystats"><table>
|
||||||
|
<tr>
|
||||||
|
<th>Total</th>
|
||||||
|
<th>Today</th>
|
||||||
|
<th>Last Hour</th>
|
||||||
|
<th>Unique Species Total</th>
|
||||||
|
<th>Unique Species Today</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><?php echo $totalcount['COUNT(*)'];?></td>
|
||||||
|
<form action="" method="GET">
|
||||||
|
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todaycount['COUNT(*)'];?></button><?php } else { echo $todaycount['COUNT(*)']; }?></td>
|
||||||
|
</form>
|
||||||
|
<td><?php echo $hourcount['COUNT(*)'];?></td>
|
||||||
|
<form action="" method="GET">
|
||||||
|
<td><?php if($kiosk == false){?><button type="submit" name="view" value="Species Stats"><?php echo $totalspeciestally['COUNT(DISTINCT(Com_Name))'];?></button><?php }else { echo $totalspeciestally['COUNT(DISTINCT(Com_Name))']; }?></td>
|
||||||
|
</form>
|
||||||
|
<form action="" method="GET">
|
||||||
|
<td><input type="hidden" name="view" value="Recordings"><?php if($kiosk == false){?><button type="submit" name="date" value="<?php echo date('Y-m-d');?>"><?php echo $todayspeciestally['COUNT(DISTINCT(Com_Name))'];?></button><?php } else { echo $todayspeciestally['COUNT(DISTINCT(Com_Name))']; }?></td>
|
||||||
|
</form>
|
||||||
|
</tr>
|
||||||
|
</table></div>
|
||||||
|
|
||||||
|
|
||||||
<h3>Today's Detections <?php if($kiosk == false) { ?>— <input autocomplete="off" size="11" type="text" placeholder="Search..." id="searchterm" name="searchterm"><?php } ?></h3>
|
<h3>Today's Detections <?php if($kiosk == false) { ?>— <input autocomplete="off" size="11" type="text" placeholder="Search..." id="searchterm" name="searchterm"><?php } ?></h3>
|
||||||
@@ -427,6 +448,7 @@ function searchDetections(searchvalue) {
|
|||||||
function loadDetections(detections_limit, element=undefined) {
|
function loadDetections(detections_limit, element=undefined) {
|
||||||
const xhttp = new XMLHttpRequest();
|
const xhttp = new XMLHttpRequest();
|
||||||
xhttp.onload = function() {
|
xhttp.onload = function() {
|
||||||
|
document.getElementsByClassName("legacyview")[0].style.display="unset";
|
||||||
if(typeof element !== "undefined")
|
if(typeof element !== "undefined")
|
||||||
{
|
{
|
||||||
element.remove();
|
element.remove();
|
||||||
|
|||||||
Reference in New Issue
Block a user