Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add collections/id/items, movies and shows

Browse Source
This commit is contained in:
Zoe Roux 2023-11-01 16:58:22 +01:00
parent 68a83c31be
commit 320c45096b
3 changed files with 106 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
back/src/Kyoo.Abstractions/Models/LibraryItem.cs
View File

@ -20,6 +20,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Kyoo.Abstractions.Models.Attributes;
using Kyoo.Utils;
namespace Kyoo.Abstractions.Models

24
back/src/Kyoo.Core/Controllers/Repositories/LibraryItemRepository.cs
View File

@ -19,6 +19,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using Kyoo.Abstractions.Controllers;
using Kyoo.Abstractions.Models;
@ -63,6 +64,29 @@ namespace Kyoo.Core.Controllers
.ToListAsync();
}
public async Task<ICollection<LibraryItem>> GetAllOfCollection(
Expression<Func<Collection, bool>> selector,
Expression<Func<LibraryItem, bool>>? where = null,
Sort<LibraryItem>? sort = default,
Pagination? limit = default,
Include<LibraryItem>? include = default)
{
return await ApplyFilters(
_database.LibraryItems
.Where(item =>
_database.Movies
.Where(x => x.Id == -item.Id)
.Any(x => x.Collections!.AsQueryable().Any(selector))
|| _database.Shows
.Where(x => x.Id == item.Id)
.Any(x => x.Collections!.AsQueryable().Any(selector))
),
where,
sort,
limit,
include);
}
/// <inheritdoc />
public override Task<LibraryItem> Create(LibraryItem obj)
=> throw new InvalidOperationException();

82
back/src/Kyoo.Core/Views/Resources/CollectionApi.cs
View File

@ -43,14 +43,17 @@ namespace Kyoo.Core.Api
{
private readonly ILibraryManager _libraryManager;
private readonly CollectionRepository _collections;
private readonly LibraryItemRepository _items;
public CollectionApi(ILibraryManager libraryManager,
CollectionRepository collections,
LibraryItemRepository items,
IThumbnailsManager thumbs)
: base(libraryManager.Collections, thumbs)
{
_libraryManager = libraryManager;
_collections = collections;
_items = items;
}
/// <summary>
@ -115,6 +118,45 @@ namespace Kyoo.Core.Api
return NoContent();
}
/// <summary>
/// Get items in collection
/// </summary>
/// <remarks>
/// Lists the items that are contained in the collection with the given id or slug.
/// </remarks>
/// <param name="identifier">The ID or slug of the <see cref="Collection"/>.</param>
/// <param name="sortBy">A key to sort items by.</param>
/// <param name="where">An optional list of filters.</param>
/// <param name="pagination">The number of items to return.</param>
/// <param name="fields">The aditional fields to include in the result.</param>
/// <returns>A page of items.</returns>
/// <response code="400">The filters or the sort parameters are invalid.</response>
/// <response code="404">No collection with the given ID could be found.</response>
[HttpGet("{identifier:id}/items")]
[HttpGet("{identifier:id}/item", Order = AlternativeRoute)]
[PartialPermission(Kind.Read)]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest, Type = typeof(RequestError))]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Page<LibraryItem>>> GetItems(Identifier identifier,
[FromQuery] Sort<LibraryItem> sortBy,
[FromQuery] Dictionary<string, string> where,
[FromQuery] Pagination pagination,
[FromQuery] Include<LibraryItem>? fields)
{
ICollection<LibraryItem> resources = await _items.GetAllOfCollection(
identifier.IsSame<Collection>(),
ApiHelper.ParseWhere<LibraryItem>(where),
sortBy == new Sort<LibraryItem>.Default() ? new Sort<LibraryItem>.By(x => x.AirDate) : sortBy,
pagination,
fields
);
if (!resources.Any() && await _libraryManager.Collections.GetOrDefault(identifier.IsSame<Collection>()) == null)
return NotFound();
return Page(resources, pagination.Limit);
}
/// <summary>
/// Get shows in collection
/// </summary>
@ -143,7 +185,45 @@ namespace Kyoo.Core.Api
{
ICollection<Show> resources = await _libraryManager.Shows.GetAll(
ApiHelper.ParseWhere(where, identifier.IsContainedIn<Show, Collection>(x => x.Collections!)),
sortBy ?? new Sort<Show>.By(x => x.StartAir),
sortBy == new Sort<Show>.Default() ? new Sort<Show>.By(x => x.AirDate) : sortBy,
pagination,
fields
);
if (!resources.Any() && await _libraryManager.Collections.GetOrDefault(identifier.IsSame<Collection>()) == null)
return NotFound();
return Page(resources, pagination.Limit);
}
/// <summary>
/// Get movies in collection
/// </summary>
/// <remarks>
/// Lists the movies that are contained in the collection with the given id or slug.
/// </remarks>
/// <param name="identifier">The ID or slug of the <see cref="Collection"/>.</param>
/// <param name="sortBy">A key to sort movies by.</param>
/// <param name="where">An optional list of filters.</param>
/// <param name="pagination">The number of movies to return.</param>
/// <param name="fields">The aditional fields to include in the result.</param>
/// <returns>A page of movies.</returns>
/// <response code="400">The filters or the sort parameters are invalid.</response>
/// <response code="404">No collection with the given ID could be found.</response>
[HttpGet("{identifier:id}/movies")]
[HttpGet("{identifier:id}/movie", Order = AlternativeRoute)]
[PartialPermission(Kind.Read)]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest, Type = typeof(RequestError))]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Page<Movie>>> GetMovies(Identifier identifier,
[FromQuery] Sort<Movie> sortBy,
[FromQuery] Dictionary<string, string> where,
[FromQuery] Pagination pagination,
[FromQuery] Include<Movie>? fields)
{
ICollection<Movie> resources = await _libraryManager.Movies.GetAll(
ApiHelper.ParseWhere(where, identifier.IsContainedIn<Movie, Collection>(x => x.Collections!)),
sortBy == new Sort<Movie>.Default() ? new Sort<Movie>.By(x => x.AirDate) : sortBy,
pagination,
fields
);