mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-01 11:23:36 +02:00
Fix more warnings
This commit is contained in:
parent
779f0c637f
commit
2a58c643d2
|
@ -108,9 +108,9 @@ using Microsoft.AspNetCore.Hosting;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Http.Extensions;
|
using Microsoft.AspNetCore.Http.Extensions;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.DependencyInjection.Extensions;
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using ServiceStack;
|
using ServiceStack;
|
||||||
using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;
|
using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;
|
||||||
|
|
||||||
|
@ -386,7 +386,7 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
|
fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
|
||||||
|
|
||||||
NetworkManager.NetworkChanged += NetworkManager_NetworkChanged;
|
NetworkManager.NetworkChanged += OnNetworkChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string ExpandVirtualPath(string path)
|
public string ExpandVirtualPath(string path)
|
||||||
|
@ -410,7 +410,7 @@ namespace Emby.Server.Implementations
|
||||||
return ServerConfigurationManager.Configuration.LocalNetworkSubnets;
|
return ServerConfigurationManager.Configuration.LocalNetworkSubnets;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void NetworkManager_NetworkChanged(object sender, EventArgs e)
|
private void OnNetworkChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_validAddressResults.Clear();
|
_validAddressResults.Clear();
|
||||||
}
|
}
|
||||||
|
@ -421,7 +421,7 @@ namespace Emby.Server.Implementations
|
||||||
/// Gets the current application user agent
|
/// Gets the current application user agent
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The application user agent.</value>
|
/// <value>The application user agent.</value>
|
||||||
public string ApplicationUserAgent => Name.Replace(' ','-') + '/' + ApplicationVersion;
|
public string ApplicationUserAgent => Name.Replace(' ', '-') + "/" + ApplicationVersion;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the email address for use within a comment section of a user agent field.
|
/// Gets the email address for use within a comment section of a user agent field.
|
||||||
|
@ -429,14 +429,11 @@ namespace Emby.Server.Implementations
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ApplicationUserAgentAddress { get; } = "team@jellyfin.org";
|
public string ApplicationUserAgentAddress { get; } = "team@jellyfin.org";
|
||||||
|
|
||||||
private string _productName;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the current application name
|
/// Gets the current application name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The application name.</value>
|
/// <value>The application name.</value>
|
||||||
public string ApplicationProductName
|
public string ApplicationProductName { get; } = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).ProductName;
|
||||||
=> _productName ?? (_productName = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).ProductName);
|
|
||||||
|
|
||||||
private DeviceId _deviceId;
|
private DeviceId _deviceId;
|
||||||
|
|
||||||
|
@ -604,10 +601,15 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
foreach (var plugin in Plugins)
|
foreach (var plugin in Plugins)
|
||||||
{
|
{
|
||||||
pluginBuilder.AppendLine(string.Format("{0} {1}", plugin.Name, plugin.Version));
|
pluginBuilder.AppendLine(
|
||||||
|
string.Format(
|
||||||
|
CultureInfo.InvariantCulture,
|
||||||
|
"{0} {1}",
|
||||||
|
plugin.Name,
|
||||||
|
plugin.Version));
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.LogInformation("Plugins: {plugins}", pluginBuilder.ToString());
|
Logger.LogInformation("Plugins: {Plugins}", pluginBuilder.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
DiscoverTypes();
|
DiscoverTypes();
|
||||||
|
@ -629,7 +631,7 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
if (EnableHttps && Certificate != null)
|
if (EnableHttps && Certificate != null)
|
||||||
{
|
{
|
||||||
options.ListenAnyIP(HttpsPort, listenOptions => { listenOptions.UseHttps(Certificate); });
|
options.ListenAnyIP(HttpsPort, listenOptions => listenOptions.UseHttps(Certificate));
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.UseContentRoot(contentRoot)
|
.UseContentRoot(contentRoot)
|
||||||
|
@ -643,6 +645,7 @@ namespace Emby.Server.Implementations
|
||||||
app.UseWebSockets();
|
app.UseWebSockets();
|
||||||
|
|
||||||
app.UseResponseCompression();
|
app.UseResponseCompression();
|
||||||
|
|
||||||
// TODO app.UseMiddleware<WebSocketMiddleware>();
|
// TODO app.UseMiddleware<WebSocketMiddleware>();
|
||||||
app.Use(ExecuteWebsocketHandlerAsync);
|
app.Use(ExecuteWebsocketHandlerAsync);
|
||||||
app.Use(ExecuteHttpHandlerAsync);
|
app.Use(ExecuteHttpHandlerAsync);
|
||||||
|
@ -1044,8 +1047,8 @@ namespace Emby.Server.Implementations
|
||||||
.Cast<IServerEntryPoint>()
|
.Cast<IServerEntryPoint>()
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
await Task.WhenAll(StartEntryPoints(entries, true));
|
await Task.WhenAll(StartEntryPoints(entries, true)).ConfigureAwait(false);
|
||||||
await Task.WhenAll(StartEntryPoints(entries, false));
|
await Task.WhenAll(StartEntryPoints(entries, false)).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -1458,15 +1461,10 @@ namespace Emby.Server.Implementations
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public WakeOnLanInfo[] GetWakeOnLanInfo()
|
public IEnumerable<WakeOnLanInfo> GetWakeOnLanInfo()
|
||||||
{
|
=> NetworkManager.GetMacAddresses()
|
||||||
return NetworkManager.GetMacAddresses()
|
.Select(i => new WakeOnLanInfo(i))
|
||||||
.Select(i => new WakeOnLanInfo
|
.ToList();
|
||||||
{
|
|
||||||
MacAddress = i
|
|
||||||
})
|
|
||||||
.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken)
|
public async Task<PublicSystemInfo> GetPublicSystemInfo(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
|
@ -1482,6 +1480,7 @@ namespace Emby.Server.Implementations
|
||||||
{
|
{
|
||||||
wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
|
wanAddress = GetWanApiUrl(ServerConfigurationManager.Configuration.WanDdns);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new PublicSystemInfo
|
return new PublicSystemInfo
|
||||||
{
|
{
|
||||||
Version = ApplicationVersion,
|
Version = ApplicationVersion,
|
||||||
|
|
|
@ -2,7 +2,6 @@ using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Devices
|
namespace Emby.Server.Implementations.Devices
|
||||||
|
|
|
@ -58,6 +58,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
|
||||||
UserAgent = _appHost.ApplicationUserAgent
|
UserAgent = _appHost.ApplicationUserAgent
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return Task.FromResult((Stream)File.OpenRead(url));
|
return Task.FromResult((Stream)File.OpenRead(url));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -425,47 +425,27 @@ namespace Emby.Server.Implementations.Networking
|
||||||
var localEndPoint = new IPEndPoint(IPAddress.Any, 0);
|
var localEndPoint = new IPEndPoint(IPAddress.Any, 0);
|
||||||
using (var udpClient = new UdpClient(localEndPoint))
|
using (var udpClient = new UdpClient(localEndPoint))
|
||||||
{
|
{
|
||||||
var port = ((IPEndPoint)(udpClient.Client.LocalEndPoint)).Port;
|
var port = ((IPEndPoint)udpClient.Client.LocalEndPoint).Port;
|
||||||
return port;
|
return port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<string> _macAddresses;
|
private List<PhysicalAddress> _macAddresses;
|
||||||
public List<string> GetMacAddresses()
|
public List<PhysicalAddress> GetMacAddresses()
|
||||||
{
|
{
|
||||||
if (_macAddresses == null)
|
if (_macAddresses == null)
|
||||||
{
|
{
|
||||||
_macAddresses = GetMacAddressesInternal();
|
_macAddresses = GetMacAddressesInternal().ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
return _macAddresses;
|
return _macAddresses;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<string> GetMacAddressesInternal()
|
private static IEnumerable<PhysicalAddress> GetMacAddressesInternal()
|
||||||
{
|
=> NetworkInterface.GetAllNetworkInterfaces()
|
||||||
return NetworkInterface.GetAllNetworkInterfaces()
|
|
||||||
.Where(i => i.NetworkInterfaceType != NetworkInterfaceType.Loopback)
|
.Where(i => i.NetworkInterfaceType != NetworkInterfaceType.Loopback)
|
||||||
.Select(i =>
|
.Select(x => x.GetPhysicalAddress())
|
||||||
{
|
.Where(x => x != null && x != PhysicalAddress.None);
|
||||||
try
|
|
||||||
{
|
|
||||||
var physicalAddress = i.GetPhysicalAddress();
|
|
||||||
|
|
||||||
if (physicalAddress == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return physicalAddress.ToString();
|
|
||||||
}
|
|
||||||
catch (Exception)
|
|
||||||
{
|
|
||||||
//TODO Log exception.
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.Where(i => i != null)
|
|
||||||
.ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Parses the specified endpointstring.
|
/// Parses the specified endpointstring.
|
||||||
|
|
|
@ -18,7 +18,6 @@ using Jellyfin.Drawing.Skia;
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Controller.Drawing;
|
using MediaBrowser.Controller.Drawing;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
@ -41,12 +40,12 @@ namespace Jellyfin.Server
|
||||||
// For backwards compatibility.
|
// For backwards compatibility.
|
||||||
// Modify any input arguments now which start with single-hyphen to POSIX standard
|
// Modify any input arguments now which start with single-hyphen to POSIX standard
|
||||||
// double-hyphen to allow parsing by CommandLineParser package.
|
// double-hyphen to allow parsing by CommandLineParser package.
|
||||||
const string pattern = @"^(-[^-\s]{2})"; // Match -xx, not -x, not --xx, not xx
|
const string Pattern = @"^(-[^-\s]{2})"; // Match -xx, not -x, not --xx, not xx
|
||||||
const string substitution = @"-$1"; // Prepend with additional single-hyphen
|
const string Substitution = @"-$1"; // Prepend with additional single-hyphen
|
||||||
var regex = new Regex(pattern);
|
var regex = new Regex(Pattern);
|
||||||
for (var i = 0; i < args.Length; i++)
|
for (var i = 0; i < args.Length; i++)
|
||||||
{
|
{
|
||||||
args[i] = regex.Replace(args[i], substitution);
|
args[i] = regex.Replace(args[i], Substitution);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the command line arguments and either start the app or exit indicating error
|
// Parse the command line arguments and either start the app or exit indicating error
|
||||||
|
@ -134,7 +133,7 @@ namespace Jellyfin.Server
|
||||||
Batteries_V2.Init();
|
Batteries_V2.Init();
|
||||||
if (raw.sqlite3_enable_shared_cache(1) != raw.SQLITE_OK)
|
if (raw.sqlite3_enable_shared_cache(1) != raw.SQLITE_OK)
|
||||||
{
|
{
|
||||||
Console.WriteLine("WARN: Failed to enable shared cache for SQLite");
|
_logger.LogWarning("Failed to enable shared cache for SQLite");
|
||||||
}
|
}
|
||||||
|
|
||||||
using (var appHost = new CoreAppHost(
|
using (var appHost = new CoreAppHost(
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Threading.Tasks;
|
using System.Net.NetworkInformation;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.Net;
|
using MediaBrowser.Model.Net;
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ namespace MediaBrowser.Common.Net
|
||||||
/// Returns MAC Address from first Network Card in Computer
|
/// Returns MAC Address from first Network Card in Computer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>[string] MAC Address</returns>
|
/// <returns>[string] MAC Address</returns>
|
||||||
List<string> GetMacAddresses();
|
List<PhysicalAddress> GetMacAddresses();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Determines whether [is in private address space] [the specified endpoint].
|
/// Determines whether [is in private address space] [the specified endpoint].
|
||||||
|
|
|
@ -83,7 +83,7 @@ namespace MediaBrowser.Controller
|
||||||
|
|
||||||
void EnableLoopback(string appName);
|
void EnableLoopback(string appName);
|
||||||
|
|
||||||
WakeOnLanInfo[] GetWakeOnLanInfo();
|
IEnumerable<WakeOnLanInfo> GetWakeOnLanInfo();
|
||||||
|
|
||||||
string ExpandVirtualPath(string path);
|
string ExpandVirtualPath(string path);
|
||||||
string ReverseVirtualPath(string path);
|
string ReverseVirtualPath(string path);
|
||||||
|
|
|
@ -1,10 +1,47 @@
|
||||||
|
using System.Net.NetworkInformation;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.System
|
namespace MediaBrowser.Model.System
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Provides the MAC address and port for wake-on-LAN functionality.
|
||||||
|
/// </summary>
|
||||||
public class WakeOnLanInfo
|
public class WakeOnLanInfo
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the MAC address of the device.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The MAC address.</value>
|
||||||
public string MacAddress { get; set; }
|
public string MacAddress { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the wake-on-LAN port.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The wake-on-LAN port.</value>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="WakeOnLanInfo" /> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">The MAC address.</param>
|
||||||
|
public WakeOnLanInfo(PhysicalAddress macAddress)
|
||||||
|
{
|
||||||
|
MacAddress = macAddress.ToString();
|
||||||
|
Port = 9;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="WakeOnLanInfo" /> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">The MAC address.</param>
|
||||||
|
public WakeOnLanInfo(string macAddress)
|
||||||
|
{
|
||||||
|
MacAddress = macAddress;
|
||||||
|
Port = 9;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="WakeOnLanInfo" /> class.
|
||||||
|
/// </summary>
|
||||||
public WakeOnLanInfo()
|
public WakeOnLanInfo()
|
||||||
{
|
{
|
||||||
Port = 9;
|
Port = 9;
|
||||||
|
|
Loading…
Reference in a new issue