Merge pull request #30 from HHCBakker/Return-make-model-on-discovery

Added DiscoverAsyncWithMake to return the make and model from the ONV…

Author: jimm98y

src/Directory.Build.props

@@ -4,7 +4,7 @@
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<Nullable>disable</Nullable>
 		<Title>$(ProjectName)</Title>
-		<Version>0.3.0</Version>
+		<Version>0.4.1</Version>
 		<Authors>Lukas Volf</Authors>
 		<Copyright>MIT</Copyright>
 		<PackageProjectUrl>https://github.com/jimm98y/SharpOnvif</PackageProjectUrl>

src/OnvifClient/Program.cs

@@ -19,15 +19,27 @@ public static async Task Main(string[] args)
     static async Task MainAsync(string[] args)
     {
         var devices = await OnvifDiscoveryClient.DiscoverAsync();
-        var device = devices.FirstOrDefault(x => x.Contains("localhost"));
+
+        if (devices == null || devices.Count == 0)
+        {
+            Console.WriteLine("No ONVIF devices found. Please check your network connection and try again.");
+            return;
+        }
+
+        foreach (var onvifDevice in devices)
+        {
+            Console.WriteLine($"Found device: Manufacturer = {onvifDevice.Manufacturer}, Model = {onvifDevice.Hardware}");
+        }
+
+        var device = devices.FirstOrDefault(x => x.Addresses.First().Contains("localhost"));
 
         if (device == null)
         {
             Console.WriteLine("Please run OnvifService on the localhost as Administrator, or use a different camera URL and credentials.");
         }
         else
         {
-            using (var client = new SimpleOnvifClient(device, "admin", "password", true))
+            using (var client = new SimpleOnvifClient(device.Addresses.First(), "admin", "password", true))
             {
                 var services = await client.GetServicesAsync(true);
                 var cameraDateTime = await client.GetSystemDateAndTimeUtcAsync();

src/OnvifService/appsettings.json

@@ -46,8 +46,10 @@
       }
     ],
     "MAC": null,
-    "Hardware": null,
+    "Manufacturer": "Lukas Volf",
+    "Hardware": "OnvifService",
     "Name": null,
-    "City": null
+    "City": null,
+    "Country": null
   }
 }

src/SharpOnvifClient/OnvifDiscoveryClient.cs

@@ -0,0 +1,53 @@
+namespace SharpOnvifClient
+{
+    /// <summary>
+    /// Discovered device.
+    /// </summary>
+    public class OnvifDiscoveryResult
+    {
+        /// <summary>
+        /// Raw SOAP message for advanced processing.
+        /// </summary>
+        public string Raw { get; set; }
+
+        /// <summary>
+        /// Onvif addresses.
+        /// </summary>
+        public string[] Addresses { get; set; }
+
+        /// <summary>
+        /// Onvif scopes.
+        /// </summary>
+        public string[] Scopes { get; set; }
+
+        /// <summary>
+        /// Location - city.
+        /// </summary>
+        public string City { get; set; }
+
+        /// <summary>
+        /// Location - country.
+        /// </summary>
+        public string Country { get; set; }
+
+        /// <summary>
+        /// Hardware.
+        /// </summary>
+        public string Hardware { get; set; }
+
+        /// <summary>
+        /// MAC address.
+        /// </summary>
+        public string MAC { get; set; }
+
+        /// <summary>
+        /// Device manufacturer.
+        /// </summary>
+        public string Manufacturer { get; set; }
+
+        /// <summary>
+        /// Device name.
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

src/SharpOnvifClient/OnvifDiscoveryResult.cs

@@ -0,0 +1,12 @@
+namespace SharpOnvifCommon.Discovery
+{
+    public static class Scopes
+    {
+        public const string MAC = "onvif://www.onvif.org/MAC/";
+        public const string Manufacturer = "onvif://www.onvif.org/manufacturer/";
+        public const string Hardware = "onvif://www.onvif.org/hardware/";
+        public const string Name = "onvif://www.onvif.org/name/";
+        public const string City = "onvif://www.onvif.org/location/city/";
+        public const string Country = "onvif://www.onvif.org/location/country/";
+    }
+}

src/SharpOnvifCommon/Discovery/Scopes.cs

@@ -268,21 +268,27 @@ private static string BuildAddresses(OnvifDiscoveryOptions options, string fallb
 
         private static string BuildScopes(OnvifDiscoveryOptions options)
         {
-            List<string> scopes = options.Scopes;
+            List<string> scopes = options.Scopes.ToList(); // because we are adding additional scopes here, we need a copy of the collection
             if (scopes == null)
                 return string.Empty;
 
-            if (!string.IsNullOrEmpty(options.MAC))
-                scopes.Add($"onvif://www.onvif.org/MAC/{Uri.EscapeDataString(options.MAC)}");
+            if (!string.IsNullOrEmpty(options.City))
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.City}{Uri.EscapeDataString(options.City)}");
+
+            if (!string.IsNullOrEmpty(options.Country))
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.Country}{Uri.EscapeDataString(options.Country)}");
 
             if (!string.IsNullOrEmpty(options.Hardware))
-                scopes.Add($"onvif://www.onvif.org/hardware/{Uri.EscapeDataString(options.Hardware)}");
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.Hardware}{Uri.EscapeDataString(options.Hardware)}");
 
-            if (!string.IsNullOrEmpty(options.Name))
-                scopes.Add($"onvif://www.onvif.org/name/{Uri.EscapeDataString(options.Name)}");
+            if (!string.IsNullOrEmpty(options.MAC))
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.MAC}{Uri.EscapeDataString(options.MAC)}");
 
-            if (!string.IsNullOrEmpty(options.City))
-                scopes.Add($"onvif://www.onvif.org/location/city/{Uri.EscapeDataString(options.City)}");
+            if (!string.IsNullOrEmpty(options.Manufacturer))
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.Manufacturer}{Uri.EscapeDataString(options.Manufacturer)}");
+
+            if (!string.IsNullOrEmpty(options.Name))
+                scopes.Add($"{SharpOnvifCommon.Discovery.Scopes.Name}{Uri.EscapeDataString(options.Name)}");
 
             return string.Join(' ', scopes);
         }

src/SharpOnvifServer/Discovery/DiscoveryService.cs

@@ -9,8 +9,10 @@ public class OnvifDiscoveryOptions
         public List<string> Scopes { get; set; }
         public List<OnvifType> Types { get; set; }
         public string MAC { get; set; }
+        public string Manufacturer { get; set; }
         public string Hardware { get; set; }
         public string Name { get; set; }
         public string City { get; set; }
+        public string Country { get; set; }
     }
 }