Update publish.yml

* QBrowser.cs: Fix zeroconf server loss detection

.github/workflows/publish.yml

@@ -1,8 +1,8 @@
 name: Publish to NuGet
 on:
-  release:
-    types:
-      - created # When a release is made
+  push:
+    branches:
+      - master # Default release branch
 jobs:
   publish:
     name: build, pack & publish

QControlKit/QBrowser.cs

@@ -62,15 +62,9 @@ namespace QControlKit
 
             foreach(var server in qServers)
             {
-                bool serverToBeRemoved = true;
-                foreach(var zeroconfHost in results){
-                    QServer existingServer = serverForAddress(zeroconfHost.IPAddress);
-                    if(server != null)
-                    {
-                        serverToBeRemoved = false;
-                    }
-                }
-                if (serverToBeRemoved)
+                IZeroconfHost found = results.ToList().Find(x => x.IPAddress.Equals(server.host));
+
+                if (found == null)
                 {
                     server.disconnect();
                     servers.Remove(server);

QControlKit/QControlKit.csproj

@@ -6,7 +6,7 @@
     <Authors>Joel Wetzell</Authors>
     <Version>1.0.0-devel</Version>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>0.0.19</PackageVersion>
+    <PackageVersion>0.0.20</PackageVersion>
     <PackageId>QControlKit</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Zeroconf" Version="3.4.2" />
+    <PackageReference Include="Zeroconf" Version="3.5.11" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>

QControlKit/QWorkspace.cs

@@ -35,6 +35,9 @@ namespace QControlKit
         public event QWorkspaceUpdatedHandler WorkspaceUpdated;
         public event QCueListChangedPlaybackPositionHandler CueListChangedPlaybackPosition;
         public event QWorkspaceConnectionErrorHandler WorkspaceConnectionError;
+        public event QWorkspaceDisconnectedHandler WorkspaceDisconnected;
+        public event QWorkspaceConnectedHandler WorkspaceConnected;
+
 
         private void Init()
         {
@@ -172,14 +175,14 @@ namespace QControlKit
             if(hasPasscode && passcode == null)
             {
                 Log.Error($"[workspace] *** workspace <{name}> requires a passcode but none was supplied.");
-                OnWorkspaceConnectionError(this, new QWorkspaceConnectionErrorArgs { status = "badpass" });
+                OnWorkspaceConnectionError(this, new QWorkspaceConnectionErrorArgs { status = QConnectionStatus.BadPass });
                 return;
             }
 
             if (!client.connect())
             {
                 Log.Error($"[workspace] *** couldn't connect to server client is not connected.");
-                OnWorkspaceConnectionError(this, new QWorkspaceConnectionErrorArgs { status = "unreachable" });
+                OnWorkspaceConnectionError(this, new QWorkspaceConnectionErrorArgs { status = QConnectionStatus.Error });
                 return;
             }
 
@@ -424,7 +427,7 @@ namespace QControlKit
             {
                 //clear passcode if there was one set in the connect() method
                 this.passcode = null;
-                Log.Error($"[workspace] *** Password for workspace {name} was incorrect!");
+                Log.Error($"[workspace] *** Password for workspace <{name}> was incorrect!");
             }
             else
             {
@@ -437,6 +440,7 @@ namespace QControlKit
         private void OnWorkspaceConnected(object source, QWorkspaceConnectedArgs args)
         {
             Log.Information($"[workspace] Connection to <{name}> successful, finishing things up.");
+            WorkspaceConnected?.Invoke(this, new QWorkspaceConnectedArgs());
             finishConnection();
         }
 
@@ -444,6 +448,7 @@ namespace QControlKit
         {
             //this might not be called with TCP?
             Log.Warning($"[workspace] *** Workspace has indicated it is disconnecting");
+            WorkspaceDisconnected?.Invoke(this, new QWorkspaceDisconnectedArgs());
         }
 
         private void OnCueListsUpdated(object source, QCueListsUpdatedArgs args)