Correction score detect

Author: sagitaz

core/class/frigate.class.php

@@ -2023,10 +2023,10 @@ public static function updateTrackedObjects($trackedObjects)
     log::add(__CLASS__, 'debug', "║ Données reçues : " . json_encode($trackedObjects));
 
     // Création / Mise à jour de la base de données
-    self::updateDatabase($frigateEvent, $type, $trackedObjects);
+    $frigateEvent = self::updateDatabase($frigateEvent, $type, $trackedObjects);
 
     // Création / mise à jour des commandes Jeedom
-    self::updateCommands($eqlogicId, $type, $trackedObjects);
+    self::updateCommands($eqlogicId, $type, $frigateEvent);
 
     log::add(__CLASS__, 'debug', "╚════════════════════════ END UPDATE TRACKED OBJECTS ═══════════════════");
   }
@@ -2052,25 +2052,37 @@ private static function updateDatabase($frigateEvent, $type, $trackedObjects)
         log::add(__CLASS__, 'debug', "║ MAJ DB → Reconnaissance faciale");
         $frigateEvent->setRecognition_type("face");
         $frigateEvent->setRecognition_name($trackedObjects['name'] ?? '');
-        $frigateEvent->setRecognition_score($trackedObjects['score'] ?? '');
+        // le score doit etre multiplié par 100 pour être en pourcentage
+        $score = $trackedObjects['score'] ?? '';
+        if (is_numeric($score)) {
+          $score = round($score * 100, 2);
+        }
+        $frigateEvent->setRecognition_score($score);
+
         break;
 
       case "lpr":
         log::add(__CLASS__, 'debug', "║ MAJ DB → Plaque d’immatriculation");
         $frigateEvent->setRecognition_type("lpr");
         $frigateEvent->setRecognition_plate($trackedObjects['plate'] ?? '');
         $frigateEvent->setRecognition_name($trackedObjects['name'] ?? '');
-        $frigateEvent->setRecognition_score($trackedObjects['score'] ?? '');
+        // le score doit etre multiplié par 100 pour être en pourcentage
+        $score = $trackedObjects['score'] ?? '';
+        if (is_numeric($score)) {
+          $score = round($score * 100, 2);
+        }
+        $frigateEvent->setRecognition_score($score);
         break;
 
       default:
         log::add(__CLASS__, 'debug', "║ Type de suivi inconnu : $type");
-        return;
+        return null;
     }
 
     $frigateEvent->save();
+    return $frigateEvent;
   }
-  private static function updateCommands($eqlogicId, $type, $trackedObjects)
+  private static function updateCommands($eqlogicId, $type, $frigateEvent)
   {
     log::add(__CLASS__, 'debug', "║ MAJ Commandes pour le type : $type");
 
@@ -2084,36 +2096,36 @@ private static function updateCommands($eqlogicId, $type, $trackedObjects)
       case "description":
         $cmd = self::createCmd($eqlogicId, "description", "string", "", "info_description", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['description'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_description() ?? '');
         $cmd->save();
         break;
 
       case "face":
-        $cmd = self::createCmd($eqlogicId, "Nom", "string", "", "info_detection_name", "", 0, null, 0);
+        $cmd = self::createCmd($eqlogicId, "Nom de la reconnaissance", "string", "", "info_detection_name", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['name'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_name() ?? '');
         $cmd->save();
 
-        $cmd = self::createCmd($eqlogicId, "Score de detection", "numeric", "%", "info_detection_score", "", 0, null, 0);
+        $cmd = self::createCmd($eqlogicId, "Score de la reconnaissance", "numeric", "%", "info_detection_score", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['score'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_score() ?? '');
         $cmd->save();
         break;
 
       case "lpr":
         $cmd = self::createCmd($eqlogicId, "Plaque d'immatriculation", "string", "", "info_plate", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['plate'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_plate() ?? '');
         $cmd->save();
 
-        $cmd = self::createCmd($eqlogicId, "Nom", "string", "", "info_detection_name", "", 0, null, 0);
+        $cmd = self::createCmd($eqlogicId, "Nom de la reconnaissance", "string", "", "info_detection_name", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['name'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_name() ?? '');
         $cmd->save();
 
-        $cmd = self::createCmd($eqlogicId, "Score de detection", "numeric", "%", "info_detection_score", "", 0, null, 0);
+        $cmd = self::createCmd($eqlogicId, "Score de la reconnaissance", "numeric", "%", "info_detection_score", "", 0, null, 0);
         $cmd->save();
-        $cmd->event($trackedObjects['score'] ?? '');
+        $cmd->event($frigateEvent->getRecognition_score() ?? '');
         $cmd->save();
         break;
     }

docs/fr_FR/index.md

@@ -9,12 +9,16 @@ Le plugin et le support sont gratuits, vous souhaitez néanmoins m'offrir un caf
 - Community Jeedom
 - Discord JeeMate
 
-Pour toute demande d'aide sur Community ou Discord, merci de fournir le maximum d'informations possibles.
+Pour toute demande d'aide sur Community ou Discord, merci de fournir le maximum d'informations possibles. (matériel, type de caméra, version de Jeedom, de Frigate, de votre système, etc...)
 
 Sur la page configuration, le bouton assistance permet déjà d'en remplir automatiquement certaines.
 
-Donner aussi des logs en mode debug.
+Assurer vous d'avoir le matériel compatible pour Frigate et que ce dernier fonctionne correctement avant de demander de l'aide sur le plugin. (voir la documentation officielle de Frigate pour les configurations matérielle recommandées).
+
+Donner aussi des logs en mode debug. (ceux du plugin et du serveur Frigate).
+
 Aucun support ne sera apporté sur d'autres moyens de communication que ceux-ci.
+
 Merci