mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Cleaned up some styles on the progress bar in book reader * Fixed up some phone-hidden classes and added titles around the codebase. Stat reporting on first run now takes into account that admin user wont exist. * Fixed manage library page not updating last scan time when a notification event comes in. * Integrated SeriesSort ComicInfo tag (somehow it got missed) * Some minor style changes and no results found for bookmarks on chapter detail modal * Fixed the labels in action bar on book reader so Prev/Next are in same place * Cleaned up some responsive styles around images and reduced custom classes in light of new display classes on collection detail and series detail pages * Fixed an issue with webkit browsers and book reader where the scroll to would fail as the document wasn't fully rendered. A 10ms delay seems to fix the issue. * Cleaned up some code and filtering for collections. Collection detail is missing filtering functionality somehow, disabled the button and will add in future release * Correctly validate and show a message when a user is not an admin or has change password role when going through forget password flow. * Fixed a bug on manage libraries where library last scan didn't work on first scan of a library, due to there being no updated series. * Fixed a rendering issue with text being focused on confirm email page textboxes. Fixed a bug where when deleting a theme that was default, Kavita didn't reset Dark as the default theme. * Cleaned up the naming and styles for side nav active item hover * Fixed event widget to have correct styling on eink and light * Tried to fix a rendering issue on side nav for light themes, but can't figure it out * On light more, ensure switches are green * Fixed a bug where opening a page with a preselected filter, the filter toggle button would require 2 clicks to collapse * Reverted the revert of On Deck. * Improved the upload by url experience by sending a custom fail error to UI when a url returns 401. * When deleting a library, emit a series removed event for each series removed so user's dashboards/screens update. * Fixed an api throwing an error due to text being sent back instead of json. * Fixed a refresh bug with refreshing pending invites after deleting an invite. Ensure we always refresh pending invites even if user cancel's from invite, as they might invite, then hit cancel, where invite is still active. * Fixed a bug where invited users with + in the email would fail due to validation, but UI wouldn't properly inform user.
228 lines
6.7 KiB
C#
228 lines
6.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
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();
|
|
}
|
|
|
|
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 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();
|
|
}
|
|
|
|
|
|
}
|