
* 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>
289 lines
10 KiB
TypeScript
289 lines
10 KiB
TypeScript
import {
|
|
ChangeDetectionStrategy,
|
|
ChangeDetectorRef,
|
|
Component,
|
|
DestroyRef,
|
|
inject,
|
|
Input,
|
|
OnInit
|
|
} from '@angular/core';
|
|
import { Router } from '@angular/router';
|
|
import {
|
|
NgbActiveOffcanvas,
|
|
NgbNav,
|
|
NgbNavContent,
|
|
NgbNavItem,
|
|
NgbNavLink,
|
|
NgbNavOutlet
|
|
} from '@ng-bootstrap/ng-bootstrap';
|
|
import { ToastrService } from 'ngx-toastr';
|
|
import { Observable, of, map, shareReplay } from 'rxjs';
|
|
import { DownloadService } from 'src/app/shared/_services/download.service';
|
|
import { Breakpoint, UtilityService } from 'src/app/shared/_services/utility.service';
|
|
import { Chapter } from 'src/app/_models/chapter';
|
|
import { ChapterMetadata } from 'src/app/_models/metadata/chapter-metadata';
|
|
import { Device } from 'src/app/_models/device/device';
|
|
import { LibraryType } from 'src/app/_models/library';
|
|
import { MangaFile } from 'src/app/_models/manga-file';
|
|
import { MangaFormat } from 'src/app/_models/manga-format';
|
|
import { Volume } from 'src/app/_models/volume';
|
|
import { AccountService } from 'src/app/_services/account.service';
|
|
import { ActionItem, ActionFactoryService, Action } from 'src/app/_services/action-factory.service';
|
|
import { ActionService } from 'src/app/_services/action.service';
|
|
import { ImageService } from 'src/app/_services/image.service';
|
|
import { LibraryService } from 'src/app/_services/library.service';
|
|
import { ReaderService } from 'src/app/_services/reader.service';
|
|
import { SeriesService } from 'src/app/_services/series.service';
|
|
import { UploadService } from 'src/app/_services/upload.service';
|
|
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
|
|
import {CommonModule} from "@angular/common";
|
|
import {EntityTitleComponent} from "../entity-title/entity-title.component";
|
|
import {ImageComponent} from "../../shared/image/image.component";
|
|
import {ReadMoreComponent} from "../../shared/read-more/read-more.component";
|
|
import {EntityInfoCardsComponent} from "../entity-info-cards/entity-info-cards.component";
|
|
import {CoverImageChooserComponent} from "../cover-image-chooser/cover-image-chooser.component";
|
|
import {ChapterMetadataDetailComponent} from "../chapter-metadata-detail/chapter-metadata-detail.component";
|
|
import {DefaultDatePipe} from "../../pipe/default-date.pipe";
|
|
import {BytesPipe} from "../../pipe/bytes.pipe";
|
|
import {BadgeExpanderComponent} from "../../shared/badge-expander/badge-expander.component";
|
|
import {TagBadgeComponent} from "../../shared/tag-badge/tag-badge.component";
|
|
import {PersonBadgeComponent} from "../../shared/person-badge/person-badge.component";
|
|
import {TranslocoDirective, TranslocoService} from "@ngneat/transloco";
|
|
import {CardActionablesComponent} from "../../_single-module/card-actionables/card-actionables.component";
|
|
|
|
enum TabID {
|
|
General = 0,
|
|
Metadata = 1,
|
|
Cover = 2,
|
|
Files = 3
|
|
}
|
|
|
|
@Component({
|
|
selector: 'app-card-detail-drawer',
|
|
standalone: true,
|
|
imports: [CommonModule, EntityTitleComponent, NgbNav, NgbNavItem, NgbNavLink, NgbNavContent, ImageComponent, ReadMoreComponent, EntityInfoCardsComponent, CoverImageChooserComponent, ChapterMetadataDetailComponent, CardActionablesComponent, DefaultDatePipe, BytesPipe, NgbNavOutlet, BadgeExpanderComponent, TagBadgeComponent, PersonBadgeComponent, TranslocoDirective],
|
|
templateUrl: './card-detail-drawer.component.html',
|
|
styleUrls: ['./card-detail-drawer.component.scss'],
|
|
changeDetection: ChangeDetectionStrategy.OnPush
|
|
})
|
|
export class CardDetailDrawerComponent implements OnInit {
|
|
|
|
@Input() parentName = '';
|
|
@Input() seriesId: number = 0;
|
|
@Input() libraryId: number = 0;
|
|
@Input({required: true}) data!: Volume | Chapter;
|
|
private readonly destroyRef = inject(DestroyRef);
|
|
private readonly translocoService = inject(TranslocoService);
|
|
|
|
|
|
/**
|
|
* If this is a volume, this will be first chapter for said volume.
|
|
*/
|
|
chapter!: Chapter;
|
|
isChapter = false;
|
|
chapters: Chapter[] = [];
|
|
|
|
imageUrls: Array<string> = [];
|
|
/**
|
|
* Cover image for the entity
|
|
*/
|
|
coverImageUrl!: string;
|
|
|
|
isAdmin$: Observable<boolean> = of(false);
|
|
|
|
|
|
actions: ActionItem<any>[] = [];
|
|
chapterActions: ActionItem<Chapter>[] = [];
|
|
libraryType: LibraryType = LibraryType.Manga;
|
|
|
|
|
|
tabs = [
|
|
{title: 'general-tab', disabled: false},
|
|
{title: 'metadata-tab', disabled: false},
|
|
{title: 'cover-tab', disabled: false},
|
|
{title: 'info-tab', disabled: false}
|
|
];
|
|
active = this.tabs[0];
|
|
|
|
chapterMetadata!: ChapterMetadata;
|
|
summary: string = '';
|
|
|
|
downloadInProgress: boolean = false;
|
|
|
|
get MangaFormat() {
|
|
return MangaFormat;
|
|
}
|
|
|
|
get Breakpoint() {
|
|
return Breakpoint;
|
|
}
|
|
|
|
get LibraryType() {
|
|
return LibraryType;
|
|
}
|
|
|
|
get TabID() {
|
|
return TabID;
|
|
}
|
|
|
|
constructor(public utilityService: UtilityService,
|
|
public imageService: ImageService, private uploadService: UploadService, private toastr: ToastrService,
|
|
private accountService: AccountService, private actionFactoryService: ActionFactoryService,
|
|
private actionService: ActionService, private router: Router, private libraryService: LibraryService,
|
|
private seriesService: SeriesService, private readerService: ReaderService,
|
|
public activeOffcanvas: NgbActiveOffcanvas, private downloadService: DownloadService, private readonly cdRef: ChangeDetectorRef) {
|
|
this.isAdmin$ = this.accountService.currentUser$.pipe(
|
|
takeUntilDestroyed(this.destroyRef),
|
|
map(user => (user && this.accountService.hasAdminRole(user)) || false),
|
|
shareReplay()
|
|
);
|
|
}
|
|
|
|
ngOnInit(): void {
|
|
this.imageUrls = this.chapters.map(c => this.imageService.getChapterCoverImage(c.id));
|
|
this.isChapter = this.utilityService.isChapter(this.data);
|
|
this.chapter = this.utilityService.isChapter(this.data) ? (this.data as Chapter) : (this.data as Volume).chapters[0];
|
|
|
|
this.seriesService.getChapterMetadata(this.chapter.id).subscribe(metadata => {
|
|
this.chapterMetadata = metadata;
|
|
this.cdRef.markForCheck();
|
|
});
|
|
|
|
if (this.isChapter) {
|
|
this.coverImageUrl = this.imageService.getChapterCoverImage(this.data.id);
|
|
this.summary = this.utilityService.asChapter(this.data).summary || '';
|
|
this.chapters.push(this.data as Chapter);
|
|
} else {
|
|
this.coverImageUrl = this.imageService.getVolumeCoverImage(this.data.id);
|
|
this.summary = this.utilityService.asVolume(this.data).chapters[0].summary || '';
|
|
this.chapters.push(...(this.data as Volume).chapters);
|
|
}
|
|
|
|
this.chapterActions = this.actionFactoryService.getChapterActions(this.handleChapterActionCallback.bind(this))
|
|
.filter(item => item.action !== Action.Edit);
|
|
this.chapterActions.push({title: 'Read', action: Action.Read, callback: this.handleChapterActionCallback.bind(this), requiresAdmin: false, children: []});
|
|
if (this.isChapter) {
|
|
const chapter = this.utilityService.asChapter(this.data);
|
|
this.chapterActions = this.actionFactoryService.filterSendToAction(this.chapterActions, chapter);
|
|
} else {
|
|
this.chapterActions = this.actionFactoryService.filterSendToAction(this.chapterActions, this.chapters[0]);
|
|
}
|
|
|
|
this.libraryService.getLibraryType(this.libraryId).subscribe(type => {
|
|
this.libraryType = type;
|
|
this.cdRef.markForCheck();
|
|
});
|
|
|
|
|
|
const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
|
|
this.chapters.forEach((c: Chapter) => {
|
|
c.files.sort((a: MangaFile, b: MangaFile) => collator.compare(a.filePath, b.filePath));
|
|
});
|
|
|
|
this.imageUrls = this.chapters.map(c => this.imageService.getChapterCoverImage(c.id));
|
|
|
|
this.cdRef.markForCheck();
|
|
}
|
|
|
|
|
|
close() {
|
|
this.activeOffcanvas.close();
|
|
}
|
|
|
|
formatChapterNumber(chapter: Chapter) {
|
|
if (chapter.number === '0') {
|
|
return '1';
|
|
}
|
|
return chapter.number;
|
|
}
|
|
|
|
performAction(action: ActionItem<any>, chapter: Chapter) {
|
|
if (typeof action.callback === 'function') {
|
|
action.callback(action, chapter);
|
|
}
|
|
}
|
|
|
|
applyCoverImage(coverUrl: string) {
|
|
this.uploadService.updateChapterCoverImage(this.chapter.id, coverUrl).subscribe(() => {});
|
|
}
|
|
|
|
resetCoverImage() {
|
|
this.uploadService.resetChapterCoverLock(this.chapter.id).subscribe(() => {
|
|
this.toastr.info(this.translocoService.translate('toasts.regen-cover'));
|
|
});
|
|
}
|
|
|
|
markChapterAsRead(chapter: Chapter) {
|
|
if (this.seriesId === 0) {
|
|
return;
|
|
}
|
|
|
|
this.actionService.markChapterAsRead(this.libraryId, this.seriesId, chapter, () => { this.cdRef.markForCheck(); });
|
|
}
|
|
|
|
markChapterAsUnread(chapter: Chapter) {
|
|
if (this.seriesId === 0) {
|
|
return;
|
|
}
|
|
|
|
this.actionService.markChapterAsUnread(this.libraryId, this.seriesId, chapter, () => { this.cdRef.markForCheck(); });
|
|
}
|
|
|
|
handleChapterActionCallback(action: ActionItem<Chapter>, chapter: Chapter) {
|
|
switch (action.action) {
|
|
case(Action.MarkAsRead):
|
|
this.markChapterAsRead(chapter);
|
|
break;
|
|
case(Action.MarkAsUnread):
|
|
this.markChapterAsUnread(chapter);
|
|
break;
|
|
case(Action.AddToReadingList):
|
|
this.actionService.addChapterToReadingList(chapter, this.seriesId);
|
|
break;
|
|
case (Action.IncognitoRead):
|
|
this.readChapter(chapter, true);
|
|
break;
|
|
case (Action.Download):
|
|
this.download(chapter);
|
|
break;
|
|
case (Action.Read):
|
|
this.readChapter(chapter, false);
|
|
break;
|
|
case (Action.SendTo):
|
|
{
|
|
const device = (action._extra!.data as Device);
|
|
this.actionService.sendToDevice([chapter.id], device);
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
readChapter(chapter: Chapter, incognito: boolean = false) {
|
|
if (chapter.pages === 0) {
|
|
this.toastr.error(this.translocoService.translate('toasts.no-pages'));
|
|
return;
|
|
}
|
|
|
|
const params = this.readerService.getQueryParamsObject(incognito, false);
|
|
this.router.navigate(this.readerService.getNavigationArray(this.libraryId, this.seriesId, chapter.id, chapter.files[0].format), {queryParams: params});
|
|
this.close();
|
|
}
|
|
|
|
download(chapter: Chapter) {
|
|
if (this.downloadInProgress) {
|
|
this.toastr.info(this.translocoService.translate('toasts.download-in-progress'));
|
|
return;
|
|
}
|
|
|
|
this.downloadInProgress = true;
|
|
this.cdRef.markForCheck();
|
|
this.downloadService.download('chapter', chapter, (d) => {
|
|
if (d) return;
|
|
this.downloadInProgress = false;
|
|
this.cdRef.markForCheck();
|
|
});
|
|
}
|
|
|
|
}
|