mirror of https://github.com/jellyfin/jellyfin.git
Merge pull request #6836 from cvium/apphost_light_cleanup
This commit is contained in:
commit
01a1209f0e
|
@ -3,6 +3,7 @@
|
||||||
#pragma warning disable CS1591
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
@ -118,7 +119,7 @@ namespace Emby.Server.Implementations
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The disposable parts.
|
/// The disposable parts.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private readonly List<IDisposable> _disposableParts = new List<IDisposable>();
|
private readonly ConcurrentDictionary<IDisposable, byte> _disposableParts = new ();
|
||||||
|
|
||||||
private readonly IFileSystem _fileSystemManager;
|
private readonly IFileSystem _fileSystemManager;
|
||||||
private readonly IConfiguration _startupConfig;
|
private readonly IConfiguration _startupConfig;
|
||||||
|
@ -129,7 +130,6 @@ namespace Emby.Server.Implementations
|
||||||
private List<Type> _creatingInstances;
|
private List<Type> _creatingInstances;
|
||||||
private IMediaEncoder _mediaEncoder;
|
private IMediaEncoder _mediaEncoder;
|
||||||
private ISessionManager _sessionManager;
|
private ISessionManager _sessionManager;
|
||||||
private string[] _urlPrefixes;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets all concrete types.
|
/// Gets or sets all concrete types.
|
||||||
|
@ -210,7 +210,7 @@ namespace Emby.Server.Implementations
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the <see cref="INetworkManager"/> singleton instance.
|
/// Gets the <see cref="INetworkManager"/> singleton instance.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public INetworkManager NetManager { get; internal set; }
|
public INetworkManager NetManager { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether this instance has changes that require the entire application to restart.
|
/// Gets a value indicating whether this instance has changes that require the entire application to restart.
|
||||||
|
@ -232,16 +232,16 @@ namespace Emby.Server.Implementations
|
||||||
protected ILoggerFactory LoggerFactory { get; }
|
protected ILoggerFactory LoggerFactory { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the application paths.
|
/// Gets the application paths.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The application paths.</value>
|
/// <value>The application paths.</value>
|
||||||
protected IServerApplicationPaths ApplicationPaths { get; set; }
|
protected IServerApplicationPaths ApplicationPaths { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the configuration manager.
|
/// Gets the configuration manager.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The configuration manager.</value>
|
/// <value>The configuration manager.</value>
|
||||||
public ServerConfigurationManager ConfigurationManager { get; set; }
|
public ServerConfigurationManager ConfigurationManager { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the service provider.
|
/// Gets or sets the service provider.
|
||||||
|
@ -344,22 +344,6 @@ namespace Emby.Server.Implementations
|
||||||
.Replace(appPaths.InternalMetadataPath, appPaths.VirtualInternalMetadataPath, StringComparison.OrdinalIgnoreCase);
|
.Replace(appPaths.InternalMetadataPath, appPaths.VirtualInternalMetadataPath, StringComparison.OrdinalIgnoreCase);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates an instance of type and resolves all constructor dependencies.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="type">The type.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object CreateInstance(Type type)
|
|
||||||
=> ActivatorUtilities.CreateInstance(ServiceProvider, type);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates an instance of type and resolves all constructor dependencies.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">The type.</typeparam>
|
|
||||||
/// <returns>T.</returns>
|
|
||||||
public T CreateInstance<T>()
|
|
||||||
=> ActivatorUtilities.CreateInstance<T>(ServiceProvider);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates the instance safe.
|
/// Creates the instance safe.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -369,7 +353,7 @@ namespace Emby.Server.Implementations
|
||||||
{
|
{
|
||||||
_creatingInstances ??= new List<Type>();
|
_creatingInstances ??= new List<Type>();
|
||||||
|
|
||||||
if (_creatingInstances.IndexOf(type) != -1)
|
if (_creatingInstances.Contains(type))
|
||||||
{
|
{
|
||||||
Logger.LogError("DI Loop detected in the attempted creation of {Type}", type.FullName);
|
Logger.LogError("DI Loop detected in the attempted creation of {Type}", type.FullName);
|
||||||
foreach (var entry in _creatingInstances)
|
foreach (var entry in _creatingInstances)
|
||||||
|
@ -379,7 +363,7 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
_pluginManager.FailPlugin(type.Assembly);
|
_pluginManager.FailPlugin(type.Assembly);
|
||||||
|
|
||||||
throw new ExternalException("DI Loop detected.");
|
throw new TypeLoadException("DI Loop detected");
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
|
@ -412,8 +396,15 @@ namespace Emby.Server.Implementations
|
||||||
public IEnumerable<Type> GetExportTypes<T>()
|
public IEnumerable<Type> GetExportTypes<T>()
|
||||||
{
|
{
|
||||||
var currentType = typeof(T);
|
var currentType = typeof(T);
|
||||||
|
var numberOfConcreteTypes = _allConcreteTypes.Length;
|
||||||
return _allConcreteTypes.Where(i => currentType.IsAssignableFrom(i));
|
for (var i = 0; i < numberOfConcreteTypes; i++)
|
||||||
|
{
|
||||||
|
var type = _allConcreteTypes[i];
|
||||||
|
if (currentType.IsAssignableFrom(type))
|
||||||
|
{
|
||||||
|
yield return type;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@ -428,9 +419,9 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
if (manageLifetime)
|
if (manageLifetime)
|
||||||
{
|
{
|
||||||
lock (_disposableParts)
|
foreach (var part in parts.OfType<IDisposable>())
|
||||||
{
|
{
|
||||||
_disposableParts.AddRange(parts.OfType<IDisposable>());
|
_disposableParts.TryAdd(part, byte.MinValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,9 +440,9 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
if (manageLifetime)
|
if (manageLifetime)
|
||||||
{
|
{
|
||||||
lock (_disposableParts)
|
foreach (var part in parts.OfType<IDisposable>())
|
||||||
{
|
{
|
||||||
_disposableParts.AddRange(parts.OfType<IDisposable>());
|
_disposableParts.TryAdd(part, byte.MinValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -563,7 +554,7 @@ namespace Emby.Server.Implementations
|
||||||
serviceCollection.AddSingleton<IServerConfigurationManager>(ConfigurationManager);
|
serviceCollection.AddSingleton<IServerConfigurationManager>(ConfigurationManager);
|
||||||
serviceCollection.AddSingleton<IConfigurationManager>(ConfigurationManager);
|
serviceCollection.AddSingleton<IConfigurationManager>(ConfigurationManager);
|
||||||
serviceCollection.AddSingleton<IApplicationHost>(this);
|
serviceCollection.AddSingleton<IApplicationHost>(this);
|
||||||
serviceCollection.AddSingleton<IPluginManager>(_pluginManager);
|
serviceCollection.AddSingleton(_pluginManager);
|
||||||
serviceCollection.AddSingleton<IApplicationPaths>(ApplicationPaths);
|
serviceCollection.AddSingleton<IApplicationPaths>(ApplicationPaths);
|
||||||
|
|
||||||
serviceCollection.AddSingleton(_fileSystemManager);
|
serviceCollection.AddSingleton(_fileSystemManager);
|
||||||
|
@ -586,7 +577,7 @@ namespace Emby.Server.Implementations
|
||||||
serviceCollection.AddSingleton<IZipClient, ZipClient>();
|
serviceCollection.AddSingleton<IZipClient, ZipClient>();
|
||||||
|
|
||||||
serviceCollection.AddSingleton<IServerApplicationHost>(this);
|
serviceCollection.AddSingleton<IServerApplicationHost>(this);
|
||||||
serviceCollection.AddSingleton<IServerApplicationPaths>(ApplicationPaths);
|
serviceCollection.AddSingleton(ApplicationPaths);
|
||||||
|
|
||||||
serviceCollection.AddSingleton<ILocalizationManager, LocalizationManager>();
|
serviceCollection.AddSingleton<ILocalizationManager, LocalizationManager>();
|
||||||
|
|
||||||
|
@ -790,8 +781,6 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
_pluginManager.CreatePlugins();
|
_pluginManager.CreatePlugins();
|
||||||
|
|
||||||
_urlPrefixes = GetUrlPrefixes().ToArray();
|
|
||||||
|
|
||||||
Resolve<ILibraryManager>().AddParts(
|
Resolve<ILibraryManager>().AddParts(
|
||||||
GetExports<IResolverIgnoreRule>(),
|
GetExports<IResolverIgnoreRule>(),
|
||||||
GetExports<IItemResolver>(),
|
GetExports<IItemResolver>(),
|
||||||
|
@ -859,32 +848,12 @@ namespace Emby.Server.Implementations
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<string> GetUrlPrefixes()
|
|
||||||
{
|
|
||||||
var hosts = new[] { "+" };
|
|
||||||
|
|
||||||
return hosts.SelectMany(i =>
|
|
||||||
{
|
|
||||||
var prefixes = new List<string>
|
|
||||||
{
|
|
||||||
"http://" + i + ":" + HttpPort + "/"
|
|
||||||
};
|
|
||||||
|
|
||||||
if (Certificate != null)
|
|
||||||
{
|
|
||||||
prefixes.Add("https://" + i + ":" + HttpsPort + "/");
|
|
||||||
}
|
|
||||||
|
|
||||||
return prefixes;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called when [configuration updated].
|
/// Called when [configuration updated].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="sender">The sender.</param>
|
/// <param name="sender">The sender.</param>
|
||||||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
||||||
protected void OnConfigurationUpdated(object sender, EventArgs e)
|
private void OnConfigurationUpdated(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var requiresRestart = false;
|
var requiresRestart = false;
|
||||||
var networkConfiguration = ConfigurationManager.GetNetworkConfiguration();
|
var networkConfiguration = ConfigurationManager.GetNetworkConfiguration();
|
||||||
|
@ -893,8 +862,8 @@ namespace Emby.Server.Implementations
|
||||||
if (HttpPort != 0 && HttpsPort != 0)
|
if (HttpPort != 0 && HttpsPort != 0)
|
||||||
{
|
{
|
||||||
// Need to restart if ports have changed
|
// Need to restart if ports have changed
|
||||||
if (networkConfiguration.HttpServerPortNumber != HttpPort ||
|
if (networkConfiguration.HttpServerPortNumber != HttpPort
|
||||||
networkConfiguration.HttpsPortNumber != HttpsPort)
|
|| networkConfiguration.HttpsPortNumber != HttpsPort)
|
||||||
{
|
{
|
||||||
if (ConfigurationManager.Configuration.IsPortAuthorized)
|
if (ConfigurationManager.Configuration.IsPortAuthorized)
|
||||||
{
|
{
|
||||||
|
@ -906,11 +875,6 @@ namespace Emby.Server.Implementations
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_urlPrefixes.SequenceEqual(GetUrlPrefixes(), StringComparer.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
requiresRestart = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ValidateSslCertificate(networkConfiguration))
|
if (ValidateSslCertificate(networkConfiguration))
|
||||||
{
|
{
|
||||||
requiresRestart = true;
|
requiresRestart = true;
|
||||||
|
@ -952,7 +916,7 @@ namespace Emby.Server.Implementations
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Notifies that the kernel that a change has been made that requires a restart.
|
/// Notifies the kernel that a change has been made that requires a restart.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void NotifyPendingRestart()
|
public void NotifyPendingRestart()
|
||||||
{
|
{
|
||||||
|
@ -1093,11 +1057,6 @@ namespace Emby.Server.Implementations
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<WakeOnLanInfo> GetWakeOnLanInfo()
|
|
||||||
=> NetManager.GetMacAddresses()
|
|
||||||
.Select(i => new WakeOnLanInfo(i))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
public PublicSystemInfo GetPublicSystemInfo(HttpRequest request)
|
public PublicSystemInfo GetPublicSystemInfo(HttpRequest request)
|
||||||
{
|
{
|
||||||
return new PublicSystemInfo
|
return new PublicSystemInfo
|
||||||
|
@ -1113,7 +1072,7 @@ namespace Emby.Server.Implementations
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public string GetSmartApiUrl(IPAddress remoteAddr, int? port = null)
|
public string GetSmartApiUrl(IPAddress remoteAddr)
|
||||||
{
|
{
|
||||||
// Published server ends with a /
|
// Published server ends with a /
|
||||||
if (!string.IsNullOrEmpty(PublishedServerUrl))
|
if (!string.IsNullOrEmpty(PublishedServerUrl))
|
||||||
|
@ -1122,12 +1081,12 @@ namespace Emby.Server.Implementations
|
||||||
return PublishedServerUrl.Trim('/');
|
return PublishedServerUrl.Trim('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
string smart = NetManager.GetBindInterface(remoteAddr, out port);
|
string smart = NetManager.GetBindInterface(remoteAddr, out var port);
|
||||||
return GetLocalApiUrl(smart.Trim('/'), null, port);
|
return GetLocalApiUrl(smart.Trim('/'), null, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public string GetSmartApiUrl(HttpRequest request, int? port = null)
|
public string GetSmartApiUrl(HttpRequest request)
|
||||||
{
|
{
|
||||||
// Return the host in the HTTP request as the API url
|
// Return the host in the HTTP request as the API url
|
||||||
if (ConfigurationManager.GetNetworkConfiguration().EnablePublishedServerUriByRequest)
|
if (ConfigurationManager.GetNetworkConfiguration().EnablePublishedServerUriByRequest)
|
||||||
|
@ -1148,12 +1107,12 @@ namespace Emby.Server.Implementations
|
||||||
return PublishedServerUrl.Trim('/');
|
return PublishedServerUrl.Trim('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
string smart = NetManager.GetBindInterface(request, out port);
|
string smart = NetManager.GetBindInterface(request, out var port);
|
||||||
return GetLocalApiUrl(smart.Trim('/'), request.Scheme, port);
|
return GetLocalApiUrl(smart.Trim('/'), request.Scheme, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public string GetSmartApiUrl(string hostname, int? port = null)
|
public string GetSmartApiUrl(string hostname)
|
||||||
{
|
{
|
||||||
// Published server ends with a /
|
// Published server ends with a /
|
||||||
if (!string.IsNullOrEmpty(PublishedServerUrl))
|
if (!string.IsNullOrEmpty(PublishedServerUrl))
|
||||||
|
@ -1162,7 +1121,7 @@ namespace Emby.Server.Implementations
|
||||||
return PublishedServerUrl.Trim('/');
|
return PublishedServerUrl.Trim('/');
|
||||||
}
|
}
|
||||||
|
|
||||||
string smart = NetManager.GetBindInterface(hostname, out port);
|
string smart = NetManager.GetBindInterface(hostname, out var port);
|
||||||
return GetLocalApiUrl(smart.Trim('/'), null, port);
|
return GetLocalApiUrl(smart.Trim('/'), null, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1258,12 +1217,15 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
Logger.LogInformation("Disposing {Type}", type.Name);
|
Logger.LogInformation("Disposing {Type}", type.Name);
|
||||||
|
|
||||||
var parts = _disposableParts.Distinct().Where(i => i.GetType() != type).ToList();
|
foreach (var (part, _) in _disposableParts)
|
||||||
_disposableParts.Clear();
|
|
||||||
|
|
||||||
foreach (var part in parts)
|
|
||||||
{
|
{
|
||||||
Logger.LogInformation("Disposing {Type}", part.GetType().Name);
|
var partType = part.GetType();
|
||||||
|
if (partType == type)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.LogInformation("Disposing {Type}", partType.Name);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -1271,9 +1233,11 @@ namespace Emby.Server.Implementations
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.LogError(ex, "Error disposing {Type}", part.GetType().Name);
|
Logger.LogError(ex, "Error disposing {Type}", partType.Name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_disposableParts.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
|
|
|
@ -212,10 +212,13 @@ namespace Jellyfin.Api.Controllers
|
||||||
/// <returns>An <see cref="IEnumerable{WakeOnLanInfo}"/> with the WakeOnLan infos.</returns>
|
/// <returns>An <see cref="IEnumerable{WakeOnLanInfo}"/> with the WakeOnLan infos.</returns>
|
||||||
[HttpGet("WakeOnLanInfo")]
|
[HttpGet("WakeOnLanInfo")]
|
||||||
[Authorize(Policy = Policies.DefaultAuthorization)]
|
[Authorize(Policy = Policies.DefaultAuthorization)]
|
||||||
|
[Obsolete("This endpoint is obsolete.")]
|
||||||
[ProducesResponseType(StatusCodes.Status200OK)]
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
public ActionResult<IEnumerable<WakeOnLanInfo>> GetWakeOnLanInfo()
|
public ActionResult<IEnumerable<WakeOnLanInfo>> GetWakeOnLanInfo()
|
||||||
{
|
{
|
||||||
var result = _appHost.GetWakeOnLanInfo();
|
var result = _network.GetMacAddresses()
|
||||||
|
.Select(i => new WakeOnLanInfo(i))
|
||||||
|
.ToList();
|
||||||
return Ok(result);
|
return Ok(result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,12 +140,5 @@ namespace MediaBrowser.Common
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="serviceCollection">Instance of the <see cref="IServiceCollection"/> interface.</param>
|
/// <param name="serviceCollection">Instance of the <see cref="IServiceCollection"/> interface.</param>
|
||||||
void Init(IServiceCollection serviceCollection);
|
void Init(IServiceCollection serviceCollection);
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creates the instance.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="type">The type.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
object CreateInstance(Type type);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,11 +42,6 @@ namespace MediaBrowser.Controller
|
||||||
/// <value>The name of the friendly.</value>
|
/// <value>The name of the friendly.</value>
|
||||||
string FriendlyName { get; }
|
string FriendlyName { get; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the configured published server url.
|
|
||||||
/// </summary>
|
|
||||||
string PublishedServerUrl { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the system info.
|
/// Gets the system info.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -60,25 +55,22 @@ namespace MediaBrowser.Controller
|
||||||
/// Gets a URL specific for the request.
|
/// Gets a URL specific for the request.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The <see cref="HttpRequest"/> instance.</param>
|
/// <param name="request">The <see cref="HttpRequest"/> instance.</param>
|
||||||
/// <param name="port">Optional port number.</param>
|
|
||||||
/// <returns>An accessible URL.</returns>
|
/// <returns>An accessible URL.</returns>
|
||||||
string GetSmartApiUrl(HttpRequest request, int? port = null);
|
string GetSmartApiUrl(HttpRequest request);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a URL specific for the request.
|
/// Gets a URL specific for the request.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="remoteAddr">The remote <see cref="IPAddress"/> of the connection.</param>
|
/// <param name="remoteAddr">The remote <see cref="IPAddress"/> of the connection.</param>
|
||||||
/// <param name="port">Optional port number.</param>
|
|
||||||
/// <returns>An accessible URL.</returns>
|
/// <returns>An accessible URL.</returns>
|
||||||
string GetSmartApiUrl(IPAddress remoteAddr, int? port = null);
|
string GetSmartApiUrl(IPAddress remoteAddr);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a URL specific for the request.
|
/// Gets a URL specific for the request.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="hostname">The hostname used in the connection.</param>
|
/// <param name="hostname">The hostname used in the connection.</param>
|
||||||
/// <param name="port">Optional port number.</param>
|
|
||||||
/// <returns>An accessible URL.</returns>
|
/// <returns>An accessible URL.</returns>
|
||||||
string GetSmartApiUrl(string hostname, int? port = null);
|
string GetSmartApiUrl(string hostname);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets an URL that can be used to access the API over LAN.
|
/// Gets an URL that can be used to access the API over LAN.
|
||||||
|
@ -103,8 +95,6 @@ namespace MediaBrowser.Controller
|
||||||
/// <returns>The API URL.</returns>
|
/// <returns>The API URL.</returns>
|
||||||
string GetLocalApiUrl(string hostname, string scheme = null, int? port = null);
|
string GetLocalApiUrl(string hostname, string scheme = null, int? port = null);
|
||||||
|
|
||||||
IEnumerable<WakeOnLanInfo> GetWakeOnLanInfo();
|
|
||||||
|
|
||||||
string ExpandVirtualPath(string path);
|
string ExpandVirtualPath(string path);
|
||||||
|
|
||||||
string ReverseVirtualPath(string path);
|
string ReverseVirtualPath(string path);
|
||||||
|
|
Loading…
Reference in New Issue