Merge pull request #2097 from Bond-009/unused2

Remove unused fields and properties
pull/2020/head^2
Vasily 5 years ago committed by GitHub
commit e05c02263a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,4 +1,3 @@
using System;
using System.IO; using System.IO;
using Emby.Server.Implementations.AppBase; using Emby.Server.Implementations.AppBase;
using MediaBrowser.Controller; using MediaBrowser.Controller;
@ -10,8 +9,6 @@ namespace Emby.Server.Implementations
/// </summary> /// </summary>
public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
{ {
private string _defaultTranscodePath;
private string _transcodePath;
private string _internalMetadataPath; private string _internalMetadataPath;
/// <summary> /// <summary>
@ -23,7 +20,8 @@ namespace Emby.Server.Implementations
string configurationDirectoryPath, string configurationDirectoryPath,
string cacheDirectoryPath, string cacheDirectoryPath,
string webDirectoryPath) string webDirectoryPath)
: base(programDataPath, : base(
programDataPath,
logDirectoryPath, logDirectoryPath,
configurationDirectoryPath, configurationDirectoryPath,
cacheDirectoryPath, cacheDirectoryPath,
@ -31,8 +29,6 @@ namespace Emby.Server.Implementations
{ {
} }
public string ApplicationResourcesPath { get; } = AppContext.BaseDirectory;
/// <summary> /// <summary>
/// Gets the path to the base root media directory. /// Gets the path to the base root media directory.
/// </summary> /// </summary>
@ -45,18 +41,13 @@ namespace Emby.Server.Implementations
/// <value>The default user views path.</value> /// <value>The default user views path.</value>
public string DefaultUserViewsPath => Path.Combine(RootFolderPath, "default"); 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> /// <summary>
/// Gets the path to the People directory. /// Gets the path to the People directory.
/// </summary> /// </summary>
/// <value>The people path.</value> /// <value>The people path.</value>
public string PeoplePath => Path.Combine(InternalMetadataPath, "People"); public string PeoplePath => Path.Combine(InternalMetadataPath, "People");
/// <inheritdoc />
public string ArtistsPath => Path.Combine(InternalMetadataPath, "artists"); public string ArtistsPath => Path.Combine(InternalMetadataPath, "artists");
/// <summary> /// <summary>
@ -107,12 +98,14 @@ 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 InternalMetadataPath public string InternalMetadataPath
{ {
get => _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata")); get => _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
set => _internalMetadataPath = value; set => _internalMetadataPath = value;
} }
/// <inheritdoc />
public string VirtualInternalMetadataPath { get; } = "%MetadataPath%"; public string VirtualInternalMetadataPath { get; } = "%MetadataPath%";
} }
} }

@ -10,24 +10,12 @@ namespace MediaBrowser.Controller
/// <value>The root folder path.</value> /// <value>The root folder path.</value>
string RootFolderPath { get; } 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> /// <summary>
/// Gets the path to the default user view directory. Used if no specific user view is defined. /// Gets the path to the default user view directory. Used if no specific user view is defined.
/// </summary> /// </summary>
/// <value>The default user views path.</value> /// <value>The default user views path.</value>
string DefaultUserViewsPath { get; } string DefaultUserViewsPath { get; }
/// <summary>
/// Gets the path to localization data.
/// </summary>
/// <value>The localization path.</value>
string LocalizationPath { get; }
/// <summary> /// <summary>
/// Gets the path to the People directory /// Gets the path to the People directory
/// </summary> /// </summary>
@ -87,8 +75,13 @@ namespace MediaBrowser.Controller
/// </summary> /// </summary>
/// <value>The internal metadata path.</value> /// <value>The internal metadata path.</value>
string InternalMetadataPath { get; } string InternalMetadataPath { get; }
string VirtualInternalMetadataPath { get; } string VirtualInternalMetadataPath { get; }
/// <summary>
/// Gets the path to the artists directory.
/// </summary>
/// <value>The artists path.</value>
string ArtistsPath { get; } string ArtistsPath { get; }
} }
} }

Loading…
Cancel
Save