Flickr now uses English names

This is totally the right way to add files to a folder that's in .gitignore. Right? _Right..._ @mcguirepr89

.gitignore

@@ -1,6 +1,5 @@
 *.pyc
 *.flac
-model/*
 .vscode
 datasets/
 birdnet.conf

scripts/overview.php

@@ -17,6 +17,10 @@ if (file_exists('./scripts/thisrun.txt')) {
   $config = parse_ini_file('./scripts/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['ajax_detections']) && $_GET['ajax_detections'] == "true" && isset($_GET['previous_detection_identifier'])) {
 
   $statement4 = $db->prepare('SELECT Com_Name, Sci_Name, Date, Time, Confidence, File_Name FROM detections ORDER BY Date DESC, Time DESC LIMIT 5');
@@ -29,6 +33,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
     $_SESSION['images'] = [];
   }
   $iterations = 0;
+  $lines;
   // hopefully one of the 5 most recent detections has an image that is valid, we'll use that one as the most recent detection until the newer ones get their images created
   while($mostrecent = $result4->fetchArray(SQLITE3_ASSOC)) {
     $comname = preg_replace('/ /', '_', $mostrecent['Com_Name']);
@@ -58,6 +63,18 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true" && isse
         if($key !== false) {
           $image = $_SESSION['images'][$key];
         } else {
+          // only open the file once per script execution
+          if(!isset($lines)) {
+            $lines = file($home."/BirdNET-Pi/model/labels_flickr.txt");
+          }
+          // convert sci name to English name
+          foreach($lines as $line){ 
+            if(strpos($line, $todaytable['Sci_Name']) !== false){
+              $engname = explode("_", $line)[1];
+              break;
+            }
+          }
+
          $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace("_", "%20", $comname)."&license=2%2C3%2C4%2C5%2C6%2C9&sort=relevance&per_page=5&orientation=square,portrait&format=json&media=photos&nojsoncallback=1"), true)["photos"]["photo"][0];
           $modaltext = "https://flickr.com/photos/".$flickrjson["owner"]."/".$flickrjson["id"];
           $authorlink = "https://flickr.com/people/".$flickrjson["owner"];

scripts/todays_detections.php

@@ -60,6 +60,10 @@ if($statement6 == False){
 $result6 = $statement6->execute();
 $totalspeciestally = $result6->fetchArray(SQLITE3_ASSOC);
 
+$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['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
   if(isset($_GET['searchterm'])) {
     $searchquery = "AND (Com_name LIKE '%".$_GET['searchterm']."%' OR Sci_name LIKE '%".$_GET['searchterm']."%' OR Confidence LIKE '%".$_GET['searchterm']."%' OR File_Name LIKE '%".$_GET['searchterm']."%' OR Time LIKE '%".$_GET['searchterm']."%')";
@@ -85,6 +89,7 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
     $_SESSION['images'] = [];
   }
   $iterations = 0;
+  $lines;
 
   if (file_exists('./scripts/thisrun.txt')) {
     $config = parse_ini_file('./scripts/thisrun.txt');
@@ -102,12 +107,25 @@ if(isset($_GET['ajax_detections']) && $_GET['ajax_detections'] == "true"  ) {
   $sciname = preg_replace('/ /', '_', $todaytable['Sci_Name']);
 
   if (!empty($config["FLICKR_API_KEY"])) {
+
     // if we already searched flickr for this species before, use the previous image rather than doing an unneccesary api call
     $key = array_search($comname, array_column($_SESSION['images'], 0));
     if($key !== false) {
       $image = $_SESSION['images'][$key];
     } else {
-      $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace("_", "%20", $comname)."&license=2%2C3%2C4%2C5%2C6%2C9&sort=relevance&per_page=5&orientation=square,portrait&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"][0];
+      // only open the file once per script execution
+      if(!isset($lines)) {
+        $lines = file($home."/BirdNET-Pi/model/labels_flickr.txt");
+      }
+      // convert sci name to English name
+      foreach($lines as $line){ 
+        if(strpos($line, $todaytable['Sci_Name']) !== false){
+          $engname = explode("_", $line)[1];
+          break;
+        }
+      }
+      
+      $flickrjson = json_decode(file_get_contents("https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=".$config["FLICKR_API_KEY"]."&text=".str_replace(" ", "%20", $engname)."&license=2%2C3%2C4%2C5%2C6%2C9&sort=relevance&per_page=5&orientation=square,portrait&media=photos&format=json&nojsoncallback=1"), true)["photos"]["photo"][0];
       $modaltext = "https://flickr.com/photos/".$flickrjson["owner"]."/".$flickrjson["id"];
       $authorlink = "https://flickr.com/people/".$flickrjson["owner"];
       $imageurl = 'http://farm' .$flickrjson["farm"]. '.static.flickr.com/' .$flickrjson["server"]. '/' .$flickrjson["id"]. '_'  .$flickrjson["secret"].  '.jpg';