From 10cb5a8bf6a32a84819e841719e2dcc958aec513 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Sep 2014 11:26:33 -0400 Subject: add ability to customize ffmpeg path --- MediaBrowser.Server.Mono/Program.cs | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) (limited to 'MediaBrowser.Server.Mono/Program.cs') diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index 6040f0609..a803a50b6 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/MediaBrowser.Server.Mono/Program.cs @@ -5,6 +5,7 @@ using MediaBrowser.Model.Logging; using MediaBrowser.Server.Implementations; using MediaBrowser.ServerApplication; using MediaBrowser.ServerApplication.Native; +using MediaBrowser.ServerApplication.IO; using Microsoft.Win32; using System; using System.Diagnostics; @@ -41,8 +42,10 @@ namespace MediaBrowser.Server.Mono var applicationPath = Assembly.GetEntryAssembly ().Location; #endif + var options = new StartupOptions(); + // Allow this to be specified on the command line. - var customProgramDataPath = ParseProgramDataPathFromCommandLine(); + var customProgramDataPath = options.GetOption("-programdata"); var appPaths = CreateApplicationPaths(applicationPath, customProgramDataPath); @@ -52,7 +55,7 @@ namespace MediaBrowser.Server.Mono var logger = _logger = logManager.GetLogger("Main"); - BeginLog(logger); + BeginLog(logger, appPaths); AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; @@ -73,20 +76,6 @@ namespace MediaBrowser.Server.Mono _appHost.Dispose(); } } - - private static string ParseProgramDataPathFromCommandLine() - { - var commandArgs = Environment.GetCommandLineArgs().ToList(); - - var programDataPathIndex = commandArgs.IndexOf("-programdata"); - - if (programDataPathIndex != -1) - { - return commandArgs.ElementAtOrDefault(programDataPathIndex + 1); - } - - return null; - } private static ServerApplicationPaths CreateApplicationPaths(string applicationPath, string programDataPath) { @@ -169,14 +158,11 @@ namespace MediaBrowser.Server.Mono /// Begins the log. /// /// The logger. - private static void BeginLog(ILogger logger) - { - logger.Info("Media Browser Server started"); - logger.Info("Command line: {0}", string.Join(" ", Environment.GetCommandLineArgs())); - - logger.Info("Server: {0}", Environment.MachineName); - logger.Info("Operating system: {0}", Environment.OSVersion.ToString()); - } + private static void BeginLog(ILogger logger, IApplicationPaths appPaths) + { + logger.Info("Media Browser Server started"); + ApplicationHost.LogEnvironmentInfo(logger, appPaths); + } /// /// Handles the UnhandledException event of the CurrentDomain control. -- cgit v1.2.3 From 6a177d21478774b3ea1a5adc606935bb3aff65bf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Sep 2014 11:27:22 -0400 Subject: fix mono build --- MediaBrowser.Server.Mono/Program.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Mono/Program.cs') diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index a803a50b6..d8588878a 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/MediaBrowser.Server.Mono/Program.cs @@ -67,7 +67,7 @@ namespace MediaBrowser.Server.Mono try { - RunApplication(appPaths, logManager); + RunApplication(appPaths, logManager, options); } finally { @@ -115,14 +115,14 @@ namespace MediaBrowser.Server.Mono private static TaskCompletionSource _applicationTaskCompletionSource = new TaskCompletionSource(); - private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager) + private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options) { SystemEvents.SessionEnding += SystemEvents_SessionEnding; // Allow all https requests ServicePointManager.ServerCertificateValidationCallback = _ignoreCertificates; - _appHost = new ApplicationHost(appPaths, logManager, false, false); + _appHost = new ApplicationHost(appPaths, logManager, false, false, options); Console.WriteLine ("appHost.Init"); -- cgit v1.2.3