From 211ae30188546e9c652b68b609ab6266ab42a49d Mon Sep 17 00:00:00 2001
From: PloughPuff <ploughpuff@protonmail.com>
Date: Mon, 28 Jan 2019 21:45:00 +0000
Subject: [PATCH] Revert back to NoAutoRunWebApp

Addressed further review comments.  Removed unnecessary .ParsedStartupOptions namespace.  Removed DataDir, ConfigDir and LogDir from Interface file as not necessary.
---
 .../ApplicationHost.cs                        |  1 -
 .../EntryPoints/StartupWizard.cs              |  2 +-
 .../FFMpeg/FFMpegLoader.cs                    |  1 -
 .../IStartupOptions.cs                        | 19 ++-----------------
 Jellyfin.Server/StartupOptions.cs             | 10 ++--------
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 3af9e487e9..c3176bc9c8 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -43,7 +43,6 @@ using Emby.Server.Implementations.ScheduledTasks;
 using Emby.Server.Implementations.Security;
 using Emby.Server.Implementations.Serialization;
 using Emby.Server.Implementations.Session;
-using Emby.Server.Implementations.ParsedStartupOptions;
 using Emby.Server.Implementations.Threading;
 using Emby.Server.Implementations.TV;
 using Emby.Server.Implementations.Updates;
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
index 43d18e135f..bb96120f41 100644
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -47,7 +47,7 @@ namespace Emby.Server.Implementations.EntryPoints
             {
                 var options = ((ApplicationHost)_appHost).StartupOptions;
 
-                if (options.AutoRunWebApp)
+                if (!options.NoAutoRunWebApp)
                 {
                     BrowserLauncher.OpenWebApp(_appHost);
                 }
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
index b422b88625..6167d1eaa4 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
-using Emby.Server.Implementations.ParsedStartupOptions;
 
 namespace Emby.Server.Implementations.FFMpeg
 {
diff --git a/Emby.Server.Implementations/IStartupOptions.cs b/Emby.Server.Implementations/IStartupOptions.cs
index 878bb66406..24aaa76c02 100644
--- a/Emby.Server.Implementations/IStartupOptions.cs
+++ b/Emby.Server.Implementations/IStartupOptions.cs
@@ -1,22 +1,7 @@
-namespace Emby.Server.Implementations.ParsedStartupOptions
+namespace Emby.Server.Implementations
 {
     public interface IStartupOptions
     {
-        /// <summary>
-        /// --datadir
-        /// </summary>
-        string DataDir { get; }
-
-        /// <summary>
-        /// --configdir
-        /// </summary>
-        string ConfigDir { get; }
-
-        /// <summary>
-        /// --logdir
-        /// </summary>
-        string LogDir { get; }
-
         /// <summary>
         /// --ffmpeg
         /// </summary>
@@ -35,7 +20,7 @@ namespace Emby.Server.Implementations.ParsedStartupOptions
         /// <summary>
         /// --noautorunwebapp
         /// </summary>
-        bool AutoRunWebApp { get; }
+        bool NoAutoRunWebApp { get; }
 
         /// <summary>
         /// --package-name
diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs
index 97fcb633a7..a1bdb756ec 100644
--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@@ -1,5 +1,5 @@
 using CommandLine;
-using Emby.Server.Implementations.ParsedStartupOptions;
+using Emby.Server.Implementations;
 
 namespace Jellyfin.Server
 {
@@ -27,7 +27,7 @@ namespace Jellyfin.Server
         public bool IsService { get; set; }
 
         [Option("noautorunwebapp", Required = false, HelpText = "Run headless if startup wizard is complete.")]
-        public bool AutoRunWebApp { get => !NoautoRunWebApp; set => NoautoRunWebApp = value; }
+        public bool NoAutoRunWebApp { get; set; }
 
         [Option("package-name", Required = false, HelpText = "Used when packaging Jellyfin (example, synology).")]
         public string PackageName { get; set; }
@@ -37,11 +37,5 @@ namespace Jellyfin.Server
 
         [Option("restartargs", Required = false, HelpText = "Arguments for restart script.")]
         public string RestartArgs { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to run not run the web app.
-        /// Command line switch is --noautorunwebapp, which we store privately here, but provide inverse (AutoRunWebApp) for users.
-        /// </summary>
-        private bool NoautoRunWebApp { get; set; }
     }
 }