Allow Ctrl+K to open Kavita's search window (--input-hint-border-color, --input-hint-text-color)

API/DTOs/KavitaPlus/ExternalMetadata/MatchSeriesRequestDto.cs

@@ -4,14 +4,18 @@ using API.DTOs.Scrobbling;
 namespace API.DTOs.KavitaPlus.ExternalMetadata;
 #nullable enable
 
+/// <summary>
+/// Represents a request to match some series from Kavita to an external id which K+ uses.
+/// </summary>
 internal sealed record MatchSeriesRequestDto
 {
-    public string SeriesName { get; set; }
+    public required string SeriesName { get; set; }
-    public ICollection<string> AlternativeNames { get; set; }
+    public ICollection<string> AlternativeNames { get; set; } = [];
     public int Year { get; set; } = 0;
-    public string Query { get; set; }
+    public string? Query { get; set; }
     public int? AniListId { get; set; }
     public long? MalId { get; set; }
     public string? HardcoverId { get; set; }
+    public int? CbrId { get; set; }
     public PlusMediaFormat Format { get; set; }
 }

API/Services/Plus/ExternalMetadataService.cs

@@ -226,7 +226,7 @@ public class ExternalMetadataService : IExternalMetadataService
             AlternativeNames = altNames.Where(s => !string.IsNullOrEmpty(s)).ToList(),
             Year = series.Metadata.ReleaseYear,
             AniListId = potentialAnilistId ?? ScrobblingService.GetAniListId(series),
-            MalId = potentialMalId ?? ScrobblingService.GetMalId(series),
+            MalId = potentialMalId ?? ScrobblingService.GetMalId(series)
         };
 
         var token = (await _unitOfWork.UserRepository.GetDefaultAdminUser()).AniListAccessToken;

UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.html

@@ -15,6 +15,10 @@
           } @else {
             <button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="resetField()"></button>
           }
+        } @else {
+          <div class="input-hint">
+            Ctrl+K
+          </div>
         }
       </div>
     </div>

UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss

@@ -9,6 +9,17 @@
     right: 5px;
 }
 
+.input-hint {
+  font-size: 0.8rem;
+  margin-top: 3px;
+  margin-bottom: 3px;
+  margin-right: 9px;
+  border: 1px solid var(--input-hint-border-color, lightgrey);
+  color: var(--input-hint-text-color);
+  border-radius: 4px;
+  padding: 2px;
+}
+
 
 .typeahead-input {
   border: 1px solid transparent;

UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.ts

@@ -100,7 +100,9 @@ export class GroupedTypeaheadComponent implements OnInit {
 
 
   hasFocus: boolean = false;
-  typeaheadForm: FormGroup = new FormGroup({});
+  typeaheadForm: FormGroup = new FormGroup({
+    typeahead: new FormControl('', []),
+  });
   includeChapterAndFiles: boolean = false;
   prevSearchTerm: string = '';
   searchSettingsForm = new FormGroup(({'includeExtras': new FormControl(false)}));
@@ -121,22 +123,37 @@ export class GroupedTypeaheadComponent implements OnInit {
     this.close();
   }
 
-  @HostListener('window:keydown', ['$event'])
+  @HostListener('document:keydown', ['$event'])
   handleKeyPress(event: KeyboardEvent) {
-    if (!this.hasFocus) { return; }
+
+    const isCtrlOrMeta = event.ctrlKey || event.metaKey;
+
 
     switch(event.key) {
       case KEY_CODES.ESC_KEY:
+        if (!this.hasFocus) { return; }
         this.close();
         event.stopPropagation();
         break;
+
+      case KEY_CODES.K:
+        if (isCtrlOrMeta) {
+          if (this.inputElem.nativeElement) {
+            event.preventDefault();
+            event.stopPropagation();
+
+            this.inputElem.nativeElement.focus();
+            this.inputElem.nativeElement.click();
+          }
+        }
+        break;
       default:
         break;
     }
   }
 
   ngOnInit(): void {
-    this.typeaheadForm.addControl('typeahead', new FormControl(this.initialValue, []));
+    this.typeaheadForm.get('typeahead')?.setValue(this.initialValue);
     this.cdRef.markForCheck();
 
     this.searchSettingsForm.get('includeExtras')!.valueChanges.pipe(

UI/Web/src/app/shared/_services/utility.service.ts

@@ -1,12 +1,12 @@
-import { HttpParams } from '@angular/common/http';
+import {HttpParams} from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
-import { Chapter } from 'src/app/_models/chapter';
+import {Chapter} from 'src/app/_models/chapter';
-import { LibraryType } from 'src/app/_models/library/library';
+import {LibraryType} from 'src/app/_models/library/library';
-import { MangaFormat } from 'src/app/_models/manga-format';
+import {MangaFormat} from 'src/app/_models/manga-format';
-import { PaginatedResult } from 'src/app/_models/pagination';
+import {PaginatedResult} from 'src/app/_models/pagination';
-import { Series } from 'src/app/_models/series';
+import {Series} from 'src/app/_models/series';
-import { Volume } from 'src/app/_models/volume';
+import {Volume} from 'src/app/_models/volume';
-import {translate, TranslocoService} from "@jsverse/transloco";
+import {translate} from "@jsverse/transloco";
 import {debounceTime, ReplaySubject, shareReplay} from "rxjs";
 
 export enum KEY_CODES {
@@ -21,6 +21,7 @@ export enum KEY_CODES {
   B = 'b',
   F = 'f',
   H = 'h',
+  K = 'k',
   BACKSPACE = 'Backspace',
   DELETE = 'Delete',
   SHIFT = 'Shift'

UI/Web/src/theme/themes/dark.scss

@@ -439,4 +439,8 @@
 
     /** Series Detail **/
     --detail-subtitle-color: lightgrey;
+
+    /** Search **/
+    --input-hint-border-color: #aeaeae;
+    --input-hint-text-color: lightgrey;
 }