mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-07 18:56:22 +00:00
display server name in dashboard
This commit is contained in:
@@ -41,8 +41,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||
|
||||
private readonly ReaderWriterLockSlim _localEndpointLock = new ReaderWriterLockSlim();
|
||||
|
||||
private readonly bool _supportsNativeWebSocket;
|
||||
|
||||
private string _certificatePath;
|
||||
|
||||
/// <summary>
|
||||
@@ -67,12 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||
ILogManager logManager,
|
||||
string serviceName,
|
||||
string defaultRedirectPath,
|
||||
bool supportsNativeWebSocket,
|
||||
params Assembly[] assembliesWithServices)
|
||||
: base(serviceName, assembliesWithServices)
|
||||
{
|
||||
DefaultRedirectPath = defaultRedirectPath;
|
||||
_supportsNativeWebSocket = supportsNativeWebSocket;
|
||||
|
||||
_logger = logManager.GetLogger("HttpServer");
|
||||
|
||||
@@ -210,13 +206,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||
|
||||
private IHttpListener GetListener()
|
||||
{
|
||||
if (_supportsNativeWebSocket && NativeWebSocket.IsSupported)
|
||||
{
|
||||
// Certificate location is ignored here. You need to use netsh
|
||||
// to assign the certificate to the proper port.
|
||||
return new HttpListenerServer(_logger, OnRequestReceived);
|
||||
}
|
||||
|
||||
return new WebSocketSharpListener(_logger, OnRequestReceived, _certificatePath);
|
||||
}
|
||||
|
||||
|
||||
@@ -17,17 +17,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||
/// <param name="logManager">The log manager.</param>
|
||||
/// <param name="serverName">Name of the server.</param>
|
||||
/// <param name="defaultRedirectpath">The default redirectpath.</param>
|
||||
/// <param name="supportsNativeWebSocket">if set to <c>true</c> [supports native web socket].</param>
|
||||
/// <returns>IHttpServer.</returns>
|
||||
public static IHttpServer CreateServer(IApplicationHost applicationHost,
|
||||
ILogManager logManager,
|
||||
string serverName,
|
||||
string defaultRedirectpath,
|
||||
bool supportsNativeWebSocket)
|
||||
string defaultRedirectpath)
|
||||
{
|
||||
LogManager.LogFactory = new ServerLogFactory(logManager);
|
||||
|
||||
return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath, supportsNativeWebSocket);
|
||||
return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -591,6 +591,8 @@
|
||||
"MediaInfoStreamTypeEmbeddedImage": "Embedded Image",
|
||||
"MediaInfoRefFrames": "Ref frames",
|
||||
"TabPlayback": "Playback",
|
||||
"TabNotifications": "Notifications",
|
||||
"TabExpert": "Expert",
|
||||
"HeaderSelectCustomIntrosPath": "Select Custom Intros Path",
|
||||
"HeaderRateAndReview": "Rate and Review",
|
||||
"HeaderThankYou": "Thank You",
|
||||
@@ -625,6 +627,7 @@
|
||||
"DashboardTourMobile": "The Media Browser dashboard works great on smartphones and tablets. Manage your server from the palm of your hand anytime, anywhere.",
|
||||
"MessageRefreshQueued": "Refresh queued",
|
||||
"TabDevices": "Devices",
|
||||
"TabExtras": "Extras",
|
||||
"DeviceLastUsedByUserName": "Last used by {0}",
|
||||
"HeaderDeleteDevice": "Delete Device",
|
||||
"DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
"ButtonTermsOfService": "Terms of Service",
|
||||
"HeaderDeveloperOptions": "Developer Options",
|
||||
"OptionEnableWebClientResponseCache": "Enable web client response caching",
|
||||
"OptionDisableForDevelopmentHelp": "Disable these for web client development purposes",
|
||||
"OptionDisableForDevelopmentHelp": "Configure these as needed for web client development purposes.",
|
||||
"OptionEnableWebClientResourceMinification": "Enable web client resource minification",
|
||||
"LabelDashboardSourcePath": "Web client source path:",
|
||||
"LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.",
|
||||
@@ -53,6 +53,7 @@
|
||||
"HeaderAudio": "Audio",
|
||||
"HeaderVideo": "Video",
|
||||
"HeaderPaths": "Paths",
|
||||
"TitleNotifications": "Notifications",
|
||||
"ButtonDonateWithPayPal": "Donate with PayPal",
|
||||
"OptionDetectArchiveFilesAsMedia": "Detect archive files as media",
|
||||
"OptionDetectArchiveFilesAsMediaHelp": "If enabled, files with .rar and .zip extensions will be detected as media files.",
|
||||
@@ -71,6 +72,7 @@
|
||||
"FolderTypeTvShows": "TV",
|
||||
"FolderTypeInherit": "Inherit",
|
||||
"LabelContentType": "Content type:",
|
||||
"TitleScheduledTasks": "Scheduled Tasks",
|
||||
"HeaderSetupLibrary": "Setup your media library",
|
||||
"ButtonAddMediaFolder": "Add media folder",
|
||||
"LabelFolderType": "Folder type:",
|
||||
|
||||
Reference in New Issue
Block a user