add recording flag and filtering to getobjectlist command for api

ispysoftware · Oct 16, 2018 · 3c169a7 · 3c169a7
1 parent f267fbc
commit 3c169a7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("7.1.5.0")]
+[assembly: AssemblyVersion("7.1.6.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -55,4 +55,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersion("7.1.5.0")]
+[assembly: AssemblyFileVersion("7.1.6.0")]
diff --git a/Server/LocalServer.cs b/Server/LocalServer.cs
@@ -2698,7 +2698,7 @@ private string DoCommand(string sRequest, int otid, string resp, string cmd, int
                     break;
                 case "getobjectlist":
                     //for 3rd party APIs
-                    resp = GetObjectList();
+                    resp = GetObjectList(otid,oid);
                     break;
                 case "getservername":
                     resp = MainForm.Conf.ServerName + ",OK";
@@ -3986,39 +3986,45 @@ public string FormatBytes(long bytes)
             return "0 Bytes";
         }
 
-        internal string GetObjectList()
+        internal string GetObjectList(int ot = 0, int oid =0)
         {
             string resp = "";
-            if (MainForm.Cameras != null)
+            if (MainForm.Cameras != null && (ot==0 || ot==2))
             {
                 var l = MainForm.Cameras.OrderBy(p => p.name).ToList();
                 foreach (objectsCamera oc in l)
                 {
+                    if (oid != 0 && oid != oc.id)
+                        continue;
                     CameraWindow cw = MainForm.InstanceReference.GetCameraWindow(oc.id);
                     if (cw != null)
                     {
                         bool onlinestatus = cw.IsEnabled;
+                        bool recording = cw.Recording;
                         bool talkconfigured = oc.settings.audiomodel != "None";
                         resp += "2," + oc.id + "," + onlinestatus.ToString().ToLower() + "," +
                                 oc.name.Replace(",", "&comma;") + "," + GetStatus(onlinestatus) + "," +
                                 oc.description.Replace(",", "&comma;").Replace("\n", " ") + "," +
-                                oc.settings.accessgroups.Replace(",", "&comma;").Replace("\n", " ") + "," + oc.ptz + "," + talkconfigured.ToString().ToLower() +"," + oc.settings.micpair + Environment.NewLine;
+                                oc.settings.accessgroups.Replace(",", "&comma;").Replace("\n", " ") + "," + oc.ptz + "," + talkconfigured.ToString().ToLower() +"," + oc.settings.micpair + ","+cw.Recording.ToString().ToLowerInvariant() + Environment.NewLine;
                     }
                 }
             }
-            if (MainForm.Microphones != null)
+            if (MainForm.Microphones != null && (ot == 0 || ot == 1))
             {
                 var l = MainForm.Microphones.OrderBy(p => p.name).ToList();
                 foreach (objectsMicrophone om in l)
                 {
+                    if (oid != 0 && oid != om.id)
+                        continue;
                     VolumeLevel vl = MainForm.InstanceReference.GetVolumeLevel(om.id);
                     if (vl!=null)
                     {
                         bool onlinestatus = vl.IsEnabled;
+                        bool recording = vl.Recording;
                         resp += "1," + om.id + "," + onlinestatus.ToString().ToLower() + "," +
                             om.name.Replace(",", "&comma;") + "," + GetStatus(onlinestatus) + "," +
                             om.description.Replace(",", "&comma;").Replace("\n", " ") + "," +
-                            om.settings.accessgroups.Replace(",", "&comma;").Replace("\n", " ") + Environment.NewLine;
+                            om.settings.accessgroups.Replace(",", "&comma;").Replace("\n", " ") + ","+recording.ToString().ToLowerInvariant()+Environment.NewLine;
                     }
                 }
             }

diff --git a/Wix/Bootstrap64/Bootstrap64.wixproj b/Wix/Bootstrap64/Bootstrap64.wixproj
@@ -54,6 +54,9 @@
 call "D:\Projects\iSpy\signing\Wix_iSpyBurn64.bat"
 :end</PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>ee</PreBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.