From d6bdb5c3457f4d712c06c0884117561ff44c764c Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Mon, 16 May 2022 08:16:33 -0400
Subject: [PATCH] Don't show dates that don't have any recordings
---
scripts/play.php | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/scripts/play.php b/scripts/play.php
index 2b4058d..87912a8 100644
--- a/scripts/play.php
+++ b/scripts/play.php
@@ -9,18 +9,9 @@ if($db == False){
header("refresh: 0;");
}
-#By Date
-if(isset($_GET['byfilename'])){
- $statement = $db->prepare('SELECT DISTINCT(Date) FROM detections GROUP BY Date');
- if($statement == False){
- echo "Database is busy";
- header("refresh: 0;");
- }
- $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 +70,9 @@ if(isset($_GET['byfilename'])){
session_unset();
$view = "choose";
}
-
+$user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
+$home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
+$home = trim($home);
?>
@@ -121,13 +114,15 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
if($view == "bydate") {
while($results=$result->fetchArray(SQLITE3_ASSOC)){
$date = $results['Date'];
+ if(realpath($home."/BirdSongs/Extracted/By_Date/".$date) !== false){
echo "|
- | ";}
+ ";}}
#By Species
} elseif($view == "byspecies") {
while($results=$result->fetchArray(SQLITE3_ASSOC)){
$name = $results['Com_Name'];
+
echo "
| ";}
@@ -135,8 +130,11 @@ if(!isset($_GET['species']) && !isset($_GET['filename'])){
} elseif($view == "date") {
while($results=$result->fetchArray(SQLITE3_ASSOC)){
$name = $results['Com_Name'];
- echo "
- | ";}
+ if(realpath($home."/BirdSongs/Extracted/By_Date/".$date."/".str_replace(" ", "_",$name)) !== false){
+ echo "
+ | ";
+ }
+ }
#Choose
} else {
@@ -190,9 +188,6 @@ if(isset($_GET['species'])){ ?>
| $name |
";
- $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
- $home = shell_exec("awk -F: '/1000/{print $6}' /etc/passwd");
- $home = trim($home);
$iter=0;
while($results=$result2->fetchArray(SQLITE3_ASSOC))
{