pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6808 from cvium/dlnope_never_again

This commit is contained in:
Cody Robibero 2021-11-09 20:34:09 -07:00 committed by GitHub
parent 57d5423d64 efa76c0b63
commit 4c88bf3fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 365 additions and 801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

19
Emby.Dlna/ContentDirectory/ServerItem.cs
View File

@ -1,5 +1,3 @@
#pragma warning disable CS1591
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
namespace Emby.Dlna.ContentDirectory namespace Emby.Dlna.ContentDirectory
@ -13,24 +11,29 @@ namespace Emby.Dlna.ContentDirectory
/// Initializes a new instance of the <see cref="ServerItem"/> class. /// Initializes a new instance of the <see cref="ServerItem"/> class.
/// </summary> /// </summary>
/// <param name="item">The <see cref="BaseItem"/>.</param> /// <param name="item">The <see cref="BaseItem"/>.</param>
public ServerItem(BaseItem item) /// <param name="stubType">The stub type.</param>
public ServerItem(BaseItem item, StubType? stubType)
{ {
Item = item; Item = item;
if (item is IItemByName && item is not Folder) if (stubType.HasValue)
{
StubType = stubType;
}
else if (item is IItemByName and not Folder)
{ {
StubType = Dlna.ContentDirectory.StubType.Folder; StubType = Dlna.ContentDirectory.StubType.Folder;
} }
} }
/// <summary> /// <summary>
/// Gets or sets the underlying base item. /// Gets the underlying base item.
/// </summary> /// </summary>
public BaseItem Item { get; set; } public BaseItem Item { get; }
/// <summary> /// <summary>
/// Gets or sets the DLNA item type. /// Gets the DLNA item type.
/// </summary> /// </summary>
public StubType? StubType { get; set; } public StubType? StubType { get; }
} }
} }

13
MediaBrowser.Model/Dlna/SortCriteria.cs
View File

@ -1,15 +1,24 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
namespace MediaBrowser.Model.Dlna namespace MediaBrowser.Model.Dlna
{ {
public class SortCriteria public class SortCriteria
{ {
public SortCriteria(string value) public SortCriteria(string sortOrder)
{ {
if (!string.IsNullOrEmpty(sortOrder) && Enum.TryParse<SortOrder>(sortOrder, true, out var sortOrderValue))
{
SortOrder = sortOrderValue;
}
else
{
SortOrder = SortOrder.Ascending;
}
} }
public SortOrder SortOrder => SortOrder.Ascending; public SortOrder SortOrder { get; }
} }
} }