mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 12:14:44 -04:00
* Updated theme support to be able to customize the tile color dynamically from a theme via --tile-color. In addition, --theme-color will update apple-mobile-web-app-status-bar-style as well as the non-apple variants * Removed --manga-reader-bg-color as it wasn't used anywhere. Fixed double pagination on swipe. * Cleaned up some dead threshold code for swipe. * Started refactoring tests to use an abstract test class. Stopping because I should do on the .net 7 branch to avoid large merge conflicts. Tests need to be re-designed so they can run in parallel. * Fixed a bug in reading lists where when deleting an item, order could be miscalculated. * Started adding new information for stat service. Refactored time spent reading to be more accurate by taking average time against how much of the chapter the user has read. * Hooked up total time reading at server stat level. Don't show fancy graphs on mobile. * Added new stats for v0.7 * Added a test for Clearing want to read * Fixed a few tests that weren't resetting state between runs * Fixed some broken unit tests * Ensure all Series queries sort by a case invariant string. * Added more aggressive caching of images. This will result in a min delay on pages after a cover is changed. * Fixed a bug where if during new word count calculation, new word count is zero, restoring the old count wasn't working. * Cleaned up some of the code for getting time estimates * Fixed a bug where triggering swipe right wasn't working when there was no scroll * Delete the temp folder for creating a download after a full zip is created.
215 lines
8.2 KiB
C#
215 lines
8.2 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Comparators;
|
|
using API.Data;
|
|
using API.Data.Repositories;
|
|
using API.DTOs.ReadingLists;
|
|
using API.Entities;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services;
|
|
|
|
public interface IReadingListService
|
|
{
|
|
Task<bool> RemoveFullyReadItems(int readingListId, AppUser user);
|
|
Task<bool> UpdateReadingListItemPosition(UpdateReadingListPosition dto);
|
|
Task<bool> DeleteReadingListItem(UpdateReadingListPosition dto);
|
|
Task<AppUser?> UserHasReadingListAccess(int readingListId, string username);
|
|
Task<bool> DeleteReadingList(int readingListId, AppUser user);
|
|
Task CalculateReadingListAgeRating(ReadingList readingList);
|
|
Task<bool> AddChaptersToReadingList(int seriesId, IList<int> chapterIds,
|
|
ReadingList readingList);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Methods responsible for management of Reading Lists
|
|
/// </summary>
|
|
/// <remarks>If called from API layer, expected for <see cref="UserHasReadingListAccess"/> to be called beforehand</remarks>
|
|
public class ReadingListService : IReadingListService
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly ILogger<ReadingListService> _logger;
|
|
private readonly ChapterSortComparerZeroFirst _chapterSortComparerForInChapterSorting = new ChapterSortComparerZeroFirst();
|
|
|
|
public ReadingListService(IUnitOfWork unitOfWork, ILogger<ReadingListService> logger)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_logger = logger;
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// Removes all entries that are fully read from the reading list. This commits
|
|
/// </summary>
|
|
/// <remarks>If called from API layer, expected for <see cref="UserHasReadingListAccess"/> to be called beforehand</remarks>
|
|
/// <param name="readingListId">Reading List Id</param>
|
|
/// <param name="user">User</param>
|
|
/// <returns></returns>
|
|
public async Task<bool> RemoveFullyReadItems(int readingListId, AppUser user)
|
|
{
|
|
var items = await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, user.Id);
|
|
items = await _unitOfWork.ReadingListRepository.AddReadingProgressModifiers(user.Id, items.ToList());
|
|
|
|
// Collect all Ids to remove
|
|
var itemIdsToRemove = items.Where(item => item.PagesRead == item.PagesTotal).Select(item => item.Id);
|
|
|
|
try
|
|
{
|
|
var listItems =
|
|
(await _unitOfWork.ReadingListRepository.GetReadingListItemsByIdAsync(readingListId)).Where(r =>
|
|
itemIdsToRemove.Contains(r.Id));
|
|
_unitOfWork.ReadingListRepository.BulkRemove(listItems);
|
|
|
|
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(readingListId);
|
|
await CalculateReadingListAgeRating(readingList);
|
|
|
|
if (!_unitOfWork.HasChanges()) return true;
|
|
|
|
return await _unitOfWork.CommitAsync();
|
|
}
|
|
catch
|
|
{
|
|
await _unitOfWork.RollbackAsync();
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Updates a reading list item from one position to another. This will cause items at that position to be pushed one index.
|
|
/// </summary>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
public async Task<bool> UpdateReadingListItemPosition(UpdateReadingListPosition dto)
|
|
{
|
|
var items = (await _unitOfWork.ReadingListRepository.GetReadingListItemsByIdAsync(dto.ReadingListId)).ToList();
|
|
var item = items.Find(r => r.Id == dto.ReadingListItemId);
|
|
items.Remove(item);
|
|
items.Insert(dto.ToPosition, item);
|
|
|
|
for (var i = 0; i < items.Count; i++)
|
|
{
|
|
items[i].Order = i;
|
|
}
|
|
|
|
if (!_unitOfWork.HasChanges()) return true;
|
|
|
|
return await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes a certain reading list item from a reading list
|
|
/// </summary>
|
|
/// <param name="dto">Only ReadingListId and ReadingListItemId are used</param>
|
|
/// <returns></returns>
|
|
public async Task<bool> DeleteReadingListItem(UpdateReadingListPosition dto)
|
|
{
|
|
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(dto.ReadingListId);
|
|
readingList.Items = readingList.Items.Where(r => r.Id != dto.ReadingListItemId).OrderBy(r => r.Order).ToList();
|
|
|
|
var index = 0;
|
|
foreach (var readingListItem in readingList.Items)
|
|
{
|
|
readingListItem.Order = index;
|
|
index++;
|
|
}
|
|
|
|
await CalculateReadingListAgeRating(readingList);
|
|
|
|
if (!_unitOfWork.HasChanges()) return true;
|
|
|
|
return await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Calculates the highest Age Rating from each Reading List Item
|
|
/// </summary>
|
|
/// <param name="readingList"></param>
|
|
public async Task CalculateReadingListAgeRating(ReadingList readingList)
|
|
{
|
|
await CalculateReadingListAgeRating(readingList, readingList.Items.Select(i => i.SeriesId));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Calculates the highest Age Rating from each Reading List Item
|
|
/// </summary>
|
|
/// <remarks>This method is used when the ReadingList doesn't have items yet</remarks>
|
|
/// <param name="readingList"></param>
|
|
/// <param name="seriesIds">The series ids of all the reading list items</param>
|
|
private async Task CalculateReadingListAgeRating(ReadingList readingList, IEnumerable<int> seriesIds)
|
|
{
|
|
var ageRating = await _unitOfWork.SeriesRepository.GetMaxAgeRatingFromSeriesAsync(seriesIds);
|
|
readingList.AgeRating = ageRating;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Validates the user has access to the reading list to perform actions on it
|
|
/// </summary>
|
|
/// <param name="readingListId"></param>
|
|
/// <param name="username"></param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser?> UserHasReadingListAccess(int readingListId, string username)
|
|
{
|
|
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(username,
|
|
AppUserIncludes.ReadingListsWithItems);
|
|
if (user.ReadingLists.SingleOrDefault(rl => rl.Id == readingListId) == null && !await _unitOfWork.UserRepository.IsUserAdminAsync(user))
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return user;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes the Reading List from kavita
|
|
/// </summary>
|
|
/// <param name="readingListId"></param>
|
|
/// <param name="user">User should have ReadingLists populated</param>
|
|
/// <returns></returns>
|
|
public async Task<bool> DeleteReadingList(int readingListId, AppUser user)
|
|
{
|
|
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(readingListId);
|
|
user.ReadingLists.Remove(readingList);
|
|
|
|
if (!_unitOfWork.HasChanges()) return true;
|
|
|
|
return await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a list of Chapters as reading list items to the passed reading list.
|
|
/// </summary>
|
|
/// <param name="seriesId"></param>
|
|
/// <param name="chapterIds"></param>
|
|
/// <param name="readingList"></param>
|
|
/// <returns>True if new chapters were added</returns>
|
|
public async Task<bool> AddChaptersToReadingList(int seriesId, IList<int> chapterIds, ReadingList readingList)
|
|
{
|
|
readingList.Items ??= new List<ReadingListItem>();
|
|
var lastOrder = 0;
|
|
if (readingList.Items.Any())
|
|
{
|
|
lastOrder = readingList.Items.DefaultIfEmpty().Max(rli => rli.Order);
|
|
}
|
|
|
|
var existingChapterExists = readingList.Items.Select(rli => rli.ChapterId).ToHashSet();
|
|
var chaptersForSeries = (await _unitOfWork.ChapterRepository.GetChaptersByIdsAsync(chapterIds, ChapterIncludes.Volumes))
|
|
.OrderBy(c => Tasks.Scanner.Parser.Parser.MinNumberFromRange(c.Volume.Name))
|
|
.ThenBy(x => double.Parse(x.Number), _chapterSortComparerForInChapterSorting)
|
|
.ToList();
|
|
|
|
var index = lastOrder + 1;
|
|
foreach (var chapter in chaptersForSeries.Where(chapter => !existingChapterExists.Contains(chapter.Id)))
|
|
{
|
|
readingList.Items.Add(DbFactory.ReadingListItem(index, seriesId, chapter.VolumeId, chapter.Id));
|
|
index += 1;
|
|
}
|
|
|
|
await CalculateReadingListAgeRating(readingList, new []{ seriesId });
|
|
|
|
return index > lastOrder + 1;
|
|
}
|
|
}
|