mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Started with the redesign of the cover image chooser redesign to be less click intensive for volume/chapter images. Made some headings bold in card detail drawer. * Tweaked the styles * Moved where the info cards show * Added an ability to open a page settings drawer * Cleaned up some old code that isn't needed anymore. * Started implementing a list view. Refactored some title code to a dedicated component * List view implemented but way too many API calls. Either need caching or adjusting the SeriesDetail api. * Fixed a bug where if the progress bar didn't render on a card item while a download was in progress, the download indicator would be removed. * Large refactor to move a lot of the needed fields to the chapter and volume dtos for series detail. All fields are noted when only used in series detail. * Implemented cards for other tabs (except related) * Fixed the unit test which needed a mocked reader service call. * More cleanup around age rating and removing old code from the refactor. Commented out sorting till i feel motivated to work on that. * Some cleanup and restored cards as initial layout. Time to test this out and see if there is value add. * Added ability for Chapters tab to show the volume chapters belong to (if applicable) * Adding style fixes * Cover image updates, don't allow the first image (which is what is currently set) to respond to cover changes. Hide the ID field on list item for series detail. * Refactored the title for list item to be injectable * Cleaned up the selection code to make it less finicky on mobile when tap scrolling. * Refactored chapter tab to show volume as well on list view. * Ensure word count shows for Volumes * Started adding virtual scrolling, pushing up so Robbie can mess around * Started adding virtual scrolling, pushing up so Robbie can mess around * Fixed a bug where all chapters would come under specials * Show title data as accent if set. * Style fixes for virtual scroller * Restyling scroll * Implemented a way to show storyline with virtual scrolling * Show Word Count for chapters and cleaned up some logics. * I might have card layout working with virtual scroll code. * Some cleanup to hide more system like properties from info bar on series detail page. Fixed some missing time estimate info on storyline chapters. * Fixed a regression on series service when I integrated VolumeTitle. * Refactored read time to the backend. Added WordCount to the volume itself so we don't need to calculate on frontend. When asking to analyze files from a series, force the calculation. * Fixed SeriesDetail api code * Fixed up the code in the drawer to better update list/card mode * Basic infinite scroll implemented, however due to how we are updating the list to render, we are re-rending cards that haven't been touched. * Updated how we render and layout data for infinite scroll on library detail. It's almost there. * Started laying foundation for loading pages backwards. Removed lazy loading of images since we are now using virtual paging. * Hooked in some basic code to allow user to load a prev page with infinite scroll. * Fixed up series detail api and undid the non-lazy loaded images. Changed the router to help with this infinite loading on Firefox issue. * Fixed up some naming issues with Series Detail and added a new test. * This is an infinite scroll without pagination implementation. It is not fully done, but off to a good start. Virtual scroller with jump bar is working pretty well, def needs more polishing and tweaking. There are hacks in this implementation that need to be revisited. * Refactored code so that we don't use any pagination and load all results by default. * Misc code cleanup from build warnings. * Cleaned up some logic for how to display titles in list view. * More title cleanup for specials * Hooked up page layout to user preferences and renamed an existing user pref name to match the dto. * Swapped out everything but storyline with virtual-scroller over CDK * Removed CDK from series detail. * Default value for migration on page layout * Updating card layout for library detail page * fixing height for mobile * Moved scrollbar * Tweaked some styling for layouts when there is no data * Refactored the series cards into their own component to make it re-usable. * More tweaks on series info cards layout and enhanced a few pages with trackby functions. * Removed some dead code * Added download on series detail to actionables to fit in with new scroll strategy. * Fixed language not being updated and sent to the backend for series update. * Fixed a bad migration (if you ran any prior migration in this branch, you need to undo before you use this commit) * Adding sticky tabs * fixed mobile gap on sticky tab * Enhanced the card title for books to show number up front. * Adjusted the gutters on admin dashboard * Removed debug code * Removing duplicate book title * Cleaned up old references to cdk scroller * Implemented a basic jump bar scaling algorithm. Not perfect, but works pretty well. * Code smells Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
318 lines
9.7 KiB
C#
318 lines
9.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Globalization;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs;
|
|
using API.DTOs.Filtering;
|
|
using API.DTOs.JumpBar;
|
|
using API.DTOs.Metadata;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Kavita.Common.Extensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
[Flags]
|
|
public enum LibraryIncludes
|
|
{
|
|
None = 1,
|
|
Series = 2,
|
|
AppUser = 4,
|
|
Folders = 8,
|
|
// Ratings = 16
|
|
}
|
|
|
|
public interface ILibraryRepository
|
|
{
|
|
void Add(Library library);
|
|
void Update(Library library);
|
|
void Delete(Library library);
|
|
Task<IEnumerable<LibraryDto>> GetLibraryDtosAsync();
|
|
Task<bool> LibraryExists(string libraryName);
|
|
Task<Library> GetLibraryForIdAsync(int libraryId, LibraryIncludes includes);
|
|
Task<Library> GetFullLibraryForIdAsync(int libraryId);
|
|
Task<Library> GetFullLibraryForIdAsync(int libraryId, int seriesId);
|
|
Task<IEnumerable<LibraryDto>> GetLibraryDtosForUsernameAsync(string userName);
|
|
Task<IEnumerable<Library>> GetLibrariesAsync();
|
|
Task<bool> DeleteLibrary(int libraryId);
|
|
Task<IEnumerable<Library>> GetLibrariesForUserIdAsync(int userId);
|
|
Task<LibraryType> GetLibraryTypeAsync(int libraryId);
|
|
Task<IEnumerable<Library>> GetLibraryForIdsAsync(IList<int> libraryIds);
|
|
Task<int> GetTotalFiles();
|
|
IEnumerable<JumpKeyDto> GetJumpBarAsync(int libraryId);
|
|
Task<IList<AgeRatingDto>> GetAllAgeRatingsDtosForLibrariesAsync(List<int> libraryIds);
|
|
Task<IList<LanguageDto>> GetAllLanguagesForLibrariesAsync(List<int> libraryIds);
|
|
IEnumerable<PublicationStatusDto> GetAllPublicationStatusesDtosForLibrariesAsync(List<int> libraryIds);
|
|
}
|
|
|
|
public class LibraryRepository : ILibraryRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public LibraryRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Add(Library library)
|
|
{
|
|
_context.Library.Add(library);
|
|
}
|
|
|
|
public void Update(Library library)
|
|
{
|
|
_context.Entry(library).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Delete(Library library)
|
|
{
|
|
_context.Library.Remove(library);
|
|
}
|
|
|
|
public async Task<IEnumerable<LibraryDto>> GetLibraryDtosForUsernameAsync(string userName)
|
|
{
|
|
return await _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.Where(library => library.AppUsers.Any(x => x.UserName == userName))
|
|
.OrderBy(l => l.Name)
|
|
.ProjectTo<LibraryDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking()
|
|
.AsSingleQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<Library>> GetLibrariesAsync()
|
|
{
|
|
return await _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> DeleteLibrary(int libraryId)
|
|
{
|
|
var library = await GetLibraryForIdAsync(libraryId, LibraryIncludes.Folders | LibraryIncludes.Series);
|
|
_context.Library.Remove(library);
|
|
|
|
return await _context.SaveChangesAsync() > 0;
|
|
}
|
|
|
|
public async Task<IEnumerable<Library>> GetLibrariesForUserIdAsync(int userId)
|
|
{
|
|
return await _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.Where(l => l.AppUsers.Select(ap => ap.Id).Contains(userId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<LibraryType> GetLibraryTypeAsync(int libraryId)
|
|
{
|
|
return await _context.Library
|
|
.Where(l => l.Id == libraryId)
|
|
.AsNoTracking()
|
|
.Select(l => l.Type)
|
|
.SingleAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<Library>> GetLibraryForIdsAsync(IList<int> libraryIds)
|
|
{
|
|
return await _context.Library
|
|
.Where(x => libraryIds.Contains(x.Id))
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<int> GetTotalFiles()
|
|
{
|
|
return await _context.MangaFile.CountAsync();
|
|
}
|
|
|
|
public IEnumerable<JumpKeyDto> GetJumpBarAsync(int libraryId)
|
|
{
|
|
var seriesSortCharacters = _context.Series.Where(s => s.LibraryId == libraryId)
|
|
.Select(s => s.SortName.ToUpper())
|
|
.OrderBy(s => s)
|
|
.AsEnumerable()
|
|
.Select(s => s[0]);
|
|
|
|
// Map the title to the number of entities
|
|
var firstCharacterMap = new Dictionary<char, int>();
|
|
foreach (var sortChar in seriesSortCharacters)
|
|
{
|
|
var c = sortChar;
|
|
var isAlpha = char.IsLetter(sortChar);
|
|
if (!isAlpha) c = '#';
|
|
if (!firstCharacterMap.ContainsKey(c))
|
|
{
|
|
firstCharacterMap[c] = 0;
|
|
}
|
|
|
|
firstCharacterMap[c] += 1;
|
|
}
|
|
|
|
return firstCharacterMap.Keys.Select(k => new JumpKeyDto()
|
|
{
|
|
Key = k + string.Empty,
|
|
Size = firstCharacterMap[k],
|
|
Title = k + string.Empty
|
|
});
|
|
}
|
|
|
|
public async Task<IEnumerable<LibraryDto>> GetLibraryDtosAsync()
|
|
{
|
|
return await _context.Library
|
|
.Include(f => f.Folders)
|
|
.OrderBy(l => l.Name)
|
|
.ProjectTo<LibraryDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<Library> GetLibraryForIdAsync(int libraryId, LibraryIncludes includes)
|
|
{
|
|
|
|
var query = _context.Library
|
|
.Where(x => x.Id == libraryId);
|
|
|
|
query = AddIncludesToQuery(query, includes);
|
|
return await query.SingleAsync();
|
|
}
|
|
|
|
private static IQueryable<Library> AddIncludesToQuery(IQueryable<Library> query, LibraryIncludes includeFlags)
|
|
{
|
|
if (includeFlags.HasFlag(LibraryIncludes.Folders))
|
|
{
|
|
query = query.Include(l => l.Folders);
|
|
}
|
|
|
|
if (includeFlags.HasFlag(LibraryIncludes.Series))
|
|
{
|
|
query = query.Include(l => l.Series);
|
|
}
|
|
|
|
if (includeFlags.HasFlag(LibraryIncludes.AppUser))
|
|
{
|
|
query = query.Include(l => l.AppUsers);
|
|
}
|
|
|
|
return query;
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// This returns a Library with all it's Series -> Volumes -> Chapters. This is expensive. Should only be called when needed.
|
|
/// </summary>
|
|
/// <param name="libraryId"></param>
|
|
/// <returns></returns>
|
|
public async Task<Library> GetFullLibraryForIdAsync(int libraryId)
|
|
{
|
|
return await _context.Library
|
|
.Where(x => x.Id == libraryId)
|
|
.Include(f => f.Folders)
|
|
.Include(l => l.Series)
|
|
.ThenInclude(s => s.Metadata)
|
|
.Include(l => l.Series)
|
|
.ThenInclude(s => s.Volumes)
|
|
.ThenInclude(v => v.Chapters)
|
|
.ThenInclude(c => c.Files)
|
|
.AsSplitQuery()
|
|
.SingleAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// This is a heavy call, pulls all entities for a Library, except this version only grabs for one series id
|
|
/// </summary>
|
|
/// <param name="libraryId"></param>
|
|
/// <param name="seriesId"></param>
|
|
/// <returns></returns>
|
|
public async Task<Library> GetFullLibraryForIdAsync(int libraryId, int seriesId)
|
|
{
|
|
|
|
return await _context.Library
|
|
.Where(x => x.Id == libraryId)
|
|
.Include(f => f.Folders)
|
|
.Include(l => l.Series.Where(s => s.Id == seriesId))
|
|
.ThenInclude(s => s.Metadata)
|
|
.Include(l => l.Series.Where(s => s.Id == seriesId))
|
|
.ThenInclude(s => s.Volumes)
|
|
.ThenInclude(v => v.Chapters)
|
|
.ThenInclude(c => c.Files)
|
|
.AsSplitQuery()
|
|
.SingleAsync();
|
|
}
|
|
|
|
public async Task<bool> LibraryExists(string libraryName)
|
|
{
|
|
return await _context.Library
|
|
.AsNoTracking()
|
|
.AnyAsync(x => x.Name == libraryName);
|
|
}
|
|
|
|
public async Task<IEnumerable<LibraryDto>> GetLibrariesForUserAsync(AppUser user)
|
|
{
|
|
return await _context.Library
|
|
.Where(library => library.AppUsers.Contains(user))
|
|
.Include(l => l.Folders)
|
|
.AsNoTracking()
|
|
.ProjectTo<LibraryDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
|
|
public async Task<IList<AgeRatingDto>> GetAllAgeRatingsDtosForLibrariesAsync(List<int> libraryIds)
|
|
{
|
|
return await _context.Series
|
|
.Where(s => libraryIds.Contains(s.LibraryId))
|
|
.Select(s => s.Metadata.AgeRating)
|
|
.Distinct()
|
|
.Select(s => new AgeRatingDto()
|
|
{
|
|
Value = s,
|
|
Title = s.ToDescription()
|
|
})
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IList<LanguageDto>> GetAllLanguagesForLibrariesAsync(List<int> libraryIds)
|
|
{
|
|
var ret = await _context.Series
|
|
.Where(s => libraryIds.Contains(s.LibraryId))
|
|
.Select(s => s.Metadata.Language)
|
|
.AsNoTracking()
|
|
.Distinct()
|
|
.ToListAsync();
|
|
|
|
return ret
|
|
.Where(s => !string.IsNullOrEmpty(s))
|
|
.Select(s => new LanguageDto()
|
|
{
|
|
Title = CultureInfo.GetCultureInfo(s).DisplayName,
|
|
IsoCode = s
|
|
})
|
|
.OrderBy(s => s.Title)
|
|
.ToList();
|
|
}
|
|
|
|
public IEnumerable<PublicationStatusDto> GetAllPublicationStatusesDtosForLibrariesAsync(List<int> libraryIds)
|
|
{
|
|
return _context.Series
|
|
.Where(s => libraryIds.Contains(s.LibraryId))
|
|
.Select(s => s.Metadata.PublicationStatus)
|
|
.Distinct()
|
|
.AsEnumerable()
|
|
.Select(s => new PublicationStatusDto()
|
|
{
|
|
Value = s,
|
|
Title = s.ToDescription()
|
|
})
|
|
.OrderBy(s => s.Title);
|
|
}
|
|
|
|
|
|
}
|