mirror of
https://github.com/Kareadita/Kavita.git
synced 2026-02-13 23:14:11 -05:00
* Implemented the first version of dynamic filtering which is all Extension based. * Implemented basic generic property filter for expanded metadata filtering. * Fixed up the code to allow for nested properties and fixed up the Contains to work only for IList's * Started refactoring for the new approach * More progress, need to rethink a few filters like read progress to be % based and people needs to be more explicit. * Refactored most of the existing filtering operations into dedicate extensions for the appropriate comparisons. People still need to be reworked to be more dynamic. * Fixed a bug with continue point where it fails on chapters or volumes tagged with a range * Wired up a basic api path to start building groups. No and/or support yet. * Started on the UI * Made a bit of progress on the UI as I'm putting the pieces together about how to design it. * Refactored names to make it more consistent. New thinking is we will have one row that will take a filter statement and manipulate it. It will emit said statement and a builder will turn into the higher level statement. * Started working on updating code to use new inject() method. * Fixed the code to switch the comparisons. * Added dynamic input structure in and moved add/remove to the builder. * Fixed an enum bug * Hooked in basic dropdown support that is dynamic to the field. Only language is missing as that needs a DTO change (but don't want to break API) * Fixed a bug where dropdown options wouldn't re-populate when switching fields that are both dropdowns * Started adding metadata builder * Fixed when typing on filter row the focus resetting * Refactored to add an additional component which handles the compounding of filter rows. * Started hooking up v2 dto in the UI to send to the backend. * Started working on building group UI for and/or support. * Lots of backend code fixes to ensure OR and AND statements combine correctly. * More trying to figure out how to write the UI code * Started debugging to remember what I was last doing. * Lots of progress towards building out the UI recursively * I got the dto to build and propagate up the chain * Started hooking up to the actual api to fetch the data. * Basic wire up to the backend is working. * HasName is now complete * Refactored SortOptions code into an extension and streamlined LimitTo to the correct place. * Fixed a bug where Library Filters from the Group weren't actually being taken into account. * Refactored a lot of code so builder will now export the full dto. * Cleaned up the data flow from metadata filter to library detail * Got the dropdown to load preset values on first load, but now it triggers twice. * Changed so when you add a new filter, it does it at top and fixed remove * Fixed the remove button being on the wrong row * Cleaned up the arrays to make it easier to manage * Cleaned up some of the backend to ensure it doesn't throw an incorrect exception * I'm starting to tread water, taking a break * Fixed a merge issue * Cleaned up Docker checks. * Default IpAddresses to empty string. * Refactored IsDocker to be completely static * Figured out the issue with the dropdown not working. * Almost got it, but the event isn't being called. * I think i might try something else. This doesn't seem to be working. * On the new implementation, implemented remove group. * Use enums to reduce copy/paste * the new system is working pretty well, ill go with it and move on. Can alwasy refactor. * Code is totally broken, but working the cache resume code with some hiccups. * I need to take a break * Stashing my broken code. I have an idea on how to serialize to the URL, but I need to rearchitect a lot. * Reverted last commit * remove domain * Fixed up some hardcoded caching. I'm giving up on this implementation and going to a simpler version * Refactored the backend to just allow flat filtering. * Started refactoring the components to make it flat filtering only. * Finished refactoring so that the base preset case will render. * Implemented basic query functionality on desktop. Clear needs some work and url code. * Some cleanup * Working on filtering url encode/decode * Interacting with filters now saves to url and can be reloaded from the url. Named filters is not hooked up. * Fixed a double load on the library detail page. * Moved the library filtering code out of the FilterBuilder as it needs to be handled differently. * Fixed up how we handle library statements in the filter. * Fixed up how links that perform a filter work. * Refactored a bunch of linking to a search page. * LimitTo works, my css however does not. * Switched some code to use localized strings. * Cleaned up some css * Hooked up Languages and put some additional code in so that Languages will return invalid Language codes back. * Removed a duplicate language signature. * Hooked up ability to preload collection tag. * Want To Read is converted * Converted lots of code to new filtering system. Need to do Bookmarks. * Fixed a potential bug with default filter creation. * Hooked up the ability to disable certain filter fields from appearing. * Added mobile drawer code and a hook for Robbie to take a look for some css. * Converted the APIs for dashboard along with other safety fixes to ensure bad data doesn't break any of the filtering apis * Added the backend code to handle summary query * Converted Want to Read api properly now. * Fixed the HasReadingProgress query * Hooked back the Reading Progress for legacy APIs * Fixed some bad localization strings * Wrote the filtering code for all-bookmarks. * OPDS is now using the new filter * Fixed OPDS reading lists and covers not sending their images. * Fixed up the OPDS feed and fixed a bug where libraries also weren't sending their images over OPDS * All but dropdown options have been validated and tested. * Fixed up some default cases for setting up the filter. * Sorted filter fields and re-keyed to be better suited based on user's needs. Fixed a bug where OPDS Series (from library view) wasn't showing the summary. Moved the (Format) from the title to the description to make the UX much better for OPDS. MOved * don't send empty summaries in the new summary formatting * Fixed up some default cases for setting up the filter. * Fixed the reset button * Fixed infinite scroller not having correct scope key * Added localization to the new components and removed old debug code * Styling fixes * Fixed deep linking across the app. Made it so you can click Characters from Reading list and open a filtered search. * A bit of styling for mobile * Don't show language if it's not properly set --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
325 lines
13 KiB
TypeScript
325 lines
13 KiB
TypeScript
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
import {DestroyRef, inject, Injectable} from '@angular/core';
|
|
import {Location} from '@angular/common';
|
|
import { Router } from '@angular/router';
|
|
import { environment } from 'src/environments/environment';
|
|
import { ChapterInfo } from '../manga-reader/_models/chapter-info';
|
|
import { Chapter } from '../_models/chapter';
|
|
import { HourEstimateRange } from '../_models/series-detail/hour-estimate-range';
|
|
import { MangaFormat } from '../_models/manga-format';
|
|
import { BookmarkInfo } from '../_models/manga-reader/bookmark-info';
|
|
import { PageBookmark } from '../_models/readers/page-bookmark';
|
|
import { ProgressBookmark } from '../_models/readers/progress-bookmark';
|
|
import { UtilityService } from '../shared/_services/utility.service';
|
|
import { FilterUtilitiesService } from '../shared/_services/filter-utilities.service';
|
|
import { FileDimension } from '../manga-reader/_models/file-dimension';
|
|
import screenfull from 'screenfull';
|
|
import { TextResonse } from '../_types/text-response';
|
|
import { AccountService } from './account.service';
|
|
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
|
|
import {PersonalToC} from "../_models/readers/personal-toc";
|
|
import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2";
|
|
|
|
export const CHAPTER_ID_DOESNT_EXIST = -1;
|
|
export const CHAPTER_ID_NOT_FETCHED = -2;
|
|
|
|
@Injectable({
|
|
providedIn: 'root'
|
|
})
|
|
export class ReaderService {
|
|
|
|
private readonly destroyRef = inject(DestroyRef);
|
|
baseUrl = environment.apiUrl;
|
|
encodedKey: string = '';
|
|
|
|
// Override background color for reader and restore it onDestroy
|
|
private originalBodyColor!: string;
|
|
|
|
constructor(private httpClient: HttpClient, private router: Router,
|
|
private location: Location, private utilityService: UtilityService,
|
|
private filterUtilityService: FilterUtilitiesService, private accountService: AccountService) {
|
|
this.accountService.currentUser$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(user => {
|
|
if (user) {
|
|
this.encodedKey = encodeURIComponent(user.apiKey);
|
|
}
|
|
});
|
|
}
|
|
|
|
|
|
getNavigationArray(libraryId: number, seriesId: number, chapterId: number, format: MangaFormat) {
|
|
if (format === undefined) format = MangaFormat.ARCHIVE;
|
|
|
|
if (format === MangaFormat.EPUB) {
|
|
return ['library', libraryId, 'series', seriesId, 'book', chapterId];
|
|
} else if (format === MangaFormat.PDF) {
|
|
return ['library', libraryId, 'series', seriesId, 'pdf', chapterId];
|
|
} else {
|
|
return ['library', libraryId, 'series', seriesId, 'manga', chapterId];
|
|
}
|
|
}
|
|
|
|
downloadPdf(chapterId: number) {
|
|
return `${this.baseUrl}reader/pdf?chapterId=${chapterId}&apiKey=${this.encodedKey}`;
|
|
}
|
|
|
|
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(filter: SeriesFilterV2 | undefined) {
|
|
return this.httpClient.post<PageBookmark[]>(this.baseUrl + 'reader/all-bookmarks', filter);
|
|
}
|
|
|
|
getBookmarks(chapterId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/chapter-bookmarks?chapterId=' + chapterId);
|
|
}
|
|
|
|
getBookmarksForVolume(volumeId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/volume-bookmarks?volumeId=' + volumeId);
|
|
}
|
|
|
|
getBookmarksForSeries(seriesId: number) {
|
|
return this.httpClient.get<PageBookmark[]>(this.baseUrl + 'reader/series-bookmarks?seriesId=' + seriesId);
|
|
}
|
|
|
|
clearBookmarks(seriesId: number) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/remove-bookmarks', {seriesId}, TextResonse);
|
|
}
|
|
clearMultipleBookmarks(seriesIds: Array<number>) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/bulk-remove-bookmarks', {seriesIds}, TextResonse);
|
|
}
|
|
|
|
/**
|
|
* Used exclusively for reading multiple bookmarks from a series
|
|
* @param seriesId
|
|
*/
|
|
getBookmarkInfo(seriesId: number) {
|
|
return this.httpClient.get<BookmarkInfo>(this.baseUrl + 'reader/bookmark-info?seriesId=' + 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}&apiKey=${this.encodedKey}&page=${page}`;
|
|
}
|
|
|
|
getThumbnailUrl(chapterId: number, page: number) {
|
|
return `${this.baseUrl}reader/thumbnail?chapterId=${chapterId}&apiKey=${this.encodedKey}&page=${page}`;
|
|
}
|
|
|
|
getBookmarkPageUrl(seriesId: number, apiKey: string, page: number) {
|
|
return this.baseUrl + 'reader/bookmark-image?seriesId=' + seriesId + '&page=' + page + '&apiKey=' + encodeURIComponent(apiKey);
|
|
}
|
|
|
|
getChapterInfo(chapterId: number, includeDimensions = false) {
|
|
return this.httpClient.get<ChapterInfo>(this.baseUrl + 'reader/chapter-info?chapterId=' + chapterId + '&includeDimensions=' + includeDimensions);
|
|
}
|
|
|
|
getFileDimensions(chapterId: number) {
|
|
return this.httpClient.get<Array<FileDimension>>(this.baseUrl + 'reader/file-dimensions?chapterId=' + chapterId);
|
|
}
|
|
|
|
saveProgress(libraryId: number, seriesId: number, volumeId: number, chapterId: number, page: number, bookScrollId: string | null = null) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/progress', {libraryId, 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);
|
|
}
|
|
|
|
getTimeLeft(seriesId: number) {
|
|
return this.httpClient.get<HourEstimateRange>(this.baseUrl + 'reader/time-left?seriesId=' + seriesId);
|
|
}
|
|
|
|
/**
|
|
* Captures current body color and forces background color to be black. Call @see resetOverrideStyles() on destroy of component to revert changes
|
|
*/
|
|
setOverrideStyles(backgroundColor: string = 'black') {
|
|
const bodyNode = document.querySelector('body');
|
|
if (bodyNode !== undefined && bodyNode !== null) {
|
|
this.originalBodyColor = bodyNode.style.background;
|
|
bodyNode.setAttribute('style', 'background-color: ' + backgroundColor + ' !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; }
|
|
const params = new URLSearchParams(new URL(imageSrc).search);
|
|
return parseInt(params.get('page') || '-1', 10);
|
|
}
|
|
|
|
imageUrlToChapterId(imageSrc: string) {
|
|
if (imageSrc === undefined || imageSrc === '') { return -1; }
|
|
const params = new URLSearchParams(new URL(imageSrc).search);
|
|
return parseInt(params.get('chapterId') || '-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;
|
|
}
|
|
|
|
toggleFullscreen(el: Element, callback?: VoidFunction) {
|
|
|
|
if (screenfull.isEnabled) {
|
|
screenfull.toggle();
|
|
}
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @returns If document is in fullscreen mode
|
|
*/
|
|
checkFullscreenMode() {
|
|
return document.fullscreenElement != null;
|
|
}
|
|
|
|
/**
|
|
* Closes the reader and causes a redirection
|
|
*/
|
|
closeReader(readingListMode: boolean = false, readingListId: number = 0) {
|
|
if (readingListMode) {
|
|
this.router.navigateByUrl('lists/' + readingListId);
|
|
} else {
|
|
this.location.back();
|
|
}
|
|
}
|
|
|
|
removePersonalToc(chapterId: number, pageNumber: number, title: string) {
|
|
return this.httpClient.delete(this.baseUrl + `reader/ptoc?chapterId=${chapterId}&pageNum=${pageNumber}&title=${encodeURIComponent(title)}`);
|
|
}
|
|
|
|
getPersonalToC(chapterId: number) {
|
|
return this.httpClient.get<Array<PersonalToC>>(this.baseUrl + 'reader/ptoc?chapterId=' + chapterId);
|
|
}
|
|
|
|
createPersonalToC(libraryId: number, seriesId: number, volumeId: number, chapterId: number, pageNumber: number, title: string, bookScrollId: string | null) {
|
|
return this.httpClient.post(this.baseUrl + 'reader/create-ptoc', {libraryId, seriesId, volumeId, chapterId, pageNumber, title, bookScrollId});
|
|
}
|
|
|
|
getElementFromXPath(path: string) {
|
|
const node = document.evaluate(path, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
|
if (node?.nodeType === Node.ELEMENT_NODE) {
|
|
return node as Element;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param element
|
|
* @param pureXPath Will ignore shortcuts like id('')
|
|
*/
|
|
getXPathTo(element: any, pureXPath = false): string {
|
|
if (element === null) return '';
|
|
if (!pureXPath) {
|
|
if (element.id !== '') { return 'id("' + element.id + '")'; }
|
|
if (element === document.body) { return element.tagName; }
|
|
}
|
|
|
|
|
|
let ix = 0;
|
|
const siblings = element.parentNode?.childNodes || [];
|
|
for (let sibling of siblings) {
|
|
if (sibling === element) {
|
|
return this.getXPathTo(element.parentNode) + '/' + element.tagName + '[' + (ix + 1) + ']';
|
|
}
|
|
if (sibling.nodeType === 1 && sibling.tagName === element.tagName) {
|
|
ix++;
|
|
}
|
|
|
|
}
|
|
return '';
|
|
}
|
|
}
|