Ensure metadata path is created on app startup, and also each time it is updated

pull/2990/head
Mark Monteiro 4 years ago
parent cbd62e00a4
commit 7615cdc963

@ -67,11 +67,15 @@ namespace Emby.Server.Implementations.Configuration
/// <summary> /// <summary>
/// Updates the metadata path. /// Updates the metadata path.
/// </summary> /// </summary>
/// <exception cref="UnauthorizedAccessException">If the directory does not exist, and the caller does not have the required permission to create it.</exception>
/// <exception cref="NotSupportedException">If there is a custom path transcoding path specified, but it is invalid.</exception>
/// <exception cref="IOException">If the directory does not exist, and it also could not be created.</exception>
private void UpdateMetadataPath() private void UpdateMetadataPath()
{ {
((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = string.IsNullOrWhiteSpace(Configuration.MetadataPath) ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = string.IsNullOrWhiteSpace(Configuration.MetadataPath)
? Path.Combine(ApplicationPaths.ProgramDataPath, "metadata") ? ApplicationPaths.DefaultInternalMetadataPath
: Configuration.MetadataPath; : Configuration.MetadataPath;
Directory.CreateDirectory(ApplicationPaths.InternalMetadataPath);
} }
/// <summary> /// <summary>

@ -9,8 +9,6 @@ namespace Emby.Server.Implementations
/// </summary> /// </summary>
public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
{ {
private string _internalMetadataPath;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ServerApplicationPaths" /> class. /// Initializes a new instance of the <see cref="ServerApplicationPaths" /> class.
/// </summary> /// </summary>
@ -27,6 +25,7 @@ namespace Emby.Server.Implementations
cacheDirectoryPath, cacheDirectoryPath,
webDirectoryPath) webDirectoryPath)
{ {
InternalMetadataPath = DefaultInternalMetadataPath;
} }
/// <summary> /// <summary>
@ -98,12 +97,11 @@ namespace Emby.Server.Implementations
/// <value>The user configuration directory path.</value> /// <value>The user configuration directory path.</value>
public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users"); public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users");
/// <inheritdoc/>
public string DefaultInternalMetadataPath => Path.Combine(ProgramDataPath, "metadata");
/// <inheritdoc /> /// <inheritdoc />
public string InternalMetadataPath public string InternalMetadataPath { get; set; }
{
get => _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
set => _internalMetadataPath = value;
}
/// <inheritdoc /> /// <inheritdoc />
public string VirtualInternalMetadataPath { get; } = "%MetadataPath%"; public string VirtualInternalMetadataPath { get; } = "%MetadataPath%";

@ -71,7 +71,12 @@ namespace MediaBrowser.Controller
string UserConfigurationDirectoryPath { get; } string UserConfigurationDirectoryPath { get; }
/// <summary> /// <summary>
/// Gets the internal metadata path. /// Gets the default internal metadata path.
/// </summary>
string DefaultInternalMetadataPath { get; }
/// <summary>
/// Gets the internal metadata path, either a custom path or the default.
/// </summary> /// </summary>
/// <value>The internal metadata path.</value> /// <value>The internal metadata path.</value>
string InternalMetadataPath { get; } string InternalMetadataPath { get; }

Loading…
Cancel
Save