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

Merge pull request #6005 from Bond-009/nullable3

Browse Source 
Enable nullable reference types for Emby.Dlna
This commit is contained in:
Bond-009 2021-05-07 15:14:30 +02:00 committed by GitHub
commit 2f0ec9a70b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Dlna/Configuration/DlnaOptions.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
namespace Emby.Dlna.Configuration

1
Emby.Dlna/ConfigurationExtension.cs
View File

@ -1,4 +1,3 @@
#nullable enable
#pragma warning disable CS1591
using Emby.Dlna.Configuration;

2
Emby.Dlna/ContentDirectory/ContentDirectoryService.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/ContentDirectory/ControlHandler.cs
View File

@ -1,3 +1,5 @@
#nullable disable
using System;
using System.Collections.Generic;
using System.Globalization;

2
Emby.Dlna/ControlRequest.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System.IO;

2
Emby.Dlna/ControlResponse.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System.Collections.Generic;

2
Emby.Dlna/Didl/DidlBuilder.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/Didl/StringWriterWithEncoding.cs
View File

@ -9,7 +9,7 @@ namespace Emby.Dlna.Didl
{
public class StringWriterWithEncoding : StringWriter
{
private readonly Encoding _encoding;
private readonly Encoding? _encoding;
public StringWriterWithEncoding()
{

1
Emby.Dlna/DlnaConfigurationFactory.cs
View File

@ -1,4 +1,3 @@
#nullable enable
#pragma warning disable CS1591
using System.Collections.Generic;

2
Emby.Dlna/DlnaManager.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

1
Emby.Dlna/Emby.Dlna.csproj
View File

@ -21,6 +21,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
</PropertyGroup>
<!-- Code Analyzers-->

2
Emby.Dlna/EventSubscriptionResponse.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System.Collections.Generic;

2
Emby.Dlna/Eventing/DlnaEventManager.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/Eventing/EventSubscription.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/Main/DlnaEntryPoint.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/Device.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/DeviceInfo.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System.Collections.Generic;

2
Emby.Dlna/PlayTo/MediaChangedEventArgs.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlayToController.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlayToManager.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

2
Emby.Dlna/PlayTo/PlaylistItem.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using MediaBrowser.Model.Dlna;

2
Emby.Dlna/PlayTo/PlaylistItemFactory.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System.IO;

2
Emby.Dlna/PlayTo/SsdpHttpClient.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

14
Emby.Dlna/PlayTo/TransportCommands.cs
View File

@ -46,7 +46,7 @@ namespace Emby.Dlna.PlayTo
{
var serviceAction = new ServiceAction
{
Name = container.GetValue(UPnpNamespaces.Svc + "name"),
Name = container.GetValue(UPnpNamespaces.Svc + "name") ?? string.Empty,
};
var argumentList = serviceAction.ArgumentList;
@ -68,9 +68,9 @@ namespace Emby.Dlna.PlayTo
return new Argument
{
Name = container.GetValue(UPnpNamespaces.Svc + "name"),
Direction = container.GetValue(UPnpNamespaces.Svc + "direction"),
RelatedStateVariable = container.GetValue(UPnpNamespaces.Svc + "relatedStateVariable")
Name = container.GetValue(UPnpNamespaces.Svc + "name") ?? string.Empty,
Direction = container.GetValue(UPnpNamespaces.Svc + "direction") ?? string.Empty,
RelatedStateVariable = container.GetValue(UPnpNamespaces.Svc + "relatedStateVariable") ?? string.Empty
};
}
@ -89,8 +89,8 @@ namespace Emby.Dlna.PlayTo
return new StateVariable
{
Name = container.GetValue(UPnpNamespaces.Svc + "name"),
DataType = container.GetValue(UPnpNamespaces.Svc + "dataType"),
Name = container.GetValue(UPnpNamespaces.Svc + "name") ?? string.Empty,
DataType = container.GetValue(UPnpNamespaces.Svc + "dataType") ?? string.Empty,
AllowedValues = allowedValues
};
}
@ -166,7 +166,7 @@ namespace Emby.Dlna.PlayTo
return string.Format(CultureInfo.InvariantCulture, CommandBase, action.Name, xmlNamesapce, stateString);
}
private string BuildArgumentXml(Argument argument, string value, string commandParameter = "")
private string BuildArgumentXml(Argument argument, string? value, string commandParameter = "")
{
var state = StateVariables.FirstOrDefault(a => string.Equals(a.Name, argument.RelatedStateVariable, StringComparison.OrdinalIgnoreCase));

2
Emby.Dlna/PlayTo/uBaseObject.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

3
Emby.Dlna/Server/DescriptionXmlBuilder.cs
View File

@ -250,7 +250,8 @@ namespace Emby.Dlna.Server
url = _serverAddress.TrimEnd('/') + "/dlna/" + _serverUdn + "/" + url.TrimStart('/');
return SecurityElement.Escape(url);
// TODO: @bond remove null-coalescing operator when https://github.com/dotnet/runtime/pull/52442 is merged/released
return SecurityElement.Escape(url) ?? string.Empty;
}
private IEnumerable<DeviceIcon> GetIcons()

4
Emby.Dlna/Service/BaseControlHandler.cs
View File

@ -47,7 +47,7 @@ namespace Emby.Dlna.Service
private async Task<ControlResponse> ProcessControlRequestInternalAsync(ControlRequest request)
{
ControlRequestInfo requestInfo = null;
ControlRequestInfo? requestInfo = null;
using (var streamReader = new StreamReader(request.InputXml, Encoding.UTF8))
{
@ -151,7 +151,7 @@ namespace Emby.Dlna.Service
private async Task<ControlRequestInfo> ParseBodyTagAsync(XmlReader reader)
{
string namespaceURI = null, localName = null;
string? namespaceURI = null, localName = null;
await reader.MoveToContentAsync().ConfigureAwait(false);
await reader.ReadAsync().ConfigureAwait(false);

2
Emby.Dlna/Ssdp/DeviceDiscovery.cs
View File

@ -1,3 +1,5 @@
#nullable disable
#pragma warning disable CS1591
using System;

6
Emby.Dlna/Ssdp/SsdpExtensions.cs
View File

@ -7,21 +7,21 @@ namespace Emby.Dlna.Ssdp
{
public static class SsdpExtensions
{
public static string GetValue(this XElement container, XName name)
public static string? GetValue(this XElement container, XName name)
{
var node = container.Element(name);
return node?.Value;
}
public static string GetAttributeValue(this XElement container, XName name)
public static string? GetAttributeValue(this XElement container, XName name)
{
var node = container.Attribute(name);
return node?.Value;
}
public static string GetDescendantValue(this XElement container, XName name)
public static string? GetDescendantValue(this XElement container, XName name)
=> container.Descendants(name).FirstOrDefault()?.Value;
}
}