mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 21:54:47 -04:00
* Add ability to save readinglist comicinfo fields in Chapter. * Added the appropriate fields and migration for Reading List generation. * Started the reading list code * Started building out the CBL import code with some initial unit tests. * Fixed first unit test * Started refactoring control code into services and writing unit tests for ReadingLists. Found a logic issue around reading list title between create/update. Will be corrected in this branch with unit tests. * Can't figure out how to mock UserManager, so had to uncomment a few tests. * Tooltip for total pages read shows the full number * Tweaked the math a bit for average reading per week. * Fixed up the reading list unit tests. Fixed an issue where when inserting chapters into a blank reading list, the initial reading list item would have an order of 1 instead of 0. * Cleaned up the code to allow the reading list code to be localized easily and fixed up a bug in last PR. * Fixed a sorting issue on reading activity * Tweaked the code around reading list actionables not showing due to some weird filter. * Fixed edit library settings not opening on library detail page * Fixed a bug where reading activity dates would be out of order due to a bug in how charts works. A temp hack has been added. * Disable promotion in edit reading list modal since non-admins can (and should have) been able to use it. * Fixed a bug where non-admins couldn't update their OWN reading lists. Made uploading a cover image for readinglists now check against the user's reading list access to allow non-admin's to set images. * Fixed an issue introduced earlier in PR where adding chapters to reading list could cause order to get skewed. * Fixed another regression from earlier commit * Hooked in Import CBL flow. No functionality yet. * Code is a mess. Shifting how the whole import process is going to be done. Commiting so I can pivot drastically. * Very rough code for first step is done. * Ui has started, I've run out of steam for this feature. * Cleaned up the UI code a bit to make the step tracker nature easier without a dedicated component. * Much flow implementation and tweaking to how validation checks and what is sent back. * Removed import via cbl code as it's not done. Pushing to next release.
289 lines
11 KiB
C#
289 lines
11 KiB
C#
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.ReadingLists;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Helpers;
|
|
using API.Services;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
public interface IReadingListRepository
|
|
{
|
|
Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams);
|
|
Task<ReadingList> GetReadingListByIdAsync(int readingListId);
|
|
Task<IEnumerable<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int readingListId, int userId);
|
|
Task<ReadingListDto> GetReadingListDtoByIdAsync(int readingListId, int userId);
|
|
Task<IEnumerable<ReadingListItemDto>> AddReadingProgressModifiers(int userId, IList<ReadingListItemDto> items);
|
|
Task<ReadingListDto> GetReadingListDtoByTitleAsync(int userId, string title);
|
|
Task<IEnumerable<ReadingListItem>> GetReadingListItemsByIdAsync(int readingListId);
|
|
Task<IEnumerable<ReadingListDto>> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId,
|
|
bool includePromoted);
|
|
void Remove(ReadingListItem item);
|
|
void Add(ReadingList list);
|
|
void BulkRemove(IEnumerable<ReadingListItem> items);
|
|
void Update(ReadingList list);
|
|
Task<int> Count();
|
|
Task<string> GetCoverImageAsync(int readingListId);
|
|
Task<IList<string>> GetAllCoverImagesAsync();
|
|
Task<bool> ReadingListExists(string name);
|
|
Task<List<ReadingList>> GetAllReadingListsAsync();
|
|
}
|
|
|
|
public class ReadingListRepository : IReadingListRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public ReadingListRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(ReadingList list)
|
|
{
|
|
_context.Entry(list).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Add(ReadingList list)
|
|
{
|
|
_context.Add(list);
|
|
}
|
|
|
|
public async Task<int> Count()
|
|
{
|
|
return await _context.ReadingList.CountAsync();
|
|
}
|
|
|
|
public async Task<string> GetCoverImageAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(c => c.Id == readingListId)
|
|
.Select(c => c.CoverImage)
|
|
.AsNoTracking()
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IList<string>> GetAllCoverImagesAsync()
|
|
{
|
|
return await _context.ReadingList
|
|
.Select(t => t.CoverImage)
|
|
.Where(t => !string.IsNullOrEmpty(t))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> ReadingListExists(string name)
|
|
{
|
|
var normalized = Services.Tasks.Scanner.Parser.Parser.Normalize(name);
|
|
return await _context.ReadingList
|
|
.AnyAsync(x => x.NormalizedTitle.Equals(normalized));
|
|
}
|
|
|
|
public async Task<List<ReadingList>> GetAllReadingListsAsync()
|
|
{
|
|
return await _context.ReadingList
|
|
.Include(r => r.Items.OrderBy(i => i.Order))
|
|
.AsSplitQuery()
|
|
.OrderBy(l => l.Title)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public void Remove(ReadingListItem item)
|
|
{
|
|
_context.ReadingListItem.Remove(item);
|
|
}
|
|
|
|
public void BulkRemove(IEnumerable<ReadingListItem> items)
|
|
{
|
|
_context.ReadingListItem.RemoveRange(items);
|
|
}
|
|
|
|
|
|
public async Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams)
|
|
{
|
|
var userAgeRating = (await _context.AppUser.SingleAsync(u => u.Id == userId)).AgeRestriction;
|
|
var query = _context.ReadingList
|
|
.Where(l => l.AppUserId == userId || (includePromoted && l.Promoted ))
|
|
.Where(l => l.AgeRating >= userAgeRating)
|
|
.OrderBy(l => l.LastModified)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking();
|
|
|
|
return await PagedList<ReadingListDto>.CreateAsync(query, userParams.PageNumber, userParams.PageSize);
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListDto>> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, bool includePromoted)
|
|
{
|
|
var query = _context.ReadingList
|
|
.Where(l => l.AppUserId == userId || (includePromoted && l.Promoted ))
|
|
.Where(l => l.Items.Any(i => i.SeriesId == seriesId))
|
|
.AsSplitQuery()
|
|
.OrderBy(l => l.Title)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking();
|
|
|
|
return await query.ToListAsync();
|
|
}
|
|
|
|
public async Task<ReadingList> GetReadingListByIdAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Id == readingListId)
|
|
.Include(r => r.Items.OrderBy(item => item.Order))
|
|
.AsSplitQuery()
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int readingListId, int userId)
|
|
{
|
|
var userLibraries = _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.Where(library => library.AppUsers.Any(user => user.Id == userId))
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.Select(library => library.Id)
|
|
.ToList();
|
|
|
|
var items = await _context.ReadingListItem
|
|
.Where(s => s.ReadingListId == readingListId)
|
|
.Join(_context.Chapter, s => s.ChapterId, chapter => chapter.Id, (data, chapter) => new
|
|
{
|
|
TotalPages = chapter.Pages,
|
|
ChapterNumber = chapter.Range,
|
|
chapter.ReleaseDate,
|
|
ReadingListItem = data,
|
|
ChapterTitleName = chapter.TitleName,
|
|
FileSize = chapter.Files.Sum(f => f.Bytes)
|
|
|
|
})
|
|
.Join(_context.Volume, s => s.ReadingListItem.VolumeId, volume => volume.Id, (data, volume) => new
|
|
{
|
|
data.ReadingListItem,
|
|
data.TotalPages,
|
|
data.ChapterNumber,
|
|
data.ReleaseDate,
|
|
data.ChapterTitleName,
|
|
data.FileSize,
|
|
VolumeId = volume.Id,
|
|
VolumeNumber = volume.Name,
|
|
})
|
|
.Join(_context.Series, s => s.ReadingListItem.SeriesId, series => series.Id,
|
|
(data, s) => new
|
|
{
|
|
SeriesName = s.Name,
|
|
SeriesFormat = s.Format,
|
|
s.LibraryId,
|
|
data.ReadingListItem,
|
|
data.TotalPages,
|
|
data.ChapterNumber,
|
|
data.VolumeNumber,
|
|
data.VolumeId,
|
|
data.ReleaseDate,
|
|
data.ChapterTitleName,
|
|
data.FileSize,
|
|
LibraryName = _context.Library.Where(l => l.Id == s.LibraryId).Select(l => l.Name).Single(),
|
|
LibraryType = _context.Library.Where(l => l.Id == s.LibraryId).Select(l => l.Type).Single()
|
|
})
|
|
.Select(data => new ReadingListItemDto()
|
|
{
|
|
Id = data.ReadingListItem.Id,
|
|
ChapterId = data.ReadingListItem.ChapterId,
|
|
Order = data.ReadingListItem.Order,
|
|
SeriesId = data.ReadingListItem.SeriesId,
|
|
SeriesName = data.SeriesName,
|
|
SeriesFormat = data.SeriesFormat,
|
|
PagesTotal = data.TotalPages,
|
|
ChapterNumber = data.ChapterNumber,
|
|
VolumeNumber = data.VolumeNumber,
|
|
LibraryId = data.LibraryId,
|
|
VolumeId = data.VolumeId,
|
|
ReadingListId = data.ReadingListItem.ReadingListId,
|
|
ReleaseDate = data.ReleaseDate,
|
|
LibraryType = data.LibraryType,
|
|
ChapterTitleName = data.ChapterTitleName,
|
|
LibraryName = data.LibraryName,
|
|
FileSize = data.FileSize
|
|
})
|
|
.Where(o => userLibraries.Contains(o.LibraryId))
|
|
.OrderBy(rli => rli.Order)
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var item in items)
|
|
{
|
|
item.Title = ReadingListService.FormatTitle(item);
|
|
}
|
|
|
|
// Attach progress information
|
|
var fetchedChapterIds = items.Select(i => i.ChapterId);
|
|
var progresses = await _context.AppUserProgresses
|
|
.Where(p => fetchedChapterIds.Contains(p.ChapterId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var progress in progresses)
|
|
{
|
|
var progressItem = items.SingleOrDefault(i => i.ChapterId == progress.ChapterId && i.ReadingListId == readingListId);
|
|
if (progressItem == null) continue;
|
|
|
|
progressItem.PagesRead = progress.PagesRead;
|
|
progressItem.LastReadingProgressUtc = progress.LastModifiedUtc;
|
|
}
|
|
|
|
return items;
|
|
}
|
|
|
|
public async Task<ReadingListDto> GetReadingListDtoByIdAsync(int readingListId, int userId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Id == readingListId && (r.AppUserId == userId || r.Promoted))
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItemDto>> AddReadingProgressModifiers(int userId, IList<ReadingListItemDto> items)
|
|
{
|
|
var chapterIds = items.Select(i => i.ChapterId).Distinct();
|
|
var userProgress = await _context.AppUserProgresses
|
|
.Where(p => p.AppUserId == userId && chapterIds.Contains(p.ChapterId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var item in items)
|
|
{
|
|
var progress = userProgress.Where(p => p.ChapterId == item.ChapterId).ToList();
|
|
if (progress.Count == 0) continue;
|
|
item.PagesRead = progress.Sum(p => p.PagesRead);
|
|
item.LastReadingProgressUtc = progress.Max(p => p.LastModifiedUtc);
|
|
}
|
|
|
|
return items;
|
|
}
|
|
|
|
public async Task<ReadingListDto> GetReadingListDtoByTitleAsync(int userId, string title)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Title.Equals(title) && r.AppUserId == userId)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItem>> GetReadingListItemsByIdAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingListItem
|
|
.Where(r => r.ReadingListId == readingListId)
|
|
.OrderBy(r => r.Order)
|
|
.ToListAsync();
|
|
}
|
|
|
|
|
|
}
|