Manga Reader Work (#1729)

* Instead of augmenting prefetcher to move across chapter bounds, let's try to instead just load 5 images (which the browser will cache) from next/prev so when it loads, it's much faster.

* Trialing loading next/prev chapters 5 pages to have better next page loading experience.

* Tweaked GetChapterInfo API to actually apply conditional includeDimensions parameter.

* added a basic language file for upcoming work

* Moved the bottom menu up a bit for iOS devices with handlebars.

* Fixed fit to width on phones still having a horizontal scrollbar

* Fixed a bug where there is extra space under the image when fit to width and on a phone due to pagination going to far.

* Changed which variable we use for right pagination calculation

* Fixing fit to height

- Fixing height calc to account for horizontal scroll bar height.

* Added a comment for the height scrollbar fix

* Adding screenfull package

# Added:
- Added screenfull package to handle cross-platform browser fullscreen code

# Removed:
- Removed custom fullscreen code

* Fixed a bug where switching from webtoon reader to other layout modes wouldn't render anything. Webtoon continuous scroll down is now broken.

* Fixed it back to how it was and all is good. Need to call detectChanges explicitly.

* Removed an additional undeeded save progress call on loadPage

* Laid out the test case to move the page snapping to the backend with full unit tests. Current code is broken just like UI layer.

* Refactored the snap points into the backend and ensure that it works correctly.

* Fixed a broken unit test

* Filter out spammy hubs/messages calls in the logs

* Swallow all noisy messages that are from RequestLoggingMiddleware when the log level is on Information or above.

* Added a common loading component to the app. Have yet to refactor all screens to use this.

* Bump json5 from 2.2.0 to 2.2.3 in /UI/Web

Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Alrigned all the loading messages and styles throughout the app

* Webtoon reader will use max width of all images to ensure images align well.

* On Original scaling mode, users can use the keyboard to scroll around the images without pagination kicking off.

* Removed console logs

* Fixed a public vs private issue

* Fixed an issue around some cached files getting locked due to NetVips holding them during file size calculations.

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Joe Milazzo 2023-01-07 09:14:22 -06:00 committed by GitHub
parent 22442d745c
commit 2464a30bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 367 additions and 390 deletions

View file

@ -1,4 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -32,6 +33,7 @@ public interface IReaderService
Task MarkChaptersUntilAsRead(AppUser user, int seriesId, float chapterNumber);
Task MarkVolumesUntilAsRead(AppUser user, int seriesId, int volumeNumber);
HourEstimateRangeDto GetTimeEstimate(long wordCount, int pageCount, bool isEpub);
IDictionary<int, int> GetPairs(IEnumerable<FileDimensionDto> dimensions);
}
public class ReaderService : IReaderService
@ -285,17 +287,17 @@ public class ReaderService : IReaderService
/// <returns></returns>
public async Task<int> CapPageToChapter(int chapterId, int page)
{
if (page < 0)
{
page = 0;
}
var totalPages = await _unitOfWork.ChapterRepository.GetChapterTotalPagesAsync(chapterId);
if (page > totalPages)
{
page = totalPages;
}
if (page < 0)
{
page = 0;
}
return page;
}
@ -610,6 +612,49 @@ public class ReaderService : IReaderService
};
}
/// <summary>
/// This is used exclusively for double page renderer. The goal is to break up all files into pairs respecting the reader.
/// wide images should count as 2 pages.
/// </summary>
/// <param name="dimensions"></param>
/// <returns></returns>
public IDictionary<int, int> GetPairs(IEnumerable<FileDimensionDto> dimensions)
{
var pairs = new Dictionary<int, int>();
var files = dimensions.ToList();
if (files.Count == 0) return pairs;
var pairStart = true;
var previousPage = files[0];
pairs.Add(previousPage.PageNumber, previousPage.PageNumber);
foreach(var dimension in files.Skip(1))
{
if (dimension.IsWide)
{
pairs.Add(dimension.PageNumber, dimension.PageNumber);
pairStart = true;
}
else
{
if (previousPage.IsWide || previousPage.PageNumber == 0)
{
pairs.Add(dimension.PageNumber, dimension.PageNumber);
pairStart = true;
}
else
{
pairs.Add(dimension.PageNumber, pairStart ? dimension.PageNumber - 1 : dimension.PageNumber);
pairStart = !pairStart;
}
}
previousPage = dimension;
}
return pairs;
}
/// <summary>
/// Formats a Chapter name based on the library it's in
/// </summary>