Merge pull request #2279 from MediaBrowser/dev

Dev

2 files changed, 17 insertions, 58 deletions

diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/MonoApp.cs
index 46605e19f..bc4a9978e 100644
--- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mono/Native/MonoApp.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Mono.Networking;
 using MediaBrowser.Server.Startup.Common;
 using Mono.Unix.Native;
 using System;
@@ -11,16 +10,17 @@ using System.Text.RegularExpressions;
 using MediaBrowser.Model.System;
 using MediaBrowser.Server.Implementations.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
+using MediaBrowser.Server.Startup.Common.Networking;
 using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
 
 namespace MediaBrowser.Server.Mono.Native
 {
-    public abstract class BaseMonoApp : INativeApp
+    public class MonoApp : INativeApp
     {
         protected StartupOptions StartupOptions { get; private set; }
         protected ILogger Logger { get; private set; }
 
-        protected BaseMonoApp(StartupOptions startupOptions, ILogger logger)
+        public MonoApp(StartupOptions startupOptions, ILogger logger)
         {
             StartupOptions = startupOptions;
             Logger = logger;
@@ -29,29 +29,33 @@ namespace MediaBrowser.Server.Mono.Native
         /// <summary>
         /// Shutdowns this instance.
         /// </summary>
-        public abstract void Shutdown();
-
-        /// <summary>
-        /// Restarts this instance.
-        /// </summary>
-        public virtual void Restart(StartupOptions startupOptions)
+        public void Shutdown()
         {
-            throw new NotImplementedException();
+            MainClass.Shutdown();
         }
 
         /// <summary>
         /// Determines whether this instance [can self restart].
         /// </summary>
-        /// <returns><c>true</c> if this instance [can self restart]; otherwise, <c>false</c>.</returns>
-        public virtual bool CanSelfRestart
+        /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
+        public bool CanSelfRestart
         {
             get
             {
-                return false;
+                // A restart script must be provided
+                return StartupOptions.ContainsOption("-restartpath");
             }
         }
 
         /// <summary>
+        /// Restarts this instance.
+        /// </summary>
+        public void Restart(StartupOptions startupOptions)
+        {
+            MainClass.Restart(startupOptions);
+        }
+
+        /// <summary>
         /// Gets a value indicating whether this instance can self update.
         /// </summary>
         /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Server.Mono/Native/NativeApp.cs b/MediaBrowser.Server.Mono/Native/NativeApp.cs
deleted file mode 100644
index c0874a1d8..000000000
--- a/MediaBrowser.Server.Mono/Native/NativeApp.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Startup.Common;
-
-namespace MediaBrowser.Server.Mono.Native
-{
-    /// <summary>
-    /// Class NativeApp
-    /// </summary>
-    internal class NativeApp : BaseMonoApp
-    {
-        public NativeApp(StartupOptions startupOptions, ILogger logger)
-            : base(startupOptions, logger)
-        {
-        }
-
-        /// <summary>
-        /// Shutdowns this instance.
-        /// </summary>
-        public override void Shutdown()
-        {
-            MainClass.Shutdown();
-        }
-
-        /// <summary>
-        /// Determines whether this instance [can self restart].
-        /// </summary>
-        /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
-        public override bool CanSelfRestart
-        {
-            get
-            {
-                // A restart script must be provided
-                return StartupOptions.ContainsOption("-restartpath");
-            }
-        }
-
-        /// <summary>
-        /// Restarts this instance.
-        /// </summary>
-        public override void Restart(StartupOptions startupOptions)
-        {
-            MainClass.Restart(startupOptions);
-        }
-    }
-}