alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-07 08:18:54 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Convert CollectionType, SpecialFolderType to enum (#9764)

Browse Source 
* Convert CollectionType, SpecialFolderType to enum

* Hide internal enum CollectionType values

* Apply suggestions from code review

Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>

* Fix recent change

* Update Jellyfin.Data/Attributes/OpenApiIgnoreEnumAttribute.cs

Co-authored-by: Patrick Barron <barronpm@gmail.com>

---------

Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
Co-authored-by: Patrick Barron <barronpm@gmail.com>
This commit is contained in:
Cody Robibero
2023-11-09 14:00:29 -07:00
committed by GitHub
parent c7a94d48ae
commit 906f701fa8
43 changed files with 486 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@@ -420,7 +420,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the type of the collection.
/// </summary>
/// <value>The type of the collection.</value>
public string CollectionType { get; set; }
public CollectionType? CollectionType { get; set; }
/// <summary>
/// Gets or sets the display order.

3
MediaBrowser.Model/Dto/MetadataEditorInfo.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.Providers;
@@ -27,7 +28,7 @@ namespace MediaBrowser.Model.Dto
public IReadOnlyList<ExternalIdInfo> ExternalIdInfos { get; set; }
public string? ContentType { get; set; }
public CollectionType? ContentType { get; set; }
public IReadOnlyList<NameValuePair> ContentTypeOptions { get; set; }
}

27
MediaBrowser.Model/Entities/CollectionType.cs
View File

@@ -1,27 +0,0 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Entities
{
public static class CollectionType
{
public const string Movies = "movies";
public const string TvShows = "tvshows";
public const string Music = "music";
public const string MusicVideos = "musicvideos";
public const string Trailers = "trailers";
public const string HomeVideos = "homevideos";
public const string BoxSets = "boxsets";
public const string Books = "books";
public const string Photos = "photos";
public const string LiveTv = "livetv";
public const string Playlists = "playlists";
public const string Folders = "folders";
}
}

5
MediaBrowser.Model/Library/UserViewQuery.cs
View File

@@ -1,6 +1,7 @@
#pragma warning disable CS1591
using System;
using Jellyfin.Data.Enums;
namespace MediaBrowser.Model.Library
{
@@ -9,7 +10,7 @@ namespace MediaBrowser.Model.Library
public UserViewQuery()
{
IncludeExternalContent = true;
PresetViews = Array.Empty<string>();
PresetViews = Array.Empty<CollectionType?>();
}
/// <summary>
@@ -30,6 +31,6 @@ namespace MediaBrowser.Model.Library
/// <value><c>true</c> if [include hidden]; otherwise, <c>false</c>.</value>
public bool IncludeHidden { get; set; }
public string[] PresetViews { get; set; }
public CollectionType?[] PresetViews { get; set; }
}
}