Merge fix

This commit is contained in:
Stepan 2020-11-17 13:06:56 +01:00
parent 2bbfcc264d
commit d481c35cad

View File

@ -1,3 +1,4 @@
#nullable enable
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
namespace Emby.Naming.Video namespace Emby.Naming.Video
@ -21,7 +22,7 @@ namespace Emby.Naming.Video
/// <param name="isStub">Is Stub.</param> /// <param name="isStub">Is Stub.</param>
/// <param name="stubType">Stub type.</param> /// <param name="stubType">Stub type.</param>
/// <param name="isDirectory">Is directory.</param> /// <param name="isDirectory">Is directory.</param>
public VideoFileInfo(string name, string? path, string? container, int? year = default, ExtraType? extraType = default, ExtraRule? extraRule = default, string? format3D = default, bool is3D = default, bool isStub = default, string? stubType = default, bool isDirectory = default) public VideoFileInfo(string name, string path, string? container, int? year = default, ExtraType? extraType = default, ExtraRule? extraRule = default, string? format3D = default, bool is3D = default, bool isStub = default, string? stubType = default, bool isDirectory = default)
{ {
Path = path; Path = path;
Container = container; Container = container;
@ -40,7 +41,7 @@ namespace Emby.Naming.Video
/// Gets or sets the path. /// Gets or sets the path.
/// </summary> /// </summary>
/// <value>The path.</value> /// <value>The path.</value>
public string? Path { get; set; } public string Path { get; set; }
/// <summary> /// <summary>
/// Gets or sets the container. /// Gets or sets the container.