mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-03 19:17:05 -05:00 
			
		
		
		
	* Fixed a bug on bookmark mode not finding correct image for prefetcher. * Fixed up the edit series relationship modal on tablet viewports. * On double page mode, only bookmark 1 page if only 1 pages is renderered on screen. * Added percentage read of a given library and average hours read per week to user stats. * Fixed a bug in the reader with paging in bookmark mode * Added a "This Week" option to top readers history * Added date ranges for reading time. Added dates that don't have anything, but might remove. * On phone, when applying a metadata filter, when clicking apply, collapse the filter automatically. * Disable jump bar and the resuming from last spot when a custom sort is applied. * Ensure all Regex.Replace or Matches have timeouts set * Fixed a long standing bug where fit to height on tablets wouldn't center the image * Streamlined url parsing to be more reliable * Reduced an additional db query in chapter info. * Added a missing task to convert covers to webP and added messaging to help the user understand to run it after modifying the setting. * Changed OPDS to be enabled by default for new installs. This should reduce issues with users being confused about it before it's enabled. * When there are multiple files for a chapter, show a count card on the series detail to help user understand duplicates exist. Made the unread badge smaller to avoid collision. * Added Word Count to user stats and wired up average reading per week. * Fixed word count failing on some epubs * Removed some debug code * Don't give more information than is necessary about file paths for page dimensions. * Fixed a bug where pagination area would be too small when the book's content was less that height on default mode. * Updated Default layout mode to Scroll for books. * Added bytes in the UI and at an API layer for CDisplayEx * Don't log health checks to logs at all. * Changed Word Count to Length to match the way pages work * Made reading time more clear when min hours is 0 * Apply more aggressive coalescing when remapping bad metadata keys for epubs. * Changed the amount of padding between icon and text for side nav item. * Fixed a NPE on book reader (harmless) * Fixed an ordering issue where Volume 1 was a single file but also tagged as Chapter 1 and Volume 2 was Chapter 0. Thus Volume 2 was being selected for continue point when Volume 1 should have been. * When clicking on an activity stream header from dashboard, show the title on the resulting page. * Removed a property that can't be animated * Fixed a typeahead typescript issue * Added Size into Series Info and Added some tooltip and spacing changes to better explain some fields. * Added size for volume drawers and cleaned up some date edge case handling * Fixed an annoying bug where when on mobile opening a view with a metadata filter, Kavita would open the filter automatically.
		
			
				
	
	
		
			251 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			251 lines
		
	
	
		
			8.1 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);
 | 
						|
    Task<ChapterMetadataDto> GetChapterMetadataDtoAsync(int chapterId);
 | 
						|
    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();
 | 
						|
}
 | 
						|
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)
 | 
						|
            .SingleOrDefaultAsync();
 | 
						|
    }
 | 
						|
    public async Task<ChapterDto> GetChapterDtoAsync(int chapterId)
 | 
						|
    {
 | 
						|
        var chapter = await _context.Chapter
 | 
						|
            .Include(c => c.Files)
 | 
						|
            .ProjectTo<ChapterDto>(_mapper.ConfigurationProvider)
 | 
						|
            .AsNoTracking()
 | 
						|
            .AsSplitQuery()
 | 
						|
            .SingleOrDefaultAsync(c => c.Id == chapterId);
 | 
						|
 | 
						|
        return chapter;
 | 
						|
    }
 | 
						|
 | 
						|
    public async Task<ChapterMetadataDto> GetChapterMetadataDtoAsync(int chapterId)
 | 
						|
    {
 | 
						|
        var chapter = await _context.Chapter
 | 
						|
            .Include(c => c.Files)
 | 
						|
            .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)
 | 
						|
    {
 | 
						|
        var query = _context.Chapter
 | 
						|
            .AsSplitQuery();
 | 
						|
 | 
						|
        if (includes.HasFlag(ChapterIncludes.Files)) query = query.Include(c => c.Files);
 | 
						|
        if (includes.HasFlag(ChapterIncludes.Volumes)) query = query.Include(c => c.Volume);
 | 
						|
 | 
						|
        return await query
 | 
						|
            .SingleOrDefaultAsync(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)
 | 
						|
            .AsNoTracking()
 | 
						|
            .SingleOrDefaultAsync();
 | 
						|
    }
 | 
						|
 | 
						|
    public async Task<IList<string>> GetAllCoverImagesAsync()
 | 
						|
    {
 | 
						|
        return await _context.Chapter
 | 
						|
            .Select(c => c.CoverImage)
 | 
						|
            .Where(t => !string.IsNullOrEmpty(t))
 | 
						|
            .AsNoTracking()
 | 
						|
            .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))
 | 
						|
            .AsNoTracking()
 | 
						|
            .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();
 | 
						|
    }
 | 
						|
}
 |