mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 07:20:32 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
263 lines
8.7 KiB
C#
263 lines
8.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs;
|
|
using API.DTOs.Metadata;
|
|
using API.DTOs.Reader;
|
|
using API.Entities;
|
|
using API.Extensions;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
[Flags]
|
|
public enum ChapterIncludes
|
|
{
|
|
None = 1,
|
|
Volumes = 2,
|
|
Files = 4,
|
|
}
|
|
|
|
public interface IChapterRepository
|
|
{
|
|
void Update(Chapter chapter);
|
|
Task<IEnumerable<Chapter>> GetChaptersByIdsAsync(IList<int> chapterIds, ChapterIncludes includes = ChapterIncludes.None);
|
|
Task<IChapterInfoDto?> GetChapterInfoDtoAsync(int chapterId);
|
|
Task<int> GetChapterTotalPagesAsync(int chapterId);
|
|
Task<Chapter?> GetChapterAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files);
|
|
Task<ChapterDto?> GetChapterDtoAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files);
|
|
Task<ChapterMetadataDto?> GetChapterMetadataDtoAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files);
|
|
Task<IList<MangaFile>> GetFilesForChapterAsync(int chapterId);
|
|
Task<IList<Chapter>> GetChaptersAsync(int volumeId);
|
|
Task<IList<MangaFile>> GetFilesForChaptersAsync(IReadOnlyList<int> chapterIds);
|
|
Task<string?> GetChapterCoverImageAsync(int chapterId);
|
|
Task<IList<string>> GetAllCoverImagesAsync();
|
|
Task<IList<Chapter>> GetAllChaptersWithNonWebPCovers();
|
|
Task<IEnumerable<string>> GetCoverImagesForLockedChaptersAsync();
|
|
Task<ChapterDto> AddChapterModifiers(int userId, ChapterDto chapter);
|
|
}
|
|
public class ChapterRepository : IChapterRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public ChapterRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(Chapter chapter)
|
|
{
|
|
_context.Entry(chapter).State = EntityState.Modified;
|
|
}
|
|
|
|
public async Task<IEnumerable<Chapter>> GetChaptersByIdsAsync(IList<int> chapterIds, ChapterIncludes includes = ChapterIncludes.None)
|
|
{
|
|
return await _context.Chapter
|
|
.Where(c => chapterIds.Contains(c.Id))
|
|
.Includes(includes)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Populates a partial IChapterInfoDto
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public async Task<IChapterInfoDto?> GetChapterInfoDtoAsync(int chapterId)
|
|
{
|
|
var chapterInfo = await _context.Chapter
|
|
.Where(c => c.Id == chapterId)
|
|
.Join(_context.Volume, c => c.VolumeId, v => v.Id, (chapter, volume) => new
|
|
{
|
|
ChapterNumber = chapter.Range,
|
|
VolumeNumber = volume.Name,
|
|
VolumeId = volume.Id,
|
|
chapter.IsSpecial,
|
|
chapter.TitleName,
|
|
volume.SeriesId,
|
|
chapter.Pages,
|
|
})
|
|
.Join(_context.Series, data => data.SeriesId, series => series.Id, (data, series) => new
|
|
{
|
|
data.ChapterNumber,
|
|
data.VolumeNumber,
|
|
data.VolumeId,
|
|
data.IsSpecial,
|
|
data.SeriesId,
|
|
data.Pages,
|
|
data.TitleName,
|
|
SeriesFormat = series.Format,
|
|
SeriesName = series.Name,
|
|
series.LibraryId,
|
|
LibraryType = series.Library.Type
|
|
})
|
|
.Select(data => new ChapterInfoDto()
|
|
{
|
|
ChapterNumber = data.ChapterNumber,
|
|
VolumeNumber = data.VolumeNumber + string.Empty,
|
|
VolumeId = data.VolumeId,
|
|
IsSpecial = data.IsSpecial,
|
|
SeriesId = data.SeriesId,
|
|
SeriesFormat = data.SeriesFormat,
|
|
SeriesName = data.SeriesName,
|
|
LibraryId = data.LibraryId,
|
|
Pages = data.Pages,
|
|
ChapterTitle = data.TitleName,
|
|
LibraryType = data.LibraryType
|
|
})
|
|
.AsNoTracking()
|
|
.AsSplitQuery()
|
|
.SingleOrDefaultAsync();
|
|
|
|
return chapterInfo;
|
|
}
|
|
|
|
public Task<int> GetChapterTotalPagesAsync(int chapterId)
|
|
{
|
|
return _context.Chapter
|
|
.Where(c => c.Id == chapterId)
|
|
.Select(c => c.Pages)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
public async Task<ChapterDto?> GetChapterDtoAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files)
|
|
{
|
|
var chapter = await _context.Chapter
|
|
.Includes(includes)
|
|
.ProjectTo<ChapterDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking()
|
|
.AsSplitQuery()
|
|
.FirstOrDefaultAsync(c => c.Id == chapterId);
|
|
|
|
return chapter;
|
|
}
|
|
|
|
public async Task<ChapterMetadataDto?> GetChapterMetadataDtoAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files)
|
|
{
|
|
var chapter = await _context.Chapter
|
|
.Includes(includes)
|
|
.ProjectTo<ChapterMetadataDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking()
|
|
.AsSplitQuery()
|
|
.SingleOrDefaultAsync(c => c.Id == chapterId);
|
|
|
|
return chapter;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns non-tracked files for a given chapterId
|
|
/// </summary>
|
|
/// <param name="chapterId"></param>
|
|
/// <returns></returns>
|
|
public async Task<IList<MangaFile>> GetFilesForChapterAsync(int chapterId)
|
|
{
|
|
return await _context.MangaFile
|
|
.Where(c => chapterId == c.ChapterId)
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns a Chapter for an Id. Includes linked <see cref="MangaFile"/>s.
|
|
/// </summary>
|
|
/// <param name="chapterId"></param>
|
|
/// <param name="includes"></param>
|
|
/// <returns></returns>
|
|
public async Task<Chapter?> GetChapterAsync(int chapterId, ChapterIncludes includes = ChapterIncludes.Files)
|
|
{
|
|
return await _context.Chapter
|
|
.Includes(includes)
|
|
.FirstOrDefaultAsync(c => c.Id == chapterId);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns Chapters for a volume id.
|
|
/// </summary>
|
|
/// <param name="volumeId"></param>
|
|
/// <returns></returns>
|
|
public async Task<IList<Chapter>> GetChaptersAsync(int volumeId)
|
|
{
|
|
return await _context.Chapter
|
|
.Where(c => c.VolumeId == volumeId)
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the cover image for a chapter id.
|
|
/// </summary>
|
|
/// <param name="chapterId"></param>
|
|
/// <returns></returns>
|
|
public async Task<string?> GetChapterCoverImageAsync(int chapterId)
|
|
{
|
|
return await _context.Chapter
|
|
.Where(c => c.Id == chapterId)
|
|
.Select(c => c.CoverImage)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IList<string>> GetAllCoverImagesAsync()
|
|
{
|
|
return (await _context.Chapter
|
|
.Select(c => c.CoverImage)
|
|
.Where(t => !string.IsNullOrEmpty(t))
|
|
.ToListAsync())!;
|
|
}
|
|
|
|
public async Task<IList<Chapter>> GetAllChaptersWithNonWebPCovers()
|
|
{
|
|
return await _context.Chapter
|
|
.Where(c => !string.IsNullOrEmpty(c.CoverImage) && !c.CoverImage.EndsWith(".webp"))
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns cover images for locked chapters
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public async Task<IEnumerable<string>> GetCoverImagesForLockedChaptersAsync()
|
|
{
|
|
return (await _context.Chapter
|
|
.Where(c => c.CoverImageLocked)
|
|
.Select(c => c.CoverImage)
|
|
.Where(t => !string.IsNullOrEmpty(t))
|
|
.ToListAsync())!;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns non-tracked files for a set of <paramref name="chapterIds"/>
|
|
/// </summary>
|
|
/// <param name="chapterIds">List of chapter Ids</param>
|
|
/// <returns></returns>
|
|
public async Task<IList<MangaFile>> GetFilesForChaptersAsync(IReadOnlyList<int> chapterIds)
|
|
{
|
|
return await _context.MangaFile
|
|
.Where(c => chapterIds.Contains(c.ChapterId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<ChapterDto> AddChapterModifiers(int userId, ChapterDto chapter)
|
|
{
|
|
var progress = await _context.AppUserProgresses.Where(x =>
|
|
x.AppUserId == userId && x.ChapterId == chapter.Id)
|
|
.AsNoTracking()
|
|
.FirstOrDefaultAsync();
|
|
if (progress != null)
|
|
{
|
|
chapter.PagesRead = progress.PagesRead ;
|
|
chapter.LastReadingProgressUtc = progress.LastModifiedUtc;
|
|
}
|
|
else
|
|
{
|
|
chapter.PagesRead = 0;
|
|
chapter.LastReadingProgressUtc = DateTime.MinValue;
|
|
}
|
|
|
|
return chapter;
|
|
}
|
|
}
|