diff options
Diffstat (limited to 'MediaBrowser.Server.Mono')
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/Program.cs | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index c8453e771..e94c297eb 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -101,7 +101,7 @@ <Name>MediaBrowser.Providers</Name> </ProjectReference> <ProjectReference Include="..\MediaBrowser.Dlna\MediaBrowser.Dlna.csproj"> - <Project>{734098eb-6dc1-4dd0-a1ca-3140dcd2737c}</Project> + <Project>{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}</Project> <Name>MediaBrowser.Dlna</Name> </ProjectReference> <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj"> @@ -124,6 +124,10 @@ <Project>{4FD51AC5-2C16-4308-A993-C3A84F3B4582}</Project> <Name>MediaBrowser.Api</Name> </ProjectReference> + <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj"> + <Project>{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}</Project> + <Name>MediaBrowser.MediaEncoding</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Folder Include="EntryPoints\" /> diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index 0f2a90900..e1d3cda40 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/MediaBrowser.Server.Mono/Program.cs @@ -16,6 +16,7 @@ using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using System.Reflection; +using System.Linq; // MONOMKBUNDLE: For the embedded version, mkbundle tool #if MONOMKBUNDLE using Mono.Unix; @@ -39,8 +40,13 @@ namespace MediaBrowser.Server.Mono #else var applicationPath = Assembly.GetEntryAssembly ().Location; #endif + + var commandArgs = Environment.GetCommandLineArgs(); + + // Allow this to be specified on the command line. + var customProgramDataPath = commandArgs.ElementAtOrDefault(1); - var appPaths = CreateApplicationPaths(applicationPath); + var appPaths = CreateApplicationPaths(applicationPath, customProgramDataPath); var logManager = new NlogManager(appPaths.LogDirectoryPath, "server"); logManager.ReloadLogger(LogSeverity.Info); @@ -70,9 +76,14 @@ namespace MediaBrowser.Server.Mono } } - private static ServerApplicationPaths CreateApplicationPaths(string applicationPath) + private static ServerApplicationPaths CreateApplicationPaths(string applicationPath, string programDataPath) { - return new ServerApplicationPaths(applicationPath); + if (string.IsNullOrEmpty(programDataPath)) + { + return new ServerApplicationPaths(applicationPath); + } + + return new ServerApplicationPaths(programDataPath, applicationPath); } /// <summary> |