From e52833059bc819cbdb41ba204b82aee1760ddb3a Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Sun, 2 Sep 2012 09:45:02 -0400 Subject: Moved server configuration to the model so that the UI can read it --- .../HttpHandlers/ServerConfigurationHandler.cs | 15 ++ MediaBrowser.Api/MediaBrowser.Api.csproj | 1 + MediaBrowser.Api/Plugin.cs | 4 + MediaBrowser.ApiInteraction/ApiClient.cs | 18 +- .../Configuration/BaseApplicationConfiguration.cs | 19 -- .../Configuration/BaseApplicationPaths.cs | 132 ---------- MediaBrowser.Common/Kernel/BaseApplicationPaths.cs | 132 ++++++++++ MediaBrowser.Common/Kernel/BaseKernel.cs | 10 +- MediaBrowser.Common/MediaBrowser.Common.csproj | 3 +- MediaBrowser.Common/UI/BaseApplication.cs | 5 +- .../Configuration/ServerApplicationPaths.cs | 278 --------------------- .../Configuration/ServerConfiguration.cs | 10 - MediaBrowser.Controller/Kernel.cs | 2 +- .../MediaBrowser.Controller.csproj | 3 +- MediaBrowser.Controller/ServerApplicationPaths.cs | 278 +++++++++++++++++++++ .../Configuration/BaseApplicationConfiguration.cs | 17 ++ .../Configuration/ServerConfiguration.cs | 9 + MediaBrowser.Model/MediaBrowser.Model.csproj | 2 + 18 files changed, 483 insertions(+), 455 deletions(-) create mode 100644 MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs delete mode 100644 MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs delete mode 100644 MediaBrowser.Common/Configuration/BaseApplicationPaths.cs create mode 100644 MediaBrowser.Common/Kernel/BaseApplicationPaths.cs delete mode 100644 MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs delete mode 100644 MediaBrowser.Controller/Configuration/ServerConfiguration.cs create mode 100644 MediaBrowser.Controller/ServerApplicationPaths.cs create mode 100644 MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs create mode 100644 MediaBrowser.Model/Configuration/ServerConfiguration.cs diff --git a/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs new file mode 100644 index 000000000..175876b4c --- /dev/null +++ b/MediaBrowser.Api/HttpHandlers/ServerConfigurationHandler.cs @@ -0,0 +1,15 @@ +using System.Threading.Tasks; +using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller; +using MediaBrowser.Model.Configuration; + +namespace MediaBrowser.Api.HttpHandlers +{ + class ServerConfigurationHandler : BaseSerializationHandler + { + protected override Task GetObjectToSerialize() + { + return Task.FromResult(Kernel.Instance.Configuration); + } + } +} diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 5d3221093..89bb5adc9 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -65,6 +65,7 @@ + diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs index 467b30ef1..f13b9efb3 100644 --- a/MediaBrowser.Api/Plugin.cs +++ b/MediaBrowser.Api/Plugin.cs @@ -105,6 +105,10 @@ namespace MediaBrowser.Api { return new WeatherHandler(); } + else if (localPath.EndsWith("/api/cerverconfiguration", StringComparison.OrdinalIgnoreCase)) + { + return new ServerConfigurationHandler(); + } return null; } diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs index 99af250ca..922b4bb0c 100644 --- a/MediaBrowser.ApiInteraction/ApiClient.cs +++ b/MediaBrowser.ApiInteraction/ApiClient.cs @@ -4,6 +4,7 @@ using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Weather; @@ -568,7 +569,20 @@ namespace MediaBrowser.ApiInteraction /// /// Gets weather information for the default location as set in configuration /// - public async Task GetWeatherInfo() + public async Task GetServerConfigurationAsync() + { + string url = ApiUrl + "/ServerConfiguration"; + + using (Stream stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) + { + return DeserializeFromStream(stream); + } + } + + /// + /// Gets weather information for the default location as set in configuration + /// + public async Task GetWeatherInfoAsync() { string url = ApiUrl + "/weather"; @@ -581,7 +595,7 @@ namespace MediaBrowser.ApiInteraction /// /// Gets weather information for a specific zip code /// - public async Task GetWeatherInfo(string zipCode) + public async Task GetWeatherInfoAsync(string zipCode) { string url = ApiUrl + "/weather?zipcode=" + zipCode; diff --git a/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs deleted file mode 100644 index 7ed782bdb..000000000 --- a/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs +++ /dev/null @@ -1,19 +0,0 @@ -using MediaBrowser.Common.Logging; - -namespace MediaBrowser.Common.Configuration -{ - /// - /// Serves as a common base class for the Server and UI application Configurations - /// - public class BaseApplicationConfiguration - { - public LogSeverity LogSeverity { get; set; } - public int HttpServerPortNumber { get; set; } - - public BaseApplicationConfiguration() - { - LogSeverity = LogSeverity.Info; - HttpServerPortNumber = 8096; - } - } -} diff --git a/MediaBrowser.Common/Configuration/BaseApplicationPaths.cs b/MediaBrowser.Common/Configuration/BaseApplicationPaths.cs deleted file mode 100644 index d030da844..000000000 --- a/MediaBrowser.Common/Configuration/BaseApplicationPaths.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.Configuration; -using System.IO; -using System.Reflection; - -namespace MediaBrowser.Common.Configuration -{ - /// - /// Provides a base class to hold common application paths used by both the UI and Server. - /// This can be subclassed to add application-specific paths. - /// - public abstract class BaseApplicationPaths - { - private string _programDataPath; - /// - /// Gets the path to the program data folder - /// - public string ProgramDataPath - { - get - { - if (_programDataPath == null) - { - _programDataPath = GetProgramDataPath(); - } - return _programDataPath; - } - } - - private string _pluginsPath; - /// - /// Gets the path to the plugin directory - /// - public string PluginsPath - { - get - { - if (_pluginsPath == null) - { - _pluginsPath = Path.Combine(ProgramDataPath, "plugins"); - if (!Directory.Exists(_pluginsPath)) - { - Directory.CreateDirectory(_pluginsPath); - } - } - - return _pluginsPath; - } - } - - private string _logDirectoryPath; - /// - /// Gets the path to the log directory - /// - public string LogDirectoryPath - { - get - { - if (_logDirectoryPath == null) - { - _logDirectoryPath = Path.Combine(ProgramDataPath, "logs"); - if (!Directory.Exists(_logDirectoryPath)) - { - Directory.CreateDirectory(_logDirectoryPath); - } - } - return _logDirectoryPath; - } - } - - private string _configurationDirectoryPath; - /// - /// Gets the path to the application configuration root directory - /// - public string ConfigurationDirectoryPath - { - get - { - if (_configurationDirectoryPath == null) - { - _configurationDirectoryPath = Path.Combine(ProgramDataPath, "config"); - if (!Directory.Exists(_configurationDirectoryPath)) - { - Directory.CreateDirectory(_configurationDirectoryPath); - } - } - return _configurationDirectoryPath; - } - } - - private string _systemConfigurationFilePath; - /// - /// Gets the path to the system configuration file - /// - public string SystemConfigurationFilePath - { - get - { - if (_systemConfigurationFilePath == null) - { - _systemConfigurationFilePath = Path.Combine(ConfigurationDirectoryPath, "system.xml"); - } - return _systemConfigurationFilePath; - } - } - - /// - /// Gets the path to the application's ProgramDataFolder - /// - private static string GetProgramDataPath() - { - string programDataPath = ConfigurationManager.AppSettings["ProgramDataPath"]; - - // If it's a relative path, e.g. "..\" - if (!Path.IsPathRooted(programDataPath)) - { - string path = Assembly.GetExecutingAssembly().Location; - path = Path.GetDirectoryName(path); - - programDataPath = Path.Combine(path, programDataPath); - - programDataPath = Path.GetFullPath(programDataPath); - } - - if (!Directory.Exists(programDataPath)) - { - Directory.CreateDirectory(programDataPath); - } - - return programDataPath; - } - } -} diff --git a/MediaBrowser.Common/Kernel/BaseApplicationPaths.cs b/MediaBrowser.Common/Kernel/BaseApplicationPaths.cs new file mode 100644 index 000000000..3c394680f --- /dev/null +++ b/MediaBrowser.Common/Kernel/BaseApplicationPaths.cs @@ -0,0 +1,132 @@ +using System.Configuration; +using System.IO; +using System.Reflection; + +namespace MediaBrowser.Common.Kernel +{ + /// + /// Provides a base class to hold common application paths used by both the UI and Server. + /// This can be subclassed to add application-specific paths. + /// + public abstract class BaseApplicationPaths + { + private string _programDataPath; + /// + /// Gets the path to the program data folder + /// + public string ProgramDataPath + { + get + { + if (_programDataPath == null) + { + _programDataPath = GetProgramDataPath(); + } + return _programDataPath; + } + } + + private string _pluginsPath; + /// + /// Gets the path to the plugin directory + /// + public string PluginsPath + { + get + { + if (_pluginsPath == null) + { + _pluginsPath = Path.Combine(ProgramDataPath, "plugins"); + if (!Directory.Exists(_pluginsPath)) + { + Directory.CreateDirectory(_pluginsPath); + } + } + + return _pluginsPath; + } + } + + private string _logDirectoryPath; + /// + /// Gets the path to the log directory + /// + public string LogDirectoryPath + { + get + { + if (_logDirectoryPath == null) + { + _logDirectoryPath = Path.Combine(ProgramDataPath, "logs"); + if (!Directory.Exists(_logDirectoryPath)) + { + Directory.CreateDirectory(_logDirectoryPath); + } + } + return _logDirectoryPath; + } + } + + private string _configurationDirectoryPath; + /// + /// Gets the path to the application configuration root directory + /// + public string ConfigurationDirectoryPath + { + get + { + if (_configurationDirectoryPath == null) + { + _configurationDirectoryPath = Path.Combine(ProgramDataPath, "config"); + if (!Directory.Exists(_configurationDirectoryPath)) + { + Directory.CreateDirectory(_configurationDirectoryPath); + } + } + return _configurationDirectoryPath; + } + } + + private string _systemConfigurationFilePath; + /// + /// Gets the path to the system configuration file + /// + public string SystemConfigurationFilePath + { + get + { + if (_systemConfigurationFilePath == null) + { + _systemConfigurationFilePath = Path.Combine(ConfigurationDirectoryPath, "system.xml"); + } + return _systemConfigurationFilePath; + } + } + + /// + /// Gets the path to the application's ProgramDataFolder + /// + private static string GetProgramDataPath() + { + string programDataPath = ConfigurationManager.AppSettings["ProgramDataPath"]; + + // If it's a relative path, e.g. "..\" + if (!Path.IsPathRooted(programDataPath)) + { + string path = Assembly.GetExecutingAssembly().Location; + path = Path.GetDirectoryName(path); + + programDataPath = Path.Combine(path, programDataPath); + + programDataPath = Path.GetFullPath(programDataPath); + } + + if (!Directory.Exists(programDataPath)) + { + Directory.CreateDirectory(programDataPath); + } + + return programDataPath; + } + } +} diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 5ba68cf4e..44569cbad 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -6,11 +6,11 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Logging; using MediaBrowser.Common.Net; using MediaBrowser.Common.Plugins; using MediaBrowser.Common.Serialization; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Progress; namespace MediaBrowser.Common.Kernel @@ -93,17 +93,17 @@ namespace MediaBrowser.Common.Kernel protected void ReloadComposableParts() { DisposeComposableParts(); - + // Gets all plugin assemblies by first reading all bytes of the .dll and calling Assembly.Load against that // This will prevent the .dll file from getting locked, and allow us to replace it when needed IEnumerable pluginAssemblies = Directory.GetFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.AllDirectories).Select(f => Assembly.Load(File.ReadAllBytes((f)))); var catalog = new AggregateCatalog(pluginAssemblies.Select(a => new AssemblyCatalog(a))); - + // Include composable parts in the Common assembly // Uncomment this if it's ever needed //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly())); - + // Include composable parts in the subclass assembly catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly)); @@ -171,7 +171,7 @@ namespace MediaBrowser.Common.Kernel Configuration = XmlSerializer.DeserializeFromFile(ApplicationPaths.SystemConfigurationFilePath); } - Logger.LoggerInstance.LogSeverity = Configuration.LogSeverity; + Logger.LoggerInstance.LogSeverity = Configuration.EnableDebugLevelLogging ? LogSeverity.Debug : LogSeverity.Info; } /// diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index d80303d1f..841eccf73 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -74,8 +74,7 @@ - - + diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs index fb771f1e3..2112be679 100644 --- a/MediaBrowser.Common/UI/BaseApplication.cs +++ b/MediaBrowser.Common/UI/BaseApplication.cs @@ -1,13 +1,10 @@ using System; -using System.IO; -using System.Threading.Tasks; +using System.Reflection; using System.Windows; -using System.Windows.Controls; using System.Windows.Media.Imaging; using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Logging; using MediaBrowser.Model.Progress; -using System.Reflection; namespace MediaBrowser.Common.UI { diff --git a/MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs b/MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs deleted file mode 100644 index 92283ab25..000000000 --- a/MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs +++ /dev/null @@ -1,278 +0,0 @@ -using System.IO; -using MediaBrowser.Common.Configuration; - -namespace MediaBrowser.Controller.Configuration -{ - /// - /// Extends BaseApplicationPaths to add paths that are only applicable on the server - /// - public class ServerApplicationPaths : BaseApplicationPaths - { - private string _rootFolderPath; - /// - /// Gets the path to the root media directory - /// - public string RootFolderPath - { - get - { - if (_rootFolderPath == null) - { - _rootFolderPath = Path.Combine(ProgramDataPath, "root"); - if (!Directory.Exists(_rootFolderPath)) - { - Directory.CreateDirectory(_rootFolderPath); - } - } - return _rootFolderPath; - } - } - - private string _ibnPath; - /// - /// Gets the path to the Images By Name directory - /// - public string ImagesByNamePath - { - get - { - if (_ibnPath == null) - { - _ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"); - if (!Directory.Exists(_ibnPath)) - { - Directory.CreateDirectory(_ibnPath); - } - } - - return _ibnPath; - } - } - - private string _PeoplePath; - /// - /// Gets the path to the People directory - /// - public string PeoplePath - { - get - { - if (_PeoplePath == null) - { - _PeoplePath = Path.Combine(ImagesByNamePath, "People"); - if (!Directory.Exists(_PeoplePath)) - { - Directory.CreateDirectory(_PeoplePath); - } - } - - return _PeoplePath; - } - } - - private string _GenrePath; - /// - /// Gets the path to the Genre directory - /// - public string GenrePath - { - get - { - if (_GenrePath == null) - { - _GenrePath = Path.Combine(ImagesByNamePath, "Genre"); - if (!Directory.Exists(_GenrePath)) - { - Directory.CreateDirectory(_GenrePath); - } - } - - return _GenrePath; - } - } - - private string _StudioPath; - /// - /// Gets the path to the Studio directory - /// - public string StudioPath - { - get - { - if (_StudioPath == null) - { - _StudioPath = Path.Combine(ImagesByNamePath, "Studio"); - if (!Directory.Exists(_StudioPath)) - { - Directory.CreateDirectory(_StudioPath); - } - } - - return _StudioPath; - } - } - - private string _yearPath; - /// - /// Gets the path to the Year directory - /// - public string YearPath - { - get - { - if (_yearPath == null) - { - _yearPath = Path.Combine(ImagesByNamePath, "Year"); - if (!Directory.Exists(_yearPath)) - { - Directory.CreateDirectory(_yearPath); - } - } - - return _yearPath; - } - } - - private string _userConfigurationDirectoryPath; - /// - /// Gets the path to the user configuration directory - /// - public string UserConfigurationDirectoryPath - { - get - { - if (_userConfigurationDirectoryPath == null) - { - _userConfigurationDirectoryPath = Path.Combine(ConfigurationDirectoryPath, "user"); - if (!Directory.Exists(_userConfigurationDirectoryPath)) - { - Directory.CreateDirectory(_userConfigurationDirectoryPath); - } - } - return _userConfigurationDirectoryPath; - } - } - - private string _CacheDirectory = null; - /// - /// Gets the folder path to the cache directory - /// - public string CacheDirectory - { - get - { - if (_CacheDirectory == null) - { - _CacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.ProgramDataPath, "cache"); - - if (!Directory.Exists(_CacheDirectory)) - { - Directory.CreateDirectory(_CacheDirectory); - } - } - - return _CacheDirectory; - } - } - - private string _FFProbeAudioCacheDirectory = null; - /// - /// Gets the folder path to the ffprobe audio cache directory - /// - public string FFProbeAudioCacheDirectory - { - get - { - if (_FFProbeAudioCacheDirectory == null) - { - _FFProbeAudioCacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.CacheDirectory, "ffprobe-audio"); - - if (!Directory.Exists(_FFProbeAudioCacheDirectory)) - { - Directory.CreateDirectory(_FFProbeAudioCacheDirectory); - } - } - - return _FFProbeAudioCacheDirectory; - } - } - - private string _FFProbeVideoCacheDirectory = null; - /// - /// Gets the folder path to the ffprobe video cache directory - /// - public string FFProbeVideoCacheDirectory - { - get - { - if (_FFProbeVideoCacheDirectory == null) - { - _FFProbeVideoCacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.CacheDirectory, "ffprobe-video"); - - if (!Directory.Exists(_FFProbeVideoCacheDirectory)) - { - Directory.CreateDirectory(_FFProbeVideoCacheDirectory); - } - } - - return _FFProbeVideoCacheDirectory; - } - } - - private string _FFMpegDirectory = null; - /// - /// Gets the folder path to ffmpeg - /// - public string FFMpegDirectory - { - get - { - if (_FFMpegDirectory == null) - { - _FFMpegDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.ProgramDataPath, "FFMpeg"); - - if (!Directory.Exists(_FFMpegDirectory)) - { - Directory.CreateDirectory(_FFMpegDirectory); - } - } - - return _FFMpegDirectory; - } - } - - private string _FFMpegPath = null; - /// - /// Gets the path to ffmpeg.exe - /// - public string FFMpegPath - { - get - { - if (_FFMpegPath == null) - { - _FFMpegPath = Path.Combine(FFMpegDirectory, "ffmpeg.exe"); - } - - return _FFMpegPath; - } - } - - private string _FFProbePath = null; - /// - /// Gets the path to ffprobe.exe - /// - public string FFProbePath - { - get - { - if (_FFProbePath == null) - { - _FFProbePath = Path.Combine(FFMpegDirectory, "ffprobe.exe"); - } - - return _FFProbePath; - } - } - } -} diff --git a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs b/MediaBrowser.Controller/Configuration/ServerConfiguration.cs deleted file mode 100644 index 368c8ef37..000000000 --- a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MediaBrowser.Common.Configuration; - -namespace MediaBrowser.Controller.Configuration -{ - public class ServerConfiguration : BaseApplicationConfiguration - { - public bool EnableInternetProviders { get; set; } - public string WeatherZipCode { get; set; } - } -} diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 1a161ccc9..32f4a5828 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -9,12 +9,12 @@ using System.Text; using System.Threading.Tasks; using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Weather; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Progress; diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index f72202fea..1547deea2 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -58,8 +58,7 @@ - - + diff --git a/MediaBrowser.Controller/ServerApplicationPaths.cs b/MediaBrowser.Controller/ServerApplicationPaths.cs new file mode 100644 index 000000000..0f4932fd0 --- /dev/null +++ b/MediaBrowser.Controller/ServerApplicationPaths.cs @@ -0,0 +1,278 @@ +using System.IO; +using MediaBrowser.Common.Kernel; + +namespace MediaBrowser.Controller +{ + /// + /// Extends BaseApplicationPaths to add paths that are only applicable on the server + /// + public class ServerApplicationPaths : BaseApplicationPaths + { + private string _rootFolderPath; + /// + /// Gets the path to the root media directory + /// + public string RootFolderPath + { + get + { + if (_rootFolderPath == null) + { + _rootFolderPath = Path.Combine(ProgramDataPath, "root"); + if (!Directory.Exists(_rootFolderPath)) + { + Directory.CreateDirectory(_rootFolderPath); + } + } + return _rootFolderPath; + } + } + + private string _ibnPath; + /// + /// Gets the path to the Images By Name directory + /// + public string ImagesByNamePath + { + get + { + if (_ibnPath == null) + { + _ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"); + if (!Directory.Exists(_ibnPath)) + { + Directory.CreateDirectory(_ibnPath); + } + } + + return _ibnPath; + } + } + + private string _PeoplePath; + /// + /// Gets the path to the People directory + /// + public string PeoplePath + { + get + { + if (_PeoplePath == null) + { + _PeoplePath = Path.Combine(ImagesByNamePath, "People"); + if (!Directory.Exists(_PeoplePath)) + { + Directory.CreateDirectory(_PeoplePath); + } + } + + return _PeoplePath; + } + } + + private string _GenrePath; + /// + /// Gets the path to the Genre directory + /// + public string GenrePath + { + get + { + if (_GenrePath == null) + { + _GenrePath = Path.Combine(ImagesByNamePath, "Genre"); + if (!Directory.Exists(_GenrePath)) + { + Directory.CreateDirectory(_GenrePath); + } + } + + return _GenrePath; + } + } + + private string _StudioPath; + /// + /// Gets the path to the Studio directory + /// + public string StudioPath + { + get + { + if (_StudioPath == null) + { + _StudioPath = Path.Combine(ImagesByNamePath, "Studio"); + if (!Directory.Exists(_StudioPath)) + { + Directory.CreateDirectory(_StudioPath); + } + } + + return _StudioPath; + } + } + + private string _yearPath; + /// + /// Gets the path to the Year directory + /// + public string YearPath + { + get + { + if (_yearPath == null) + { + _yearPath = Path.Combine(ImagesByNamePath, "Year"); + if (!Directory.Exists(_yearPath)) + { + Directory.CreateDirectory(_yearPath); + } + } + + return _yearPath; + } + } + + private string _userConfigurationDirectoryPath; + /// + /// Gets the path to the user configuration directory + /// + public string UserConfigurationDirectoryPath + { + get + { + if (_userConfigurationDirectoryPath == null) + { + _userConfigurationDirectoryPath = Path.Combine(ConfigurationDirectoryPath, "user"); + if (!Directory.Exists(_userConfigurationDirectoryPath)) + { + Directory.CreateDirectory(_userConfigurationDirectoryPath); + } + } + return _userConfigurationDirectoryPath; + } + } + + private string _CacheDirectory = null; + /// + /// Gets the folder path to the cache directory + /// + public string CacheDirectory + { + get + { + if (_CacheDirectory == null) + { + _CacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.ProgramDataPath, "cache"); + + if (!Directory.Exists(_CacheDirectory)) + { + Directory.CreateDirectory(_CacheDirectory); + } + } + + return _CacheDirectory; + } + } + + private string _FFProbeAudioCacheDirectory = null; + /// + /// Gets the folder path to the ffprobe audio cache directory + /// + public string FFProbeAudioCacheDirectory + { + get + { + if (_FFProbeAudioCacheDirectory == null) + { + _FFProbeAudioCacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.CacheDirectory, "ffprobe-audio"); + + if (!Directory.Exists(_FFProbeAudioCacheDirectory)) + { + Directory.CreateDirectory(_FFProbeAudioCacheDirectory); + } + } + + return _FFProbeAudioCacheDirectory; + } + } + + private string _FFProbeVideoCacheDirectory = null; + /// + /// Gets the folder path to the ffprobe video cache directory + /// + public string FFProbeVideoCacheDirectory + { + get + { + if (_FFProbeVideoCacheDirectory == null) + { + _FFProbeVideoCacheDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.CacheDirectory, "ffprobe-video"); + + if (!Directory.Exists(_FFProbeVideoCacheDirectory)) + { + Directory.CreateDirectory(_FFProbeVideoCacheDirectory); + } + } + + return _FFProbeVideoCacheDirectory; + } + } + + private string _FFMpegDirectory = null; + /// + /// Gets the folder path to ffmpeg + /// + public string FFMpegDirectory + { + get + { + if (_FFMpegDirectory == null) + { + _FFMpegDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.ProgramDataPath, "FFMpeg"); + + if (!Directory.Exists(_FFMpegDirectory)) + { + Directory.CreateDirectory(_FFMpegDirectory); + } + } + + return _FFMpegDirectory; + } + } + + private string _FFMpegPath = null; + /// + /// Gets the path to ffmpeg.exe + /// + public string FFMpegPath + { + get + { + if (_FFMpegPath == null) + { + _FFMpegPath = Path.Combine(FFMpegDirectory, "ffmpeg.exe"); + } + + return _FFMpegPath; + } + } + + private string _FFProbePath = null; + /// + /// Gets the path to ffprobe.exe + /// + public string FFProbePath + { + get + { + if (_FFProbePath == null) + { + _FFProbePath = Path.Combine(FFMpegDirectory, "ffprobe.exe"); + } + + return _FFProbePath; + } + } + } +} diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs new file mode 100644 index 000000000..17be9eaef --- /dev/null +++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs @@ -0,0 +1,17 @@ + +namespace MediaBrowser.Model.Configuration +{ + /// + /// Serves as a common base class for the Server and UI application Configurations + /// + public class BaseApplicationConfiguration + { + public bool EnableDebugLevelLogging { get; set; } + public int HttpServerPortNumber { get; set; } + + public BaseApplicationConfiguration() + { + HttpServerPortNumber = 8096; + } + } +} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs new file mode 100644 index 000000000..97b88a5d9 --- /dev/null +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -0,0 +1,9 @@ + +namespace MediaBrowser.Model.Configuration +{ + public class ServerConfiguration : BaseApplicationConfiguration + { + public bool EnableInternetProviders { get; set; } + public string WeatherZipCode { get; set; } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index dabc6864c..b91e7ea17 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -32,6 +32,8 @@ 4 + + -- cgit v1.2.3