* Series Detail Enhancements # Added - Added: Volume tab for `Comic` Library Types - Added: Storyline tab for `Comic` and `Manga` library types. This will show Volumes and Chapters together sorted in order. # Changed - Changed: Changed `Chapters/Issues` to show all chapters or issues regardless of if they are in a volume for both `Manga` and `Comic` library types * Removed 3 loops to speed up load time * Refactored some library type checks. Reset selection on nav change. * Refactored hasReadingProgress for a series to the backend and further optimized the series detail page. * Fixed up the regex for "Annual" special case and added unit tests. Co-authored-by: Joseph Milazzo <joseph.v.milazzo@gmail.com>
205 lines
7.5 KiB
TypeScript
205 lines
7.5 KiB
TypeScript
import { HttpClient } from '@angular/common/http';
|
|
import { Injectable } from '@angular/core';
|
|
import { environment } from 'src/environments/environment';
|
|
import { ChapterInfo } from '../manga-reader/_models/chapter-info';
|
|
import { UtilityService } from '../shared/_services/utility.service';
|
|
import { Chapter } from '../_models/chapter';
|
|
import { PageBookmark } from '../_models/page-bookmark';
|
|
import { ProgressBookmark } from '../_models/progress-bookmark';
|
|
import { Volume } from '../_models/volume';
|
|
|
|
@Injectable({
|
|
providedIn: 'root'
|
|
})
|
|
export class ReaderService {
|
|
|
|
baseUrl = environment.apiUrl;
|
|
|
|
// Override background color for reader and restore it onDestroy
|
|
private originalBodyColor!: string;
|
|
|
|
constructor(private httpClient: HttpClient, private utilityService: UtilityService) { }
|
|
|
|
bookmark(seriesId: number, volumeId: number, chapterId: number, page: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/bookmark', {seriesId, volumeId, chapterId, page});
|
|
}
|
|
|
|
unbookmark(seriesId: number, volumeId: number, chapterId: number, page: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/unbookmark', {seriesId, volumeId, chapterId, page});
|
|
}
|
|
|
|
getAllBookmarks() {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/get-all-bookmarks');
|
|
}
|
|
|
|
getBookmarks(chapterId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/get-bookmarks?chapterId=' + chapterId);
|
|
}
|
|
|
|
getBookmarksForVolume(volumeId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/get-volume-bookmarks?volumeId=' + volumeId);
|
|
}
|
|
|
|
getBookmarksForSeries(seriesId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/get-series-bookmarks?seriesId=' + seriesId);
|
|
}
|
|
|
|
clearBookmarks(seriesId: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/remove-bookmarks', {seriesId});
|
|
}
|
|
|
|
getProgress(chapterId: number) {
|
|
return this.httpClient.get<ProgressBookmark>(this.baseUrl + 'reader/get-progress?chapterId=' + chapterId);
|
|
}
|
|
|
|
getPageUrl(chapterId: number, page: number) {
|
|
return this.baseUrl + 'reader/image?chapterId=' + chapterId + '&page=' + page;
|
|
}
|
|
|
|
getChapterInfo(chapterId: number) {
|
|
return this.httpClient.get<ChapterInfo>(this.baseUrl + 'reader/chapter-info?chapterId=' + chapterId);
|
|
}
|
|
|
|
saveProgress(seriesId: number, volumeId: number, chapterId: number, page: number, bookScrollId: string | null = null) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/progress', {seriesId, volumeId, chapterId, pageNum: page, bookScrollId});
|
|
}
|
|
|
|
markVolumeRead(seriesId: number, volumeId: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-volume-read', {seriesId, volumeId});
|
|
}
|
|
|
|
markMultipleRead(seriesId: number, volumeIds: Array<number>, chapterIds?: Array<number>) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-multiple-read', {seriesId, volumeIds, chapterIds});
|
|
}
|
|
|
|
markMultipleUnread(seriesId: number, volumeIds: Array<number>, chapterIds?: Array<number>) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-multiple-unread', {seriesId, volumeIds, chapterIds});
|
|
}
|
|
|
|
markMultipleSeriesRead(seriesIds: Array<number>) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-multiple-series-read', {seriesIds});
|
|
}
|
|
|
|
markMultipleSeriesUnread(seriesIds: Array<number>) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-multiple-series-unread', {seriesIds});
|
|
}
|
|
|
|
markVolumeUnread(seriesId: number, volumeId: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/mark-volume-unread', {seriesId, volumeId});
|
|
}
|
|
|
|
|
|
getNextChapter(seriesId: number, volumeId: number, currentChapterId: number, readingListId: number = -1) {
|
|
if (readingListId > 0) {
|
|
return this.httpClient.get<number>(this.baseUrl + 'readinglist/next-chapter?seriesId=' + seriesId + '¤tChapterId=' + currentChapterId + '&readingListId=' + readingListId);
|
|
}
|
|
return this.httpClient.get<number>(this.baseUrl + 'reader/next-chapter?seriesId=' + seriesId + '&volumeId=' + volumeId + '¤tChapterId=' + currentChapterId);
|
|
}
|
|
|
|
getPrevChapter(seriesId: number, volumeId: number, currentChapterId: number, readingListId: number = -1) {
|
|
if (readingListId > 0) {
|
|
return this.httpClient.get<number>(this.baseUrl + 'readinglist/prev-chapter?seriesId=' + seriesId + '¤tChapterId=' + currentChapterId + '&readingListId=' + readingListId);
|
|
}
|
|
return this.httpClient.get<number>(this.baseUrl + 'reader/prev-chapter?seriesId=' + seriesId + '&volumeId=' + volumeId + '¤tChapterId=' + currentChapterId);
|
|
}
|
|
|
|
hasSeriesProgress(seriesId: number) {
|
|
return this.httpClient.get<boolean>(this.baseUrl + 'reader/has-progress?seriesId=' + seriesId);
|
|
}
|
|
|
|
getCurrentChapter(seriesId: number) {
|
|
return this.httpClient.get<Chapter>(this.baseUrl + 'reader/continue-point?seriesId=' + seriesId);
|
|
}
|
|
|
|
/**
|
|
* Captures current body color and forces background color to be black. Call @see resetOverrideStyles() on destroy of component to revert changes
|
|
*/
|
|
setOverrideStyles() {
|
|
const bodyNode = document.querySelector('body');
|
|
if (bodyNode !== undefined && bodyNode !== null) {
|
|
this.originalBodyColor = bodyNode.style.background;
|
|
bodyNode.setAttribute('style', 'background-color: black !important');
|
|
}
|
|
}
|
|
|
|
resetOverrideStyles() {
|
|
const bodyNode = document.querySelector('body');
|
|
if (bodyNode !== undefined && bodyNode !== null && this.originalBodyColor !== undefined) {
|
|
bodyNode.style.background = this.originalBodyColor;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parses out the page number from a Image src url
|
|
* @param imageSrc Src attribute of Image
|
|
* @returns
|
|
*/
|
|
imageUrlToPageNum(imageSrc: string) {
|
|
if (imageSrc === undefined || imageSrc === '') { return -1; }
|
|
return parseInt(imageSrc.split('&page=')[1], 10);
|
|
}
|
|
|
|
getNextChapterUrl(url: string, nextChapterId: number, incognitoMode: boolean = false, readingListMode: boolean = false, readingListId: number = -1) {
|
|
const lastSlashIndex = url.lastIndexOf('/');
|
|
let newRoute = url.substring(0, lastSlashIndex + 1) + nextChapterId + '';
|
|
newRoute += this.getQueryParams(incognitoMode, readingListMode, readingListId);
|
|
return newRoute;
|
|
}
|
|
|
|
|
|
getQueryParamsObject(incognitoMode: boolean = false, readingListMode: boolean = false, readingListId: number = -1) {
|
|
let params: {[key: string]: any} = {};
|
|
if (incognitoMode) {
|
|
params['incognitoMode'] = true;
|
|
}
|
|
if (readingListMode) {
|
|
params['readingListId'] = readingListId;
|
|
}
|
|
return params;
|
|
}
|
|
|
|
getQueryParams(incognitoMode: boolean = false, readingListMode: boolean = false, readingListId: number = -1) {
|
|
let params = '';
|
|
if (incognitoMode) {
|
|
params += '?incognitoMode=true';
|
|
}
|
|
if (readingListMode) {
|
|
if (params.indexOf('?') > 0) {
|
|
params += '&readingListId=' + readingListId;
|
|
} else {
|
|
params += '?readingListId=' + readingListId;
|
|
}
|
|
}
|
|
return params;
|
|
}
|
|
|
|
enterFullscreen(el: Element, callback?: VoidFunction) {
|
|
if (!document.fullscreenElement) {
|
|
if (el.requestFullscreen) {
|
|
el.requestFullscreen().then(() => {
|
|
if (callback) {
|
|
callback();
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
exitFullscreen(callback?: VoidFunction) {
|
|
if (document.exitFullscreen && this.checkFullscreenMode()) {
|
|
document.exitFullscreen().then(() => {
|
|
if (callback) {
|
|
callback();
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @returns If document is in fullscreen mode
|
|
*/
|
|
checkFullscreenMode() {
|
|
return document.fullscreenElement != null;
|
|
}
|
|
}
|