lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming variable and refactoring IF statement

Browse Source
This commit is contained in:
Neil Burrows 2020-05-20 09:05:51 +01:00
parent b737301c70
commit d7b2c2a176
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/IStartupOptions.cs
View File

@ -1,3 +1,5 @@
using System;
namespace Emby.Server.Implementations
{
public interface IStartupOptions
@ -40,6 +42,6 @@ namespace Emby.Server.Implementations
/// <summary>
/// Gets the value of the --auto-discover-publish-url command line option.
/// </summary>
string AutoDiscoverPublishUrl { get; }
Uri PublishedServerUrl { get; }
}
}

16
Emby.Server.Implementations/Udp/UdpServer.cs
View File

@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Udp
/// <summary>
/// Address Override Configuration Key
/// </summary>
public const string AddressOverrideConfigKey = "AutoDiscoverAddressOverride";
public const string AddressOverrideConfigKey = "PublishedServerUrl";
private Socket _udpSocket;
private IPEndPoint _endpoint;
@ -47,17 +47,9 @@ namespace Emby.Server.Implementations.Udp
private async Task RespondToV2Message(string messageText, EndPoint endpoint, CancellationToken cancellationToken)
{
string localUrl;
if (!string.IsNullOrEmpty(_config[AddressOverrideConfigKey]))
{
localUrl = _config[AddressOverrideConfigKey];
}
else
{
localUrl = await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
}
string localUrl = !string.IsNullOrEmpty(_config[AddressOverrideConfigKey])
? _config[AddressOverrideConfigKey]
: await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
if (!string.IsNullOrEmpty(localUrl))
{

9
Jellyfin.Server/StartupOptions.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using CommandLine;
using Emby.Server.Implementations;
@ -83,8 +84,8 @@ namespace Jellyfin.Server
public string? PluginManifestUrl { get; set; }
/// <inheritdoc />
[Option("auto-discover-publish-url", Required = false, HelpText = "Jellyfin Server URL to publish via auto discover process")]
public string? AutoDiscoverPublishUrl { get; set; }
[Option("published-server-url", Required = false, HelpText = "Jellyfin Server URL to publish via auto discover process")]
public Uri? PublishedServerUrl { get; set; }
/// <summary>
/// Gets the command line options as a dictionary that can be used in the .NET configuration system.
@ -104,9 +105,9 @@ namespace Jellyfin.Server
config.Add(ConfigurationExtensions.HostWebClientKey, bool.FalseString);
}
if (AutoDiscoverPublishUrl != null)
if (PublishedServerUrl != null)
{
config.Add(UdpServer.AddressOverrideConfigKey, AutoDiscoverPublishUrl);
config.Add(UdpServer.AddressOverrideConfigKey, PublishedServerUrl.ToString());
}
return config;