avoid duplicates

bluecherrydvr · Jan 13, 2024 · 7336df7 · 7336df7
1 parent 70306e8
commit 7336df7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/www/ajax/discoverCameras.php b/www/ajax/discoverCameras.php
@@ -175,14 +175,17 @@ public function postData()
         );
 
         $tools = Array(
-            "/usr/lib/bluecherry/onvif/discovery_json/onvif_tool",
             "/usr/lib/bluecherry/onvif/discovery_json/node-onvif.js",
+            "/usr/lib/bluecherry/onvif/discovery_json/onvif_tool",
         );
         foreach ($tools as $tool) {
             $p = @popen($tool, "r");
             if (!$p) { continue; }
             while ($json_str = fgets($p)) {
                 $cam = json_decode($json_str);
+                $ip = $cam['ipv4'];
+                // append, unless already reported by earlier tools
+                if (in_array($ip, $ips)) { continue; }
                 $res[] = $cam;
                 $ips[] = $cam['ipv4'];
             }