Resolve Issue #29

cjmurph · Feb 16, 2018 · b0e260e · b0e260e
1 parent 76a390f
commit b0e260e
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 21 deletions.
diff --git a/PlexService/PlexMediaServerService.cs b/PlexService/PlexMediaServerService.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using PlexServiceCommon;
 using PlexServiceWCF;
+using System.Threading;
 
 namespace PlexService
 {
@@ -31,6 +32,8 @@ public partial class PlexMediaServerService : ServiceBase
 
         private PlexServiceCommon.Interface.ITrayInteraction _plexService;
 
+        private AutoResetEvent _stopped = new AutoResetEvent(false);
+
         public PlexMediaServerService()
         {
             InitializeComponent();
@@ -121,6 +124,11 @@ protected override void OnStop()
                     if (_plexService != null)
                     {
                         _plexService.Stop();
+                        //wait for plex to stop for 10 seconds
+                        if(!_stopped.WaitOne(10000))
+                        {
+                            TrayInteraction.WriteToLog("Timed out waiting for plex to stop");
+                        }
                         Disconnect();
                     }
                 }
@@ -153,16 +161,24 @@ private void Connect()
             plexServiceBinding.ReliableSession.InactivityTimeout = TimeSpan.FromMinutes(1);
             //Generate the endpoint from the local settings
             var plexServiceEndpoint = new EndpointAddress(_address);
+
+            TrayCallback callback = new TrayCallback();
+            callback.Stopped += (s,e) => _stopped.Set();
+            var client = new TrayInteractionClient(callback, plexServiceBinding, plexServiceEndpoint);
+
             //Make a channel factory so we can create the link to the service
-            var plexServiceChannelFactory = new ChannelFactory<PlexServiceCommon.Interface.ITrayInteraction>(plexServiceBinding, plexServiceEndpoint);
+            //var plexServiceChannelFactory = new ChannelFactory<PlexServiceCommon.Interface.ITrayInteraction>(plexServiceBinding, plexServiceEndpoint);
 
             _plexService = null;
 
             try
             {
-                _plexService = plexServiceChannelFactory.CreateChannel();
+                _plexService = client.ChannelFactory.CreateChannel();
+
+                _plexService.Subscribe();
                 //If we lose connection to the service, set the object to null so we will know to reconnect the next time the tray icon is clicked
                 ((ICommunicationObject)_plexService).Faulted += (s, e) => _plexService = null;
+                ((ICommunicationObject)_plexService).Closed += (s, e) => _plexService = null;
             }
             catch
             {

diff --git a/PlexService/Properties/AssemblyInfo.cs b/PlexService/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/PlexServiceCommon/Interface/ITrayCallback.cs b/PlexServiceCommon/Interface/ITrayCallback.cs
@@ -10,5 +10,8 @@ public interface ITrayCallback
     {
         [OperationContract]
         void OnPlexStateChange(PlexState state);
+
+        [OperationContract]
+        void OnPlexStopped();
     }
 }
diff --git a/PlexServiceCommon/PlexServiceCommon.csproj b/PlexServiceCommon/PlexServiceCommon.csproj
@@ -56,6 +56,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="StatusChangeEventArgs.cs" />
+    <Compile Include="TrayCallback.cs" />
+    <Compile Include="TrayInteractionClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/PlexServiceCommon/Properties/AssemblyInfo.cs b/PlexServiceCommon/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/PlexServiceTray/TrayCallback.cs → PlexServiceCommon/TrayCallback.cs b/PlexServiceTray/TrayCallback.cs → PlexServiceCommon/TrayCallback.cs
@@ -4,9 +4,9 @@
 using System.Text;
 using PlexServiceCommon;
 
-namespace PlexServiceTray
+namespace PlexServiceCommon
 {
-    class TrayCallback : PlexServiceCommon.Interface.ITrayCallback
+    public class TrayCallback : Interface.ITrayCallback
     {
         public void OnPlexStateChange(PlexState state)
         {
@@ -40,5 +40,21 @@ protected void OnStateChange(string message)
 
         #endregion
 
+        public void OnPlexStopped()
+        {
+            OnStopped();
+        }
+
+        #region StateChange
+
+        public event EventHandler<EventArgs> Stopped;
+
+        protected void OnStopped()
+        {
+            Stopped?.Invoke(this, new EventArgs());
+        }
+
+        #endregion
+
     }
 }
diff --git a/PlexServiceTray/TrayInteractionClient.cs → PlexServiceCommon/TrayInteractionClient.cs b/PlexServiceTray/TrayInteractionClient.cs → PlexServiceCommon/TrayInteractionClient.cs
@@ -6,7 +6,7 @@
 using System.ServiceModel.Channels;
 using System.Text;
 
-namespace PlexServiceTray
+namespace PlexServiceCommon
 {
     public class TrayInteractionClient:DuplexClientBase<ITrayInteraction>
     {

diff --git a/PlexServiceInstaller/Product.wxs b/PlexServiceInstaller/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-	<Product Id="*" Name="Plex Service" Language="1033" Version="1.1.4" Manufacturer="cjmurph" UpgradeCode="daa483bb-c7e1-4c79-a4d6-3c2c4c3d9daf">
+	<Product Id="*" Name="Plex Service" Language="1033" Version="1.1.5" Manufacturer="cjmurph" UpgradeCode="daa483bb-c7e1-4c79-a4d6-3c2c4c3d9daf">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" SummaryCodepage="1252" />
     <Binary Id="success_bmp" SourceFile="$(sys.SOURCEFILEDIR)success.bmp" />
     <Binary Id="error_bmp" SourceFile="$(sys.SOURCEFILEDIR)error.bmp" />
@@ -21,7 +21,7 @@
     <Condition Message="This application requires .NET Framework 4.0 to run. Please install the .NET Framework then run this installer again.">
       <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
     </Condition>
-    <Feature Id="PlexServiceFeature" Title="Plex Service" Description="Plex Service 1.1.4" Level="1" ConfigurableDirectory='INSTALLDIR'>
+    <Feature Id="PlexServiceFeature" Title="Plex Service" Description="Plex Service 1.1.5" Level="1" ConfigurableDirectory='INSTALLDIR'>
       <ComponentRef Id="PlexServiceComponent" />
       <ComponentRef Id="PlexServiceWCFComponent" />
       <ComponentRef Id="PlexServiceCommonComponent" />

diff --git a/PlexServiceTray/NotifyIconApplicationContext.cs b/PlexServiceTray/NotifyIconApplicationContext.cs
@@ -51,14 +51,14 @@ protected override void Dispose(bool disposing)
 
         public NotifyIconApplicationContext()
         {
-            initializeContext();
+            InitializeContext();
             Connect();
         }
 
         /// <summary>
         /// Setup our tray icon
         /// </summary>
-        private void initializeContext()
+        private void InitializeContext()
         {
             _components = new System.ComponentModel.Container();
             _notifyIcon = new NotifyIcon(_components);

diff --git a/PlexServiceTray/PlexServiceTray.csproj b/PlexServiceTray/PlexServiceTray.csproj
@@ -115,8 +115,6 @@
     </Compile>
     <Compile Include="SettingsWindowViewModel.cs" />
     <Compile Include="Themes\Metro\Light\CheckBoxTransformConverter.cs" />
-    <Compile Include="TrayCallback.cs" />
-    <Compile Include="TrayInteractionClient.cs" />
     <Compile Include="Validation\UniqueAuxAppNameAttribute.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

diff --git a/PlexServiceTray/Properties/AssemblyInfo.cs b/PlexServiceTray/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/PlexServiceWCF/PmsMonitor.cs b/PlexServiceWCF/PmsMonitor.cs
@@ -380,6 +380,8 @@ private void EndPlex()
                 //remove event hook
                 appMonitor.StatusChange -= OnPlexStatusChange;
             });
+
+            OnPlexStop(this, new EventArgs());
         }
 
         /// <summary>

diff --git a/PlexServiceWCF/Properties/AssemblyInfo.cs b/PlexServiceWCF/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/PlexServiceWCF/TrayInteraction.cs b/PlexServiceWCF/TrayInteraction.cs
@@ -29,10 +29,29 @@ public TrayInteraction()
             _pms = new PmsMonitor();
             _pms.PlexStatusChange += OnPlexEvent;
             _pms.StateChange += PlexStateChange;
+            _pms.PlexStop += PlexStopped;
             ///Start plex
             Start();
         }
 
+        private void PlexStopped(object sender, EventArgs e)
+        {
+            if (_pms != null)
+            {
+                CallbackChannels.ForEach(callback =>
+                {
+                    if (callback != null)
+                    {
+                        try
+                        {
+                            callback.OnPlexStopped();
+                        }
+                        catch { }
+                    }
+                });
+            }
+        }
+
         private void PlexStateChange(object sender, EventArgs e)
         {
             if (_pms != null)
@@ -65,8 +84,7 @@ public void Start()
         /// </summary>
         public void Stop()
         {
-            //do this in the calling thread so it only returns upon completion of stop
-            _pms.Stop();
+            Task.Factory.StartNew(() => _pms.Stop());
         }
 
         /// <summary>