diff options
| -rw-r--r-- | Emby.Server.Implementations/ServerApplicationPaths.cs | 17 | ||||
| -rw-r--r-- | MediaBrowser.Controller/IServerApplicationPaths.cs | 17 |
2 files changed, 10 insertions, 24 deletions
diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs index 4b8298abb..2f57c97a1 100644 --- a/Emby.Server.Implementations/ServerApplicationPaths.cs +++ b/Emby.Server.Implementations/ServerApplicationPaths.cs @@ -1,4 +1,3 @@ -using System; using System.IO; using Emby.Server.Implementations.AppBase; using MediaBrowser.Controller; @@ -10,8 +9,6 @@ namespace Emby.Server.Implementations /// </summary> public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths { - private string _defaultTranscodePath; - private string _transcodePath; private string _internalMetadataPath; /// <summary> @@ -23,7 +20,8 @@ namespace Emby.Server.Implementations string configurationDirectoryPath, string cacheDirectoryPath, string webDirectoryPath) - : base(programDataPath, + : base( + programDataPath, logDirectoryPath, configurationDirectoryPath, cacheDirectoryPath, @@ -31,8 +29,6 @@ namespace Emby.Server.Implementations { } - public string ApplicationResourcesPath { get; } = AppContext.BaseDirectory; - /// <summary> /// Gets the path to the base root media directory. /// </summary> @@ -46,17 +42,12 @@ namespace Emby.Server.Implementations public string DefaultUserViewsPath => Path.Combine(RootFolderPath, "default"); /// <summary> - /// Gets the path to localization data. - /// </summary> - /// <value>The localization path.</value> - public string LocalizationPath => Path.Combine(ProgramDataPath, "localization"); - - /// <summary> /// Gets the path to the People directory. /// </summary> /// <value>The people path.</value> public string PeoplePath => Path.Combine(InternalMetadataPath, "People"); + /// <inheritdoc /> public string ArtistsPath => Path.Combine(InternalMetadataPath, "artists"); /// <summary> @@ -107,12 +98,14 @@ namespace Emby.Server.Implementations /// <value>The user configuration directory path.</value> public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users"); + /// <inheritdoc /> public string InternalMetadataPath { get => _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata")); set => _internalMetadataPath = value; } + /// <inheritdoc /> public string VirtualInternalMetadataPath { get; } = "%MetadataPath%"; } } diff --git a/MediaBrowser.Controller/IServerApplicationPaths.cs b/MediaBrowser.Controller/IServerApplicationPaths.cs index 56e7e4e47..5d7c60910 100644 --- a/MediaBrowser.Controller/IServerApplicationPaths.cs +++ b/MediaBrowser.Controller/IServerApplicationPaths.cs @@ -11,24 +11,12 @@ namespace MediaBrowser.Controller string RootFolderPath { get; } /// <summary> - /// Gets the application resources path. This is the path to the folder containing resources that are deployed as part of the application - /// </summary> - /// <value>The application resources path.</value> - string ApplicationResourcesPath { get; } - - /// <summary> /// Gets the path to the default user view directory. Used if no specific user view is defined. /// </summary> /// <value>The default user views path.</value> string DefaultUserViewsPath { get; } /// <summary> - /// Gets the path to localization data. - /// </summary> - /// <value>The localization path.</value> - string LocalizationPath { get; } - - /// <summary> /// Gets the path to the People directory /// </summary> /// <value>The people path.</value> @@ -87,8 +75,13 @@ namespace MediaBrowser.Controller /// </summary> /// <value>The internal metadata path.</value> string InternalMetadataPath { get; } + string VirtualInternalMetadataPath { get; } + /// <summary> + /// Gets the path to the artists directory. + /// </summary> + /// <value>The artists path.</value> string ArtistsPath { get; } } } |