Misc Bugfixes (#1378)

* Fixed an issue where sometimes when loading the next page, the pagination area wouldn't be properly setup due to a missed rendering cycle

* Refactored BookController to thin it out and refactor some of the functions to apply IOC. Added some split query statements on a few queries.

* Added Split Query to many queries

* Added a visual indicator for loading state of PDF. Will spruce up css later.

* Added back in logic

* Fixed flash of white when refreshing browser

* Hooked in a loading progress bar for the pdf reader

* Close the pdf reader when pressing ESC
This commit is contained in:
Joseph Milazzo 2022-07-17 10:19:36 -04:00 committed by GitHub
parent 3a10b54422
commit c650436f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 315 additions and 389 deletions

View file

@ -279,6 +279,7 @@ public class SeriesRepository : ISeriesRepository
.Include(l => l.AppUsers)
.Where(library => library.AppUsers.Any(user => user.Id == userId))
.AsNoTracking()
.AsSplitQuery()
.Select(library => library.Id)
.ToListAsync();
}
@ -485,6 +486,7 @@ public class SeriesRepository : ISeriesRepository
var volumes = await _context.Volume
.Where(v => seriesIds.Contains(v.SeriesId))
.Include(v => v.Chapters)
.AsSplitQuery()
.ToListAsync();
IList<int> chapterIds = new List<int>();
@ -509,6 +511,7 @@ public class SeriesRepository : ISeriesRepository
var volumes = await _context.Volume
.Where(v => seriesIds.Contains(v.SeriesId))
.Include(v => v.Chapters)
.AsSplitQuery()
.ToListAsync();
var seriesChapters = new Dictionary<int, IList<int>>();
@ -532,10 +535,12 @@ public class SeriesRepository : ISeriesRepository
{
var userProgress = await _context.AppUserProgresses
.Where(p => p.AppUserId == userId && series.Select(s => s.Id).Contains(p.SeriesId))
.AsSplitQuery()
.ToListAsync();
var userRatings = await _context.AppUserRating
.Where(r => r.AppUserId == userId && series.Select(s => s.Id).Contains(r.SeriesId))
.AsSplitQuery()
.ToListAsync();
foreach (var s in series)
@ -804,6 +809,7 @@ public class SeriesRepository : ISeriesRepository
var userLibraries = _context.Library
.Include(l => l.AppUsers)
.Where(library => library.AppUsers.Any(user => user.Id == userId))
.AsSplitQuery()
.AsNoTracking()
.Select(library => library.Id)
.ToList();
@ -829,6 +835,7 @@ public class SeriesRepository : ISeriesRepository
.Include(v => v.Chapters)
.ThenInclude(c => c.Files)
.SelectMany(v => v.Chapters.SelectMany(c => c.Files))
.AsSplitQuery()
.AsNoTracking()
.ToListAsync();
}
@ -838,6 +845,7 @@ public class SeriesRepository : ISeriesRepository
var allowedLibraries = _context.Library
.Include(l => l.AppUsers)
.Where(library => library.AppUsers.Any(x => x.Id == userId))
.AsSplitQuery()
.Select(l => l.Id);
return await _context.Series
@ -920,6 +928,7 @@ public class SeriesRepository : ISeriesRepository
return await _context.SeriesMetadata
.Where(sm => seriesIds.Contains(sm.SeriesId))
.Include(sm => sm.CollectionTags)
.AsSplitQuery()
.ToListAsync();
}
@ -993,6 +1002,7 @@ public class SeriesRepository : ISeriesRepository
{
return _context.AppUser
.Where(u => u.Id == userId)
.AsSplitQuery()
.SelectMany(l => l.Libraries.Select(lib => lib.Id));
}