From 2e408e40c015b34b365d0e0ef4d7a20fc02b0b80 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 4 Jun 2013 12:48:23 -0400 Subject: defer path creation when possible --- .../ServerApplicationPaths.cs | 228 ++------------------- 1 file changed, 15 insertions(+), 213 deletions(-) (limited to 'MediaBrowser.Server.Implementations/ServerApplicationPaths.cs') diff --git a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs b/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs index c30c1b9db..655876c8c 100644 --- a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs +++ b/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs @@ -26,10 +26,6 @@ namespace MediaBrowser.Server.Implementations { } #endif - /// - /// The _root folder path - /// - private string _rootFolderPath; /// /// Gets the path to the base root media directory /// @@ -38,22 +34,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_rootFolderPath == null) - { - _rootFolderPath = Path.Combine(ProgramDataPath, "Root"); - if (!Directory.Exists(_rootFolderPath)) - { - Directory.CreateDirectory(_rootFolderPath); - } - } - return _rootFolderPath; + return Path.Combine(ProgramDataPath, "root"); } } - /// - /// The _default user views path - /// - private string _defaultUserViewsPath; /// /// Gets the path to the default user view directory. Used if no specific user view is defined. /// @@ -62,22 +46,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_defaultUserViewsPath == null) - { - _defaultUserViewsPath = Path.Combine(RootFolderPath, "Default"); - if (!Directory.Exists(_defaultUserViewsPath)) - { - Directory.CreateDirectory(_defaultUserViewsPath); - } - } - return _defaultUserViewsPath; + return Path.Combine(RootFolderPath, "default"); } } - /// - /// The _localization path - /// - private string _localizationPath; /// /// Gets the path to localization data. /// @@ -86,15 +58,7 @@ namespace MediaBrowser.Server.Implementations { get { - if (_localizationPath == null) - { - _localizationPath = Path.Combine(ProgramDataPath, "Localization"); - if (!Directory.Exists(_localizationPath)) - { - Directory.CreateDirectory(_localizationPath); - } - } - return _localizationPath; + return Path.Combine(ProgramDataPath, "localization"); } } @@ -110,36 +74,14 @@ namespace MediaBrowser.Server.Implementations { get { - if (_ibnPath == null) - { - _ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"); - if (!Directory.Exists(_ibnPath)) - { - Directory.CreateDirectory(_ibnPath); - } - } - - return _ibnPath; + return _ibnPath ?? (_ibnPath = Path.Combine(ProgramDataPath, "ImagesByName")); } set { _ibnPath = value; - - _peoplePath = null; - _studioPath = null; - _genrePath = null; - _yearPath = null; - _musicArtistsPath = null; - _generalPath = null; - _ratingsPath = null; - _mediaInfoImagesPath = null; } } - /// - /// The _people path - /// - private string _peoplePath; /// /// Gets the path to the People directory /// @@ -148,23 +90,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_peoplePath == null) - { - _peoplePath = Path.Combine(ItemsByNamePath, "People"); - if (!Directory.Exists(_peoplePath)) - { - Directory.CreateDirectory(_peoplePath); - } - } - - return _peoplePath; + return Path.Combine(ItemsByNamePath, "People"); } } - /// - /// The _genre path - /// - private string _genrePath; /// /// Gets the path to the Genre directory /// @@ -173,23 +102,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_genrePath == null) - { - _genrePath = Path.Combine(ItemsByNamePath, "Genre"); - if (!Directory.Exists(_genrePath)) - { - Directory.CreateDirectory(_genrePath); - } - } - - return _genrePath; + return Path.Combine(ItemsByNamePath, "Genre"); } } - /// - /// The _studio path - /// - private string _studioPath; /// /// Gets the path to the Studio directory /// @@ -198,23 +114,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_studioPath == null) - { - _studioPath = Path.Combine(ItemsByNamePath, "Studio"); - if (!Directory.Exists(_studioPath)) - { - Directory.CreateDirectory(_studioPath); - } - } - - return _studioPath; + return Path.Combine(ItemsByNamePath, "Studio"); } } - /// - /// The _year path - /// - private string _yearPath; /// /// Gets the path to the Year directory /// @@ -223,23 +126,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_yearPath == null) - { - _yearPath = Path.Combine(ItemsByNamePath, "Year"); - if (!Directory.Exists(_yearPath)) - { - Directory.CreateDirectory(_yearPath); - } - } - - return _yearPath; + return Path.Combine(ItemsByNamePath, "Year"); } } - /// - /// The _general path - /// - private string _generalPath; /// /// Gets the path to the General IBN directory /// @@ -248,23 +138,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_generalPath == null) - { - _generalPath = Path.Combine(ItemsByNamePath, "General"); - if (!Directory.Exists(_generalPath)) - { - Directory.CreateDirectory(_generalPath); - } - } - - return _generalPath; + return Path.Combine(ItemsByNamePath, "general"); } } - /// - /// The _ratings path - /// - private string _ratingsPath; /// /// Gets the path to the Ratings IBN directory /// @@ -273,23 +150,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_ratingsPath == null) - { - _ratingsPath = Path.Combine(ItemsByNamePath, "Ratings"); - if (!Directory.Exists(_ratingsPath)) - { - Directory.CreateDirectory(_ratingsPath); - } - } - - return _ratingsPath; + return Path.Combine(ItemsByNamePath, "ratings"); } } - /// - /// The _media info images path - /// - private string _mediaInfoImagesPath; /// /// Gets the media info images path. /// @@ -298,23 +162,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_mediaInfoImagesPath == null) - { - _mediaInfoImagesPath = Path.Combine(ItemsByNamePath, "MediaInfo"); - if (!Directory.Exists(_mediaInfoImagesPath)) - { - Directory.CreateDirectory(_mediaInfoImagesPath); - } - } - - return _mediaInfoImagesPath; + return Path.Combine(ItemsByNamePath, "mediainfo"); } } - /// - /// The _user configuration directory path - /// - private string _userConfigurationDirectoryPath; /// /// Gets the path to the user configuration directory /// @@ -323,22 +174,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_userConfigurationDirectoryPath == null) - { - _userConfigurationDirectoryPath = Path.Combine(ConfigurationDirectoryPath, "users"); - if (!Directory.Exists(_userConfigurationDirectoryPath)) - { - Directory.CreateDirectory(_userConfigurationDirectoryPath); - } - } - return _userConfigurationDirectoryPath; + return Path.Combine(ConfigurationDirectoryPath, "users"); } } - /// - /// The _f F MPEG stream cache path - /// - private string _fFMpegStreamCachePath; /// /// Gets the FF MPEG stream cache path. /// @@ -347,24 +186,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_fFMpegStreamCachePath == null) - { - _fFMpegStreamCachePath = Path.Combine(CachePath, "encoded-media"); - - if (!Directory.Exists(_fFMpegStreamCachePath)) - { - Directory.CreateDirectory(_fFMpegStreamCachePath); - } - } - - return _fFMpegStreamCachePath; + return Path.Combine(CachePath, "encoded-media"); } } - /// - /// The _images data path - /// - private string _downloadedImagesDataPath; /// /// Gets the images data path. /// @@ -373,24 +198,10 @@ namespace MediaBrowser.Server.Implementations { get { - if (_downloadedImagesDataPath == null) - { - _downloadedImagesDataPath = Path.Combine(DataPath, "remote-images"); - - if (!Directory.Exists(_downloadedImagesDataPath)) - { - Directory.CreateDirectory(_downloadedImagesDataPath); - } - } - - return _downloadedImagesDataPath; + return Path.Combine(DataPath, "remote-images"); } } - /// - /// The _music artists path - /// - private string _musicArtistsPath; /// /// Gets the artists path. /// @@ -399,16 +210,7 @@ namespace MediaBrowser.Server.Implementations { get { - if (_musicArtistsPath == null) - { - _musicArtistsPath = Path.Combine(ItemsByNamePath, "Artists"); - if (!Directory.Exists(_musicArtistsPath)) - { - Directory.CreateDirectory(_musicArtistsPath); - } - } - - return _musicArtistsPath; + return Path.Combine(ItemsByNamePath, "artists"); } } } -- cgit v1.2.3