AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UX Overhaul Part 2 (#3112)

Browse source 
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo 2024-08-16 19:37:12 -05:00 • committed by GitHub
parent 0247bc5012
commit 3d8aa2ad24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
192 changed files with 14808 additions and 1874 deletions
Download patch file Download diff file Expand all files Collapse all files

40
UI/Web/src/app/_services/reader.service.ts
View file

@ -19,6 +19,10 @@ import {PersonalToC} from "../_models/readers/personal-toc";
import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2";
import NoSleep from 'nosleep.js';
import {FullProgress} from "../_models/readers/full-progress";
import {Volume} from "../_models/volume";
import {UtilityService} from "../shared/_services/utility.service";
import {translate} from "@jsverse/transloco";
import {ToastrService} from "ngx-toastr";
export const CHAPTER_ID_DOESNT_EXIST = -1;
@ -30,6 +34,12 @@ export const CHAPTER_ID_NOT_FETCHED = -2;
export class ReaderService {
private readonly destroyRef = inject(DestroyRef);
private readonly utilityService = inject(UtilityService);
private readonly router = inject(Router);
private readonly location = inject(Location);
private readonly accountService = inject(AccountService);
private readonly toastr = inject(ToastrService);
baseUrl = environment.apiUrl;
encodedKey: string = '';
@ -38,9 +48,7 @@ export class ReaderService {
private noSleep = new NoSleep();
constructor(private httpClient: HttpClient, private router: Router,
private location: Location, private accountService: AccountService,
@Inject(DOCUMENT) private document: Document) {
constructor(private httpClient: HttpClient, @Inject(DOCUMENT) private document: Document) {
this.accountService.currentUser$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(user => {
if (user) {
this.encodedKey = encodeURIComponent(user.apiKey);
@ -353,4 +361,30 @@ export class ReaderService {
}
return '';
}
readVolume(libraryId: number, seriesId: number, volume: Volume, incognitoMode: boolean = false) {
if (volume.pagesRead < volume.pages && volume.pagesRead > 0) {
// Find the continue point chapter and load it
const unreadChapters = volume.chapters.filter(item => item.pagesRead < item.pages);
if (unreadChapters.length > 0) {
this.readChapter(libraryId, seriesId, unreadChapters[0], incognitoMode);
return;
}
this.readChapter(libraryId, seriesId, volume.chapters[0], incognitoMode);
return;
}
// Sort the chapters, then grab first if no reading progress
this.readChapter(libraryId, seriesId, [...volume.chapters].sort(this.utilityService.sortChapters)[0]);
}
readChapter(libraryId: number, seriesId: number, chapter: Chapter, incognitoMode: boolean = false) {
if (chapter.pages === 0) {
this.toastr.error(translate('series-detail.no-pages'));
return;
}
this.router.navigate(this.getNavigationArray(libraryId, seriesId, chapter.id, chapter.files[0].format),
{queryParams: {incognitoMode}});
}
}