mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-24 01:34:45 +03:00
Merge branch 'master' into websocket
This commit is contained in:
@@ -39,10 +39,9 @@ namespace MediaBrowser.Controller
|
||||
int HttpsPort { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets a value indicating whether [supports HTTPS].
|
||||
/// Gets a value indicating whether the server should listen on an HTTPS port.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if [supports HTTPS]; otherwise, <c>false</c>.</value>
|
||||
bool EnableHttps { get; }
|
||||
bool ListenWithHttps { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets a value indicating whether this instance has update available.
|
||||
@@ -57,34 +56,50 @@ namespace MediaBrowser.Controller
|
||||
string FriendlyName { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the local ip address.
|
||||
/// Gets all the local IP addresses of this API instance. Each address is validated by sending a 'ping' request
|
||||
/// to the API that should exist at the address.
|
||||
/// </summary>
|
||||
/// <value>The local ip address.</value>
|
||||
/// <param name="cancellationToken">A cancellation token that can be used to cancel the task.</param>
|
||||
/// <returns>A list containing all the local IP addresses of the server.</returns>
|
||||
Task<List<IPAddress>> GetLocalIpAddresses(CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the local API URL.
|
||||
/// Gets a local (LAN) URL that can be used to access the API. The hostname used is the first valid configured
|
||||
/// IP address that can be found via <see cref="GetLocalIpAddresses"/>. HTTPS will be preferred when available.
|
||||
/// </summary>
|
||||
/// <param name="cancellationToken">Token to cancel the request if needed.</param>
|
||||
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
|
||||
/// <value>The local API URL.</value>
|
||||
Task<string> GetLocalApiUrl(CancellationToken cancellationToken, bool forceHttp = false);
|
||||
/// <param name="cancellationToken">A cancellation token that can be used to cancel the task.</param>
|
||||
/// <returns>The server URL.</returns>
|
||||
Task<string> GetLocalApiUrl(CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the local API URL.
|
||||
/// Gets a localhost URL that can be used to access the API using the loop-back IP address (127.0.0.1)
|
||||
/// over HTTP (not HTTPS).
|
||||
/// </summary>
|
||||
/// <param name="hostname">The hostname.</param>
|
||||
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
|
||||
/// <returns>The local API URL.</returns>
|
||||
string GetLocalApiUrl(ReadOnlySpan<char> hostname, bool forceHttp = false);
|
||||
/// <returns>The API URL.</returns>
|
||||
string GetLoopbackHttpApiUrl();
|
||||
|
||||
/// <summary>
|
||||
/// Gets the local API URL.
|
||||
/// Gets a local (LAN) URL that can be used to access the API. HTTPS will be preferred when available.
|
||||
/// </summary>
|
||||
/// <param name="address">The IP address.</param>
|
||||
/// <param name="forceHttp">Whether to force usage of plain HTTP protocol.</param>
|
||||
/// <returns>The local API URL.</returns>
|
||||
string GetLocalApiUrl(IPAddress address, bool forceHttp = false);
|
||||
/// <param name="address">The IP address to use as the hostname in the URL.</param>
|
||||
/// <returns>The API URL.</returns>
|
||||
string GetLocalApiUrl(IPAddress address);
|
||||
|
||||
/// <summary>
|
||||
/// Gets a local (LAN) URL that can be used to access the API.
|
||||
/// Note: if passing non-null scheme or port it is up to the caller to ensure they form the correct pair.
|
||||
/// </summary>
|
||||
/// <param name="hostname">The hostname to use in the URL.</param>
|
||||
/// <param name="scheme">
|
||||
/// The scheme to use for the URL. If null, the scheme will be selected automatically,
|
||||
/// preferring HTTPS, if available.
|
||||
/// </param>
|
||||
/// <param name="port">
|
||||
/// The port to use for the URL. If null, the port will be selected automatically,
|
||||
/// preferring the HTTPS port, if available.
|
||||
/// </param>
|
||||
/// <returns>The API URL.</returns>
|
||||
string GetLocalApiUrl(ReadOnlySpan<char> hostname, string scheme = null, int? port = null);
|
||||
|
||||
/// <summary>
|
||||
/// Open a URL in an external browser window.
|
||||
|
||||
Reference in New Issue
Block a user