Updated both the Silent Update routine and also the WinForms GUI to s…

…upport the new code that detects if any in progress recordings are occuring on the Plex server.
TechieGuy12 · Aug 24, 2019 · 06afead · 06afead
1 parent 697f866
commit 06afead
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 23 deletions.
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs
diff --git a/MainForm.cs b/MainForm.cs
@@ -93,7 +93,7 @@ void BtnUpdateClick(object sender, EventArgs e)
             if (CheckIfCanUpdate())
             {
                 PerformUpdate();
-            }            
+            }
         }
 
         /// <summary>
@@ -190,25 +190,28 @@ private bool CheckIfCanUpdate()
             }
 
             int playCount = _server.GetPlayCount();
+            int inProgressRecordingCount = _server.GetInProgressRecordingCount();
 
             // No item is currently being played
-            if (playCount == 0)
+            if (playCount == 0 && inProgressRecordingCount == 0)
             {
                 txtUpdateStatus.Text += "The server is not in use continuing to perform the update.";
                 Log.Write("The server is not in use continuing to perform the update.");
                 lblPlayCount.Text = _server.PlayCount.ToString();
+                lblInProgressRecordingCountLabel.Text = _server.InProgressRecordingCount.ToString();
                 btnUpdate.Enabled = true;
                 _timer.Enabled = false;
                 return true;
             }
             // At least one item is being played
-            else if (playCount > 0)
+            else if (playCount > 0 || inProgressRecordingCount > 0)
             {
                 lblPlayCount.Text = _server.PlayCount.ToString();
+                lblInProgressRecordingCountLabel.Text = _server.InProgressRecordingCount.ToString();
                 if (chkWait.Checked)
                 {
                     txtUpdateStatus.Text += "Waiting for the server to be free has not been enabled. Server update can begin.";
-                    Log.Write("The server is in use. Waiting for all media to be stopped before performing the update.");
+                    Log.Write("The server is in use. Waiting for all media and/or in progress recordings to be stopped before performing the update.");
                     btnUpdate.Enabled = false;
                     _timer.Interval =
                         Convert.ToDouble(Math.Abs(numSeconds.Value) * 1000);
@@ -230,6 +233,7 @@ private bool CheckIfCanUpdate()
                 txtUpdateStatus.Text += "The server in use status could not be determined. The server can be updated if you wish.";
                 Log.Write("The server in use status could not be determined. The server can be updated if you wish.");
                 lblPlayCount.Text = "Unknown";
+                lblInProgressRecordingCountLabel.Text = "Unknown";
                 btnUpdate.Enabled = true;
                 _timer.Enabled = false;
                 return true;
@@ -267,7 +271,7 @@ private void Initialize()
 
                 lblInstalledVersion.Text = _server.CurrentVersion.ToString();
                 lblLatestVersion.Text = _server.LatestVersion.ToString();
-               
+
                 if (_server.LatestVersion > _server.CurrentVersion)
                 {
                     btnUpdate.Visible = true;
@@ -280,15 +284,17 @@ private void Initialize()
                     btnUpdate.Visible = false;
                     btnCancel.Visible = false;
                     btnExit.Enabled = true;
-                    if (_server.GetPlayCount() >= 0)
+                    if (_server.GetPlayCount() >= 0 || _server.GetInProgressRecordingCount() >= 0)
                     {
                         lblPlayCount.Text = _server.PlayCount.ToString();
+                        lblInProgressRecordingCountLabel.Text = _server.InProgressRecordingCount.ToString();
                     }
                     else
                     {
                         lblPlayCount.Text = "Unknown";
+                        lblInProgressRecordingCountLabel.Text = "Unknown";
                     }
-                }                
+                }
             }
             catch (LocalSystem.Msi.MSIException ex)
             {

diff --git a/TE.Plex/classes/SilentUpdate.cs b/TE.Plex/classes/SilentUpdate.cs
@@ -184,23 +184,24 @@ private bool CheckIfCanUpdate()
             }
 
             int playCount = _server.GetPlayCount();
+            int inProgressRecordingCount = _server.GetInProgressRecordingCount();
 
             // No item is currently being played
-            if (playCount == 0)
+            if (playCount == 0 && inProgressRecordingCount == 0)
             {
                 Log.Write("The server is not in use continuing to perform the update.");
                 _timer.Enabled = false;
                 return true;
             }
             // At least one item is being played
-            else if (playCount > 0)
+            else if (playCount > 0 || inProgressRecordingCount > 0)
             {
                 if (!ForceUpdate)
                 {
-                    Log.Write("The server is in use. Waiting for all media to be stopped before performing the update.");
+                    Log.Write("The server is in use. Waiting for all media and/or in progress recordings to be stopped before performing the update.");
                     _timer.Interval =
                         Convert.ToDouble(Math.Abs(WaitTime) * 1000);
-                    _timer.Enabled = true;                    
+                    _timer.Enabled = true;
                     return false;
                 }
                 else
@@ -229,7 +230,7 @@ private void Initialize()
                 _server = new MediaServer(true);
                 _timer = new Timer(DefaultWaitTime * 1000);
                 _timer.Elapsed += OnTimedEvent;
-                _timer.Enabled = false;                
+                _timer.Enabled = false;
             }
             catch (AppNotInstalledException)
             {