From ef77474e33155439075c354a0196572c0e1366f5 Mon Sep 17 00:00:00 2001
From: Joseph Milazzo <joseph.v.milazzo@gmail.com>
Date: Fri, 6 Jun 2025 05:23:10 -0500
Subject: [PATCH] Updated Matched Metadat to have a library type filter, given
 that a user might want to do just Comics or Manga at a time.

---
 .../KavitaPlus/Manage/ManageMatchFilterDto.cs |  4 +++
 .../ExternalSeriesMetadataRepository.cs       |  1 +
 .../_models/kavitaplus/manage-match-filter.ts |  2 ++
 UI/Web/src/app/_models/library/library.ts     |  2 ++
 .../manage-matched-metadata.component.html    | 13 ++++++++--
 .../manage-matched-metadata.component.ts      | 26 ++++++++++++-------
 .../library-settings-modal.component.ts       | 13 +++++++---
 .../preference-nav.component.ts               |  1 +
 UI/Web/src/assets/langs/en.json               |  2 ++
 9 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs
index 8eb38c98a..c394cf8d4 100644
--- a/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs
+++ b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs
@@ -15,5 +15,9 @@ public enum MatchStateOption
 public sealed record ManageMatchFilterDto
 {
     public MatchStateOption MatchStateOption { get; set; } = MatchStateOption.All;
+    /// <summary>
+    /// Library Type in int form. -1 indicates to ignore the field.
+    /// </summary>
+    public int LibraryType { get; set; } = -1;
     public string SearchTerm { get; set; } = string.Empty;
 }
diff --git a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs
index 617e8537f..377344a3c 100644
--- a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs
+++ b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs
@@ -234,6 +234,7 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor
             .Include(s => s.ExternalSeriesMetadata)
             .Where(s => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(s.Library.Type))
             .Where(s => s.Library.AllowMetadataMatching)
+            .WhereIf(filter.LibraryType >= 0, s => s.Library.Type == (LibraryType) filter.LibraryType)
             .FilterMatchState(filter.MatchStateOption)
             .OrderBy(s => s.NormalizedName)
             .ProjectTo<ManageMatchSeriesDto>(_mapper.ConfigurationProvider)
diff --git a/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts
index a8dc1ce06..05a4041c8 100644
--- a/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts
+++ b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts
@@ -1,6 +1,8 @@
 import {MatchStateOption} from "./match-state-option";
+import {LibraryType} from "../library/library";
 
 export interface ManageMatchFilter {
   matchStateOption: MatchStateOption;
+  libraryType: LibraryType | -1;
   searchTerm: string;
 }
diff --git a/UI/Web/src/app/_models/library/library.ts b/UI/Web/src/app/_models/library/library.ts
index 06ba86cf2..cb152471e 100644
--- a/UI/Web/src/app/_models/library/library.ts
+++ b/UI/Web/src/app/_models/library/library.ts
@@ -13,6 +13,8 @@ export enum LibraryType {
 }
 
 export const allLibraryTypes = [LibraryType.Manga, LibraryType.ComicVine, LibraryType.Comic, LibraryType.Book, LibraryType.LightNovel, LibraryType.Images];
+export const allKavitaPlusMetadataApplicableTypes = [LibraryType.Manga, LibraryType.LightNovel, LibraryType.ComicVine, LibraryType.Comic];
+export const allKavitaPlusEligibleTypes = [LibraryType.Manga, LibraryType.LightNovel];
 
 export interface Library {
     id: number;
diff --git a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html
index 60f494f38..2ae9ea45b 100644
--- a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html
+++ b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.html
@@ -3,8 +3,17 @@
 
   <form [formGroup]="filterGroup">
     <div class="row g-0">
-      <div class="col-auto ms-auto">
-        <label for="match-filter">Match State</label>
+      <div class="col-auto ms-auto me-3">
+        <label for="libtype-filter">{{t('library-type')}}</label>
+        <select class="form-select" formControlName="libraryType" id="libtype-filter">
+          <option [value]="-1">{{t('all-status-label')}}</option>
+          @for(libType of allLibraryTypes; track libType) {
+            <option [value]="libType">{{libType | libraryType}}</option>
+          }
+        </select>
+      </div>
+      <div class="col-auto">
+        <label for="match-filter">{{t('matched-state-label')}}</label>
         <select class="form-select" formControlName="matchState" id="match-filter">
           @for(state of allMatchStates; track state) {
             <option [value]="state">{{state | matchStateOption}}</option>
diff --git a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.ts b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.ts
index 1fb7b5dee..223b309da 100644
--- a/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.ts
+++ b/UI/Web/src/app/admin/manage-matched-metadata/manage-matched-metadata.component.ts
@@ -21,20 +21,23 @@ import {LibraryNamePipe} from "../../_pipes/library-name.pipe";
 import {AsyncPipe} from "@angular/common";
 import {EVENTS, MessageHubService} from "../../_services/message-hub.service";
 import {ScanSeriesEvent} from "../../_models/events/scan-series-event";
+import {LibraryTypePipe} from "../../_pipes/library-type.pipe";
+import {allKavitaPlusMetadataApplicableTypes} from "../../_models/library/library";
 
 @Component({
   selector: 'app-manage-matched-metadata',
   imports: [
-      TranslocoDirective,
-      ImageComponent,
-      VirtualScrollerModule,
-      ReactiveFormsModule,
-      MatchStateOptionPipe,
-      UtcToLocalTimePipe,
-      DefaultValuePipe,
-      NgxDatatableModule,
-      LibraryNamePipe,
-      AsyncPipe,
+    TranslocoDirective,
+    ImageComponent,
+    VirtualScrollerModule,
+    ReactiveFormsModule,
+    MatchStateOptionPipe,
+    UtcToLocalTimePipe,
+    DefaultValuePipe,
+    NgxDatatableModule,
+    LibraryNamePipe,
+    AsyncPipe,
+    LibraryTypePipe,
   ],
   templateUrl: './manage-matched-metadata.component.html',
   styleUrl: './manage-matched-metadata.component.scss',
@@ -44,6 +47,7 @@ export class ManageMatchedMetadataComponent implements OnInit {
   protected readonly ColumnMode = ColumnMode;
   protected readonly MatchStateOption = MatchStateOption;
   protected readonly allMatchStates = allMatchStates.filter(m => m !== MatchStateOption.Matched); // Matched will have too many
+  protected readonly allLibraryTypes = allKavitaPlusMetadataApplicableTypes;
 
   private readonly licenseService = inject(LicenseService);
   private readonly actionService = inject(ActionService);
@@ -58,6 +62,7 @@ export class ManageMatchedMetadataComponent implements OnInit {
   data: Array<ManageMatchSeries> = [];
   filterGroup = new FormGroup({
     'matchState': new FormControl(MatchStateOption.Error, []),
+    'libraryType': new FormControl(-1, []), // Denotes all
   });
 
   ngOnInit() {
@@ -99,6 +104,7 @@ export class ManageMatchedMetadataComponent implements OnInit {
   loadData() {
     const filter: ManageMatchFilter = {
       matchStateOption: parseInt(this.filterGroup.get('matchState')!.value + '', 10),
+      libraryType: parseInt(this.filterGroup.get('libraryType')!.value + '', 10),
       searchTerm: ''
     };
 
diff --git a/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts
index 36b10e648..d23b203d5 100644
--- a/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts
+++ b/UI/Web/src/app/sidenav/_modals/library-settings-modal/library-settings-modal.component.ts
@@ -20,7 +20,13 @@ import {
 } from 'src/app/admin/_modals/directory-picker/directory-picker.component';
 import {ConfirmService} from 'src/app/shared/confirm.service';
 import {Breakpoint, UtilityService} from 'src/app/shared/_services/utility.service';
-import {allLibraryTypes, Library, LibraryType} from 'src/app/_models/library/library';
+import {
+  allKavitaPlusEligibleTypes,
+  allKavitaPlusMetadataApplicableTypes,
+  allLibraryTypes,
+  Library,
+  LibraryType
+} from 'src/app/_models/library/library';
 import {ImageService} from 'src/app/_services/image.service';
 import {LibraryService} from 'src/app/_services/library.service';
 import {UploadService} from 'src/app/_services/upload.service';
@@ -125,13 +131,12 @@ export class LibrarySettingsModalComponent implements OnInit {
 
   get IsKavitaPlusEligible() {
     const libType = parseInt(this.libraryForm.get('type')?.value + '', 10) as LibraryType;
-    return libType === LibraryType.Manga || libType === LibraryType.LightNovel;
+    return allKavitaPlusEligibleTypes.includes(libType);
   }
 
   get IsMetadataDownloadEligible() {
     const libType = parseInt(this.libraryForm.get('type')?.value + '', 10) as LibraryType;
-    return libType === LibraryType.Manga || libType === LibraryType.LightNovel
-      || libType === LibraryType.ComicVine || libType === LibraryType.Comic;
+    return allKavitaPlusMetadataApplicableTypes.includes(libType);
   }
 
   ngOnInit(): void {
diff --git a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts
index 6574fe945..a35fb011e 100644
--- a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts
+++ b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.ts
@@ -190,6 +190,7 @@ export class PreferenceNavComponent implements AfterViewInit {
       } else {
         return this.manageService.getAllKavitaPlusSeries({
           matchStateOption: MatchStateOption.Error,
+          libraryType: -1,
           searchTerm: ''
         }).pipe(
           takeUntilDestroyed(this.destroyRef),
diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json
index a1242ef52..027ea1cf0 100644
--- a/UI/Web/src/assets/langs/en.json
+++ b/UI/Web/src/assets/langs/en.json
@@ -773,6 +773,8 @@
         "library-name-header": "Library",
         "valid-until-header": "Next Refresh",
         "actions-header": "Actions",
+        "library-type": "Library Type",
+        "matched-state-label": "Match State",
         "matched-status-label": "Matched",
         "unmatched-status-label": "Not Matched",
         "blacklist-status-label": "Needs Manual Match",