Move library entities to folder.

Jellyfin.Api/Controllers/ItemsController.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
-using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;

Jellyfin.Api/Controllers/LibraryController.cs

@@ -19,6 +19,7 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
@@ -35,8 +36,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Book = MediaBrowser.Controller.Entities.Book;
-using Movie = Jellyfin.Data.Entities.Movie;
-using MusicAlbum = Jellyfin.Data.Entities.MusicAlbum;
 
 namespace Jellyfin.Api.Controllers
 {

Jellyfin.Api/Controllers/MoviesController.cs

@@ -10,6 +10,7 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
@@ -181,7 +182,7 @@ namespace Jellyfin.Api.Controllers
             DtoOptions dtoOptions,
             RecommendationType type)
         {
-            var itemTypes = new List<string> { nameof(MediaBrowser.Controller.Entities.Movies.Movie) };
+            var itemTypes = new List<string> { nameof(Movie) };
             if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
             {
                 itemTypes.Add(nameof(Trailer));

Jellyfin.Data/Entities/Artwork.cs → Jellyfin.Data/Entities/Libraries/Artwork.cs

@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Artwork
     {

Jellyfin.Data/Entities/Book.cs → Jellyfin.Data/Entities/Libraries/Book.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Book : LibraryItem
     {

Jellyfin.Data/Entities/BookMetadata.cs → Jellyfin.Data/Entities/Libraries/BookMetadata.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class BookMetadata : Metadata
     {

Jellyfin.Data/Entities/Chapter.cs → Jellyfin.Data/Entities/Libraries/Chapter.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Chapter
     {

Jellyfin.Data/Entities/Collection.cs → Jellyfin.Data/Entities/Libraries/Collection.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Collection
     {

Jellyfin.Data/Entities/CollectionItem.cs → Jellyfin.Data/Entities/Libraries/CollectionItem.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CollectionItem
     {

Jellyfin.Data/Entities/Company.cs → Jellyfin.Data/Entities/Libraries/Company.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Company
     {

Jellyfin.Data/Entities/CompanyMetadata.cs → Jellyfin.Data/Entities/Libraries/CompanyMetadata.cs

@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CompanyMetadata : Metadata
     {

Jellyfin.Data/Entities/CustomItem.cs → Jellyfin.Data/Entities/Libraries/CustomItem.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CustomItem : LibraryItem
     {

Jellyfin.Data/Entities/CustomItemMetadata.cs → Jellyfin.Data/Entities/Libraries/CustomItemMetadata.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class CustomItemMetadata : Metadata
     {

Jellyfin.Data/Entities/Episode.cs → Jellyfin.Data/Entities/Libraries/Episode.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Episode : LibraryItem
     {

Jellyfin.Data/Entities/EpisodeMetadata.cs → Jellyfin.Data/Entities/Libraries/EpisodeMetadata.cs

@@ -3,7 +3,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class EpisodeMetadata : Metadata
     {

Jellyfin.Data/Entities/Genre.cs → Jellyfin.Data/Entities/Libraries/Genre.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Genre
     {

Jellyfin.Data/Entities/Library.cs → Jellyfin.Data/Entities/Libraries/Library.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Library
     {

Jellyfin.Data/Entities/LibraryItem.cs → Jellyfin.Data/Entities/Libraries/LibraryItem.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public abstract partial class LibraryItem
     {

Jellyfin.Data/Entities/LibraryRoot.cs → Jellyfin.Data/Entities/Libraries/LibraryRoot.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class LibraryRoot
     {

Jellyfin.Data/Entities/MediaFile.cs → Jellyfin.Data/Entities/Libraries/MediaFile.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MediaFile
     {

Jellyfin.Data/Entities/MediaFileStream.cs → Jellyfin.Data/Entities/Libraries/MediaFileStream.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MediaFileStream
     {

Jellyfin.Data/Entities/Metadata.cs → Jellyfin.Data/Entities/Libraries/Metadata.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public abstract partial class Metadata
     {

Jellyfin.Data/Entities/MetadataProvider.cs → Jellyfin.Data/Entities/Libraries/MetadataProvider.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MetadataProvider
     {

Jellyfin.Data/Entities/MetadataProviderId.cs → Jellyfin.Data/Entities/Libraries/MetadataProviderId.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MetadataProviderId
     {

Jellyfin.Data/Entities/Movie.cs → Jellyfin.Data/Entities/Libraries/Movie.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Movie : LibraryItem
     {

Jellyfin.Data/Entities/MovieMetadata.cs → Jellyfin.Data/Entities/Libraries/MovieMetadata.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MovieMetadata : Metadata
     {

Jellyfin.Data/Entities/MusicAlbum.cs → Jellyfin.Data/Entities/Libraries/MusicAlbum.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MusicAlbum : LibraryItem
     {

Jellyfin.Data/Entities/MusicAlbumMetadata.cs → Jellyfin.Data/Entities/Libraries/MusicAlbumMetadata.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class MusicAlbumMetadata : Metadata
     {

Jellyfin.Data/Entities/Person.cs → Jellyfin.Data/Entities/Libraries/Person.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Person
     {

Jellyfin.Data/Entities/PersonRole.cs → Jellyfin.Data/Entities/Libraries/PersonRole.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class PersonRole
     {

Jellyfin.Data/Entities/Photo.cs → Jellyfin.Data/Entities/Libraries/Photo.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Photo : LibraryItem
     {

Jellyfin.Data/Entities/PhotoMetadata.cs → Jellyfin.Data/Entities/Libraries/PhotoMetadata.cs

@@ -1,9 +1,8 @@
 #pragma warning disable CS1591
 
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class PhotoMetadata : Metadata
     {

Jellyfin.Data/Entities/Rating.cs → Jellyfin.Data/Entities/Libraries/Rating.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Rating
     {

Jellyfin.Data/Entities/RatingSource.cs → Jellyfin.Data/Entities/Libraries/RatingSource.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     /// <summary>
     /// This is the entity to store review ratings, not age ratings.

Jellyfin.Data/Entities/Release.cs → Jellyfin.Data/Entities/Libraries/Release.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Release
     {

Jellyfin.Data/Entities/Season.cs → Jellyfin.Data/Entities/Libraries/Season.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Season : LibraryItem
     {

Jellyfin.Data/Entities/SeasonMetadata.cs → Jellyfin.Data/Entities/Libraries/SeasonMetadata.cs

@@ -2,9 +2,8 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class SeasonMetadata : Metadata
     {

Jellyfin.Data/Entities/Series.cs → Jellyfin.Data/Entities/Libraries/Series.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Series : LibraryItem
     {

Jellyfin.Data/Entities/SeriesMetadata.cs → Jellyfin.Data/Entities/Libraries/SeriesMetadata.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class SeriesMetadata : Metadata
     {

Jellyfin.Data/Entities/Track.cs → Jellyfin.Data/Entities/Libraries/Track.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class Track : LibraryItem
     {

Jellyfin.Data/Entities/TrackMetadata.cs → Jellyfin.Data/Entities/Libraries/TrackMetadata.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Jellyfin.Data.Entities
+namespace Jellyfin.Data.Entities.Libraries
 {
     public partial class TrackMetadata : Metadata
     {