prepare('SELECT DISTINCT(Date) FROM detections GROUP BY Date');
- if($statement == False){
- echo "Database is busy";
- header("refresh: 0;");
+if (file_exists('./scripts/thisrun.txt')) {
+ $config = parse_ini_file('./scripts/thisrun.txt');
+} elseif (file_exists('firstrun.ini')) {
+ $config = parse_ini_file('firstrun.ini');
+}
+
+$user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
+$home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
+$home = trim($home);
+
+if(isset($_GET['excludefile'])) {
+ if(isset($_SERVER['PHP_AUTH_USER'])) {
+ $submittedpwd = $_SERVER['PHP_AUTH_PW'];
+ $submitteduser = $_SERVER['PHP_AUTH_USER'];
+ if($submittedpwd == $config['CADDY_PWD'] && $submitteduser == 'birdnet'){
+ if(!file_exists($home."/BirdNET-Pi/scripts/disk_check_exclude.txt")) {
+ file_put_contents($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", "##start\n##end");
+ }
+ if(isset($_GET['exclude_add'])) {
+ $myfile = fopen($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", "a") or die("Unable to open file!");
+ $txt = $_GET['excludefile'];
+ fwrite($myfile, $txt."\n");
+ fwrite($myfile, $txt.".png\n");
+ fclose($myfile);
+ echo "OK";
+ die();
+ } else {
+ $lines = file($home."/BirdNET-Pi/scripts/disk_check_exclude.txt");
+ $search = $_GET['excludefile'];
+
+ $result = '';
+ foreach($lines as $line) {
+ if(stripos($line, $search) === false && stripos($line, $search.".png") === false) {
+ $result .= $line;
+ }
+ }
+ file_put_contents($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", $result);
+ echo "OK";
+ die();
+ }
+ } else {
+ header('WWW-Authenticate: Basic realm="My Realm"');
+ header('HTTP/1.0 401 Unauthorized');
+ echo 'You must be authenticated to change the protection of files.';
+ exit;
+ }
+ } else {
+ header('WWW-Authenticate: Basic realm="My Realm"');
+ header('HTTP/1.0 401 Unauthorized');
+ echo 'You must be authenticated to change the protection of files.';
+ exit;
}
- $result = $statement->execute();
- $view = "bydate";
- #By Date
-}elseif(isset($_GET['bydate'])){
- $statement = $db->prepare('SELECT DISTINCT(Date) FROM detections GROUP BY Date');
+}
+
+if(isset($_GET['bydate'])){
+ $statement = $db->prepare('SELECT DISTINCT(Date) FROM detections GROUP BY Date ORDER BY Date DESC');
if($statement == False){
echo "Database is busy";
header("refresh: 0;");
@@ -79,7 +123,6 @@ if(isset($_GET['byfilename'])){
session_unset();
$view = "choose";
}
-
?>
@@ -90,6 +133,31 @@ if(isset($_GET['byfilename'])){
+
+
-
";}
+ $date ";}}
#By Species
} elseif($view == "byspecies") {
while($results=$result->fetchArray(SQLITE3_ASSOC)){
$name = $results['Com_Name'];
+
echo "
$name ";}
@@ -135,8 +204,11 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
} elseif($view == "date") {
while($results=$result->fetchArray(SQLITE3_ASSOC)){
$name = $results['Com_Name'];
- echo "
- $name ";}
+ if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_",$name)) !== false){
+ echo "
+ $name ";
+ }
+ }
#Choose
} else {
@@ -151,13 +223,42 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
}
#Specific Species
-if(isset($_GET['species'])){
+if(isset($_GET['species'])){ ?>
+
+prepare("SELECT * FROM detections where Com_Name == \"$name\" AND Date == \"$date\" ORDER BY Time DESC");
+ if(isset($_GET['sort']) && $_GET['sort'] == "confidence") {
+ $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" AND Date == \"$date\" ORDER BY Confidence DESC");
+ } else {
+ $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" AND Date == \"$date\" ORDER BY Time DESC");
+ }
} else {
- $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" ORDER BY Date DESC, Time DESC");}
+ if(isset($_GET['sort']) && $_GET['sort'] == "confidence") {
+ $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" ORDER BY Confidence DESC");
+ } else {
+ $statement2 = $db->prepare("SELECT * FROM detections where Com_Name == \"$name\" ORDER BY Date DESC, Time DESC");
+ }
+ }
if($statement2 == False){
echo "Database is busy";
header("refresh: 0;");
@@ -167,6 +268,7 @@ if(isset($_GET['species'])){
$name
";
+ $iter=0;
while($results=$result2->fetchArray(SQLITE3_ASSOC))
{
$comname = preg_replace('/ /', '_', $results['Com_Name']);
@@ -176,13 +278,40 @@ if(isset($_GET['species'])){
$sciname = preg_replace('/ /', '_', $results['Sci_Name']);
$sci_name = $results['Sci_Name'];
$time = $results['Time'];
- $confidence = $results['Confidence'];
- echo "
- ";
+ $confidence = round((float)round($results['Confidence'],2) * 100 ) . '%';
+ $filename_formatted = $date."/".$comname."/".$results['File_Name'];
- }echo "
";}
+ // file was deleted by disk check, no need to show the detection in recordings
+ if(!file_exists($home."/BirdSongs/Extracted/".$filename)) {
+ continue;
+ }
+ $iter++;
+
+ if($config["FULL_DISK"] == "purge") {
+ if(!in_array($filename_formatted, $disk_check_exclude_arr)) {
+ $imageicon = "images/unlock.svg";
+ $title = "This file is not delete protected.";
+ $type = "add";
+ } else {
+ $imageicon = "images/lock.svg";
+ $title = "This file is delete protected.";
+ $type = "del";
+ }
+
+ echo "
+ $date $time
+ ";
+ } else {
+ echo "
+ $date $time
+ ";
+ }
+
+ }if($iter == 0){ echo "
No recordings were found. They may have been deleted to make space for new recordings. You can modify this setting for the future in Tools -> Settings -> Advanced Settings -> Full Disk Behavior. ";}echo "";}
if(isset($_GET['filename'])){
$name = $_GET['filename'];
@@ -205,11 +334,36 @@ if(isset($_GET['filename'])){
$sciname = preg_replace('/ /', '_', $results['Sci_Name']);
$sci_name = $results['Sci_Name'];
$time = $results['Time'];
- $confidence = $results['Confidence'];
- echo "
- $date $time
- ";
+ $confidence = round((float)round($results['Confidence'],2) * 100 ) . '%';
+ $filename_formatted = $date."/".$comname."/".$results['File_Name'];
+
+ // add disk_check_exclude.txt lines into an array for grepping
+ $fp = @fopen($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", 'r');
+ if ($fp) {
+ $disk_check_exclude_arr = explode("\n", fread($fp, filesize($home."/BirdNET-Pi/scripts/disk_check_exclude.txt")));
+ }
+
+ if($config["FULL_DISK"] == "purge") {
+ if(!in_array($filename_formatted, $disk_check_exclude_arr)) {
+ $imageicon = "images/unlock.svg";
+ $title = "This file is not delete protected.";
+ $type = "add";
+ } else {
+ $imageicon = "images/lock.svg";
+ $title = "This file is delete protected.";
+ $type = "del";
+ }
+
+ echo "
+ ";
+ } else {
+ echo "
+ $date $time
+ ";
+ }
}echo "";}?>
diff --git a/scripts/plotly_streamlit.py b/scripts/plotly_streamlit.py
index b42906d..da8d771 100755
--- a/scripts/plotly_streamlit.py
+++ b/scripts/plotly_streamlit.py
@@ -60,7 +60,8 @@ df2=df2.set_index('DateTime')
# Date as slider
Start_Date = pd.to_datetime(df2.index.min()).date()
End_Date = pd.to_datetime(df2.index.max()).date()
-Date_Slider = st.slider('Date Range',
+cols1,cols2= st.columns((1,1))
+Date_Slider = cols1.slider('Date Range',
min_value = Start_Date-timedelta(days=1),
max_value = End_Date,
value=(Start_Date,
@@ -72,14 +73,29 @@ Date_Slider = st.slider('Date Range',
filt = (df2.index >= pd.Timestamp(Date_Slider[0])) & (df2.index <= pd.Timestamp(Date_Slider[1]+timedelta(days=1)))
df2 = df2[filt]
+st.write('', unsafe_allow_html=True)
+st.write('', unsafe_allow_html=True)
+
+resample_sel=cols2.radio("Select Resample Resolution - To downsample and make run faster select longer period, Daily provides a view on detections at 15 min intervals through the day", ('1 minute', '5 minutes', '10 minutes', 'Hourly', 'Daily'))
+
+resample_times = {'1 minute':'1min',
+ '5 minutes':'5min',
+ '10 minutes':'10min',
+ 'Hourly':'1H',
+ 'Daily':'1D'
+ }
+resample_time = resample_times[resample_sel]
+
+df5=df2.resample(resample_time)['Com_Name'].aggregate('unique').explode()
+
#Create species count for selected date range
-Specie_Count=df2['Com_Name'].value_counts()
+Specie_Count=df5.value_counts()
#Create species treemap
# Create Hourly Crosstab
-hourly=pd.crosstab(df2['Com_Name'],df2.index.hour, dropna=False)
+hourly=pd.crosstab(df5,df5.index.hour, dropna=False)
# Filter on species
species = list(hourly.index)
@@ -91,7 +107,7 @@ top_N = cols1.slider(
value=min(10,len(Specie_Count))
)
-top_N_species = (df2['Com_Name'].value_counts()[:top_N])
+top_N_species = (df5.value_counts()[:top_N])
specie = cols2.selectbox('Which bird would you like to explore for the dates '+str(Date_Slider[0])+' to '+str(Date_Slider[1])+'?', species,
@@ -104,13 +120,13 @@ font_size=15
#specie filter
filt=df2['Com_Name']==specie
-df_counts=df2[filt].resample('D').count()
+df_counts=sum(df5==specie)
fig = make_subplots(
rows=3, cols =2,
specs= [[{"type":"xy","rowspan":3}, {"type":"polar","rowspan":2}], [{"rowspan":1}, {"rowspan":1} ], [None, {"type":"xy","rowspan":1}]],
subplot_titles=('
Top '+ str(top_N) + ' Species in Date Range '+str(Date_Slider[0])+' to '+str(Date_Slider[1])+' ',
- 'Total Detect:'+str('{:,}'.format(sum(df_counts.Time)))+
+ 'Total Detect:'+str('{:,}'.format(df_counts))+
' Confidence Max:'+str('{:.2f}%'.format(max(df2[df2['Com_Name']==specie]['Confidence'])*100))+
' '+' Median:'+str('{:.2f}%'.format(np.median(df2[df2['Com_Name']==specie]['Confidence'])*100))
)
@@ -123,43 +139,80 @@ fig.add_trace(go.Bar(y=top_N_species.index, x=top_N_species, orientation='h'), r
fig.update_layout(
margin=dict(l=0, r=0, t=50, b=0),
yaxis={'categoryorder':'total ascending'})
+
+
# Set 360 degrees, 24 hours for polar plot
theta = np.linspace(0.0, 360, 24, endpoint=False)
+specie_filt= df5==specie
+df3=df5[specie_filt]
+
+detections2= pd.crosstab(df3, df3.index.hour)
+
+
+
+
d=pd.DataFrame(np.zeros((23,1))).squeeze()
detections = hourly.loc[specie]
detections=(d+detections).fillna(0)
-fig.add_trace(go.Barpolar(r = detections, theta=theta), row=1, col=2)
-fig.update_layout(
- autosize=False,
- width = 1000,
- height = 500,
- showlegend=False,
- polar = dict(
- radialaxis = dict(
- tickfont_size = font_size,
- showticklabels = True,
- hoverformat = "#%{theta}:
Popularity: %{percent} %{r}"
+
+if resample_time != '1D':
+ fig.add_trace(go.Barpolar(r = detections, theta=theta), row=1, col=2)
+ fig.update_layout(
+ autosize=False,
+ width = 1000,
+ height = 500,
+ showlegend=False,
+ polar = dict(
+ radialaxis = dict(
+ tickfont_size = font_size,
+ showticklabels = False,
+ hoverformat = "#%{theta}:
Popularity: %{percent} %{r}"
+ ),
+ angularaxis = dict(
+ tickfont_size= font_size,
+ rotation = -90,
+ direction = 'clockwise',
+ tickmode='array',
+ tickvals=[0,15,35,45,60,75,90,105,120,135,150,165,180,195,210,225,240,255,270,285,300,315,330,345],
+ ticktext=['12am','1am','2am','3am','4am','5am', '6am','7am','8am','9am','10am','11am','12pm','1pm','2pm','3pm','4pm','5pm', '6pm','7pm','8pm','9pm','10pm','11pm'],
+ hoverformat = "#%{theta}:
Popularity: %{percent} %{r}"
),
- angularaxis = dict(
- tickfont_size= font_size,
- rotation = -90,
- direction = 'clockwise',
- tickmode='array',
- tickvals=[0,15,35,45,60,75,90,105,120,135,150,165,180,195,210,225,240,255,270,285,300,315,330,345],
- ticktext=['12am','1am','2am','3am','4am','5am', '6am','7am','8am','9am','10am','11am','12pm','1pm','2pm','3pm','4pm','5pm', '6pm','7pm','8pm','9pm','10pm','11pm'],
- hoverformat = "#%{theta}:
Popularity: %{percent} %{r}"
- ),
- ),
- )
+ ),
+ )
-daily=pd.crosstab(df2['Com_Name'],df2.index.date, dropna=False)
+ daily=pd.crosstab(df5,df5.index.date, dropna=False)
-fig.add_trace(go.Bar(x=daily.columns, y=daily.loc[specie]), row=3, col=2)
+ fig.add_trace(go.Bar(x=daily.columns, y=daily.loc[specie]), row=3, col=2)
+else:
+ fig = make_subplots(
+ rows=1, cols =2,
+# specs= [[{"type":"xy","rowspan":1}],
+# [{"rowspan":1}],
+# ],
+# subplot_titles=('
Top '+ str(top_N) + ' Species in Date Range '+str(Date_Slider[0])+' to '+str(Date_Slider[1])+' ',
+# 'Total Detect:'+str('{:,}'.format(df_counts))+
+# ' Confidence Max:'+str('{:.2f}%'.format(max(df2[df2['Com_Name']==specie]['Confidence'])*100))+
+# ' '+' Median:'+str('{:.2f}%'.format(np.median(df2[df2['Com_Name']==specie]['Confidence'])*100))
+# )
+ )
+ df4=df2['Com_Name'][df2['Com_Name']==specie].resample('15min').count()
+ df4.index=[df4.index.date, df4.index.time]
+ day_hour_freq=df4.unstack().fillna(0)
+
+ fig_x = [d.strftime('%d-%m-%Y') for d in day_hour_freq.index.tolist()]
+ fig_y = [h.strftime('%H:%M') for h in day_hour_freq.columns.tolist()]
+ fig_z = day_hour_freq.values.transpose()
+ fig_heatmap = go.Figure(data=go.Heatmap(x=fig_x,y=fig_y,z=fig_z))
+ fig.add_trace(go.Bar(y=top_N_species.index, x=top_N_species, orientation='h'), row=1,col=1)
+ fig.update_layout(
+ margin=dict(l=0, r=0, t=50, b=0),
+ yaxis={'categoryorder':'total ascending'})
+ fig.add_trace(go.Heatmap(x=fig_x,y=fig_y,z=fig_z, autocolorscale = False, colorscale = 'blackbody'), row=1, col=2)
# container=st.container()
# config={'displayModelBar': False}
st.plotly_chart(fig, use_container_width=True) #, config=config)
diff --git a/scripts/restart_services.sh b/scripts/restart_services.sh
index f0cead9..98993af 100755
--- a/scripts/restart_services.sh
+++ b/scripts/restart_services.sh
@@ -22,6 +22,6 @@ sudo systemctl restart "${i}"
done
until grep 5050 <(netstat -tulpn 2>&1);do
sudo systemctl restart birdnet_server.service
-sleep 20
+sleep 30
done
sudo systemctl restart birdnet_analysis.service
diff --git a/scripts/server.py b/scripts/server.py
index 6c96e12..35833e1 100755
--- a/scripts/server.py
+++ b/scripts/server.py
@@ -261,7 +261,7 @@ def writeResultsToFile(detections, min_conf, path):
def handle_client(conn, addr):
global INCLUDE_LIST
global EXCLUDE_LIST
- print(f"[NEW CONNECTION] {addr} connected.")
+ #print(f"[NEW CONNECTION] {addr} connected.")
connected = True
while connected:
@@ -335,7 +335,7 @@ def handle_client(conn, addr):
# Get Date/Time from filename in case Pi gets behind
#now = datetime.now()
full_file_name = args.i
- print('FULL FILENAME: -' + full_file_name + '-')
+ #print('FULL FILENAME: -' + full_file_name + '-')
file_name = Path(full_file_name).stem
file_date = file_name.split('-birdnet-')[0]
file_time = file_name.split('-birdnet-')[1]
@@ -463,13 +463,13 @@ def start():
global INTERPRETER, INCLUDE_LIST, EXCLUDE_LIST
INTERPRETER = loadModel()
server.listen()
- print(f"[LISTENING] Server is listening on {SERVER}")
+ #print(f"[LISTENING] Server is listening on {SERVER}")
while True:
conn, addr = server.accept()
thread = threading.Thread(target=handle_client, args=(conn, addr))
thread.start()
- print(f"[ACTIVE CONNECTIONS] {threading.activeCount() - 1}")
+ #print(f"[ACTIVE CONNECTIONS] {threading.activeCount() - 1}")
-print("[STARTING] server is starting...")
+#print("[STARTING] server is starting...")
start()
diff --git a/scripts/spectrogram.php b/scripts/spectrogram.php
index 8140cfc..48eb20f 100644
--- a/scripts/spectrogram.php
+++ b/scripts/spectrogram.php
@@ -1,16 +1,85 @@
-";
-?>
+
+
+
+
Loading...
+
+
diff --git a/scripts/stats.php b/scripts/stats.php
index 230a54a..fce469b 100644
--- a/scripts/stats.php
+++ b/scripts/stats.php
@@ -56,7 +56,18 @@ if(isset($_GET['species'])){
$user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
$home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
$home = trim($home);
-file_put_contents($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", "");
+if(!file_exists($home."/BirdNET-Pi/scripts/disk_check_exclude.txt")) {
+ file_put_contents($home."/BirdNET-Pi/scripts/disk_check_exclude.txt", "##start\n##end");
+}
+function editfile( $sourcefile, $start='##start', $end='##end', $data=array() ){
+ $lines=array_filter( file( $sourcefile , FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES ) );
+ $output=array_merge(
+ array_splice( $lines, 0, array_search( strtolower( $start ), array_map('strtolower', $lines ) ) + 1 ),
+ $data,
+ array_splice( $lines, array_search( strtolower( $end ), array_map('strtolower', $lines ) ) )
+ );
+ file_put_contents( $sourcefile, implode( PHP_EOL, $output ) );
+}
?>
@@ -106,17 +117,40 @@ $filename = "/By_Date/".$results['Date']."/".$comname."/".$results['File_Name'];