Move library entities to folder.

This commit is contained in:
Patrick Barron 2020-08-29 13:30:09 -04:00
parent 8510333bcc
commit 414bedbde4
41 changed files with 42 additions and 44 deletions

View File

@ -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;

View File

@ -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
{

View File

@ -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));

View File

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

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

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

View File

@ -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
{

View File

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

View File

@ -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
{

View File

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

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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.

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

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