diff --git a/API/Controllers/SettingsController.cs b/API/Controllers/SettingsController.cs index e2d77d674..3f12a059d 100644 --- a/API/Controllers/SettingsController.cs +++ b/API/Controllers/SettingsController.cs @@ -572,8 +572,8 @@ public class SettingsController : BaseApiController existingMetadataSetting.AgeRatingMappings = dto.AgeRatingMappings ?? []; - existingMetadataSetting.Blacklist = dto.Blacklist.DistinctBy(d => d.ToNormalized()).ToList() ?? []; - existingMetadataSetting.Whitelist = dto.Whitelist.DistinctBy(d => d.ToNormalized()).ToList() ?? []; + existingMetadataSetting.Blacklist = dto.Blacklist.Where(s => !string.IsNullOrWhiteSpace(s)).DistinctBy(d => d.ToNormalized()).ToList() ?? []; + existingMetadataSetting.Whitelist = dto.Whitelist.Where(s => !string.IsNullOrWhiteSpace(s)).DistinctBy(d => d.ToNormalized()).ToList() ?? []; existingMetadataSetting.Overrides = dto.Overrides.ToList() ?? []; // Handle Field Mappings diff --git a/API/DTOs/Stats/V3/ServerInfoV3Dto.cs b/API/DTOs/Stats/V3/ServerInfoV3Dto.cs index edc2ad2b4..0bf95403f 100644 --- a/API/DTOs/Stats/V3/ServerInfoV3Dto.cs +++ b/API/DTOs/Stats/V3/ServerInfoV3Dto.cs @@ -55,6 +55,11 @@ public class ServerInfoV3Dto /// /// This pings a health check and does not capture any IP Information public long TimeToPingKavitaStatsApi { get; set; } + /// + /// If using the downloading metadata feature + /// + /// Kavita+ Only + public bool MatchedMetadataEnabled { get; set; } diff --git a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs index d7b6c11bf..6f5730d93 100644 --- a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs +++ b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs @@ -36,7 +36,7 @@ public interface IExternalSeriesMetadataRepository Task GetSeriesDetailPlusDto(int seriesId); Task LinkRecommendationsToSeries(Series series); Task IsBlacklistedSeries(int seriesId); - Task> GetAllSeriesIdsWithoutMetadata(int limit); + Task> GetSeriesThatNeedExternalMetadata(int limit, bool includeStaleData = false); Task> GetAllSeries(ManageMatchFilterDto filter); } @@ -209,11 +209,13 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor } - public async Task> GetAllSeriesIdsWithoutMetadata(int limit) + public async Task> GetSeriesThatNeedExternalMetadata(int limit, bool includeStaleData = false) { return await _context.Series .Where(s => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(s.Library.Type)) - .Where(s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc < DateTime.UtcNow) + .WhereIf(includeStaleData, s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc < DateTime.UtcNow) + .Where(s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc == DateTime.MinValue) + .Where(s => s.Library.AllowMetadataMatching) .OrderByDescending(s => s.Library.Type) .ThenBy(s => s.NormalizedName) .Select(s => s.Id) diff --git a/API/Extensions/FlurlExtensions.cs b/API/Extensions/FlurlExtensions.cs index 38e75fbc8..67d201afb 100644 --- a/API/Extensions/FlurlExtensions.cs +++ b/API/Extensions/FlurlExtensions.cs @@ -18,4 +18,16 @@ public static class FlurlExtensions .WithHeader("Content-Type", "application/json") .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)); } + + public static IFlurlRequest WithBasicHeaders(this string request, string apiKey) + { + return request + .WithHeader("Accept", "application/json") + .WithHeader("User-Agent", "Kavita") + .WithHeader("x-api-key", apiKey) + .WithHeader("x-installId", HashUtil.ServerToken()) + .WithHeader("x-kavita-version", BuildInfo.Version) + .WithHeader("Content-Type", "application/json") + .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)); + } } diff --git a/API/Extensions/QueryExtensions/QueryableExtensions.cs b/API/Extensions/QueryExtensions/QueryableExtensions.cs index d6fef254e..8c8640be4 100644 --- a/API/Extensions/QueryExtensions/QueryableExtensions.cs +++ b/API/Extensions/QueryExtensions/QueryableExtensions.cs @@ -294,7 +294,7 @@ public static class QueryableExtensions MatchStateOption.NotMatched => query. Include(s => s.ExternalSeriesMetadata) .Where(s => (s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc == DateTime.MinValue) && !s.IsBlacklisted && !s.DontMatch), - MatchStateOption.Error => query.Where(s => s.IsBlacklisted), + MatchStateOption.Error => query.Where(s => s.IsBlacklisted && !s.DontMatch), MatchStateOption.DontMatch => query.Where(s => s.DontMatch), _ => query }; diff --git a/API/Services/Plus/ExternalMetadataService.cs b/API/Services/Plus/ExternalMetadataService.cs index 055a5fc28..8705fc028 100644 --- a/API/Services/Plus/ExternalMetadataService.cs +++ b/API/Services/Plus/ExternalMetadataService.cs @@ -44,8 +44,8 @@ public interface IExternalMetadataService /// /// /// - /// - Task FetchSeriesMetadata(int seriesId, LibraryType libraryType); + /// If the fetch was made + Task FetchSeriesMetadata(int seriesId, LibraryType libraryType); Task> GetStacksForUser(int userId); Task> MatchSeries(MatchSeriesDto dto); @@ -73,6 +73,7 @@ public class ExternalMetadataService : IExternalMetadataService }; // Allow 50 requests per 24 hours private static readonly RateLimiter RateLimiter = new RateLimiter(50, TimeSpan.FromHours(24), false); + static bool IsRomanCharacters(string input) => Regex.IsMatch(input, @"^[\p{IsBasicLatin}\p{IsLatin-1Supplement}]+$"); public ExternalMetadataService(IUnitOfWork unitOfWork, ILogger logger, IMapper mapper, ILicenseService licenseService, IScrobblingService scrobblingService, IEventHub eventHub, ICoverDbService coverDbService) @@ -109,7 +110,7 @@ public class ExternalMetadataService : IExternalMetadataService public async Task FetchExternalDataTask() { // Find all Series that are eligible and limit - var ids = await _unitOfWork.ExternalSeriesMetadataRepository.GetAllSeriesIdsWithoutMetadata(25); + var ids = await _unitOfWork.ExternalSeriesMetadataRepository.GetSeriesThatNeedExternalMetadata(25); if (ids.Count == 0) return; _logger.LogInformation("[Kavita+ Data Refresh] Started Refreshing {Count} series data from Kavita+", ids.Count); @@ -118,9 +119,9 @@ public class ExternalMetadataService : IExternalMetadataService foreach (var seriesId in ids) { var libraryType = libTypes[seriesId]; - await FetchSeriesMetadata(seriesId, libraryType); + var success = await FetchSeriesMetadata(seriesId, libraryType); + if (success) count++; await Task.Delay(1500); - count++; } _logger.LogInformation("[Kavita+ Data Refresh] Finished Refreshing {Count} series data from Kavita+", count); } @@ -131,10 +132,10 @@ public class ExternalMetadataService : IExternalMetadataService /// /// /// - public async Task FetchSeriesMetadata(int seriesId, LibraryType libraryType) + public async Task FetchSeriesMetadata(int seriesId, LibraryType libraryType) { - if (!IsPlusEligible(libraryType)) return; - if (!await _licenseService.HasActiveLicense()) return; + if (!IsPlusEligible(libraryType)) return false; + if (!await _licenseService.HasActiveLicense()) return false; // Generate key based on seriesId and libraryType or any unique identifier for the request // Check if the request is allowed based on the rate limit @@ -142,14 +143,14 @@ public class ExternalMetadataService : IExternalMetadataService { // Request not allowed due to rate limit _logger.LogDebug("Rate Limit hit for Kavita+ prefetch"); - return; + return false; } _logger.LogDebug("Prefetching Kavita+ data for Series {SeriesId}", seriesId); // Prefetch SeriesDetail data await GetSeriesDetailPlus(seriesId, libraryType); - + return true; } public async Task> GetStacksForUser(int userId) @@ -512,31 +513,43 @@ public class ExternalMetadataService : IExternalMetadataService var madeModification = false; - if (settings.EnableLocalizedName && (!series.LocalizedNameLocked || settings.HasOverride(MetadataSettingField.LocalizedName))) + if (settings.EnableLocalizedName && (settings.HasOverride(MetadataSettingField.LocalizedName) + || !series.LocalizedNameLocked && !string.IsNullOrWhiteSpace(series.LocalizedName))) { // We need to make the best appropriate guess if (externalMetadata.Name == series.Name) { // Choose closest (usually last) synonym - series.LocalizedName = externalMetadata.Synonyms.Last(); + var validSynonyms = externalMetadata.Synonyms + .Where(IsRomanCharacters) + .Where(s => s.ToNormalized() != series.Name.ToNormalized()) + .ToList(); + if (validSynonyms.Count != 0) + { + series.LocalizedName = validSynonyms[^1]; + series.LocalizedNameLocked = true; + } } - else + else if (IsRomanCharacters(externalMetadata.Name)) { series.LocalizedName = externalMetadata.Name; + series.LocalizedNameLocked = true; } + madeModification = true; } - if (settings.EnableSummary && (!series.Metadata.SummaryLocked || - settings.HasOverride(MetadataSettingField.Summary))) + if (settings.EnableSummary && (settings.HasOverride(MetadataSettingField.Summary) || + (!series.Metadata.SummaryLocked && !string.IsNullOrWhiteSpace(series.Metadata.Summary)))) { series.Metadata.Summary = CleanSummary(externalMetadata.Summary); madeModification = true; } - if (settings.EnableStartDate && externalMetadata.StartDate.HasValue && (!series.Metadata.ReleaseYearLocked || - settings.HasOverride(MetadataSettingField.StartDate))) + if (settings.EnableStartDate && externalMetadata.StartDate.HasValue && (settings.HasOverride(MetadataSettingField.StartDate) || + (!series.Metadata.ReleaseYearLocked && + series.Metadata.ReleaseYear == 0))) { series.Metadata.ReleaseYear = externalMetadata.StartDate.Value.Year; madeModification = true; diff --git a/API/Services/SeriesService.cs b/API/Services/SeriesService.cs index 37051f98d..38e75c2a3 100644 --- a/API/Services/SeriesService.cs +++ b/API/Services/SeriesService.cs @@ -382,10 +382,12 @@ public class SeriesService : ISeriesService // Check if the person exists in the dictionary if (existingPeopleDictionary.TryGetValue(normalizedPersonName, out var p)) { + // TODO: Should I add more controls here to map back? if (personDto.AniListId > 0 && p.AniListId <= 0 && p.AniListId != personDto.AniListId) { p.AniListId = personDto.AniListId; } + p.Description = string.IsNullOrEmpty(p.Description) ? personDto.Description : p.Description; continue; // If we ever want to update metadata for existing people, we'd do it here } diff --git a/API/Services/Tasks/StatsService.cs b/API/Services/Tasks/StatsService.cs index 4faf55436..2e3a0f43c 100644 --- a/API/Services/Tasks/StatsService.cs +++ b/API/Services/Tasks/StatsService.cs @@ -13,14 +13,17 @@ using API.DTOs.Stats; using API.DTOs.Stats.V3; using API.Entities; using API.Entities.Enums; +using API.Extensions; using API.Services.Plus; using API.Services.Tasks.Scanner.Parser; using Flurl.Http; +using Kavita.Common; using Kavita.Common.EnvironmentInfo; using Kavita.Common.Helpers; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; namespace API.Services.Tasks; @@ -45,12 +48,12 @@ public class StatsService : IStatsService private readonly UserManager _userManager; private readonly IEmailService _emailService; private readonly ICacheService _cacheService; - private const string ApiUrl = "https://stats.kavitareader.com"; + private readonly string _apiUrl = ""; private const string ApiKey = "MsnvA2DfQqxSK5jh"; // It's not important this is public, just a way to keep bots from hitting the API willy-nilly public StatsService(ILogger logger, IUnitOfWork unitOfWork, DataContext context, ILicenseService licenseService, UserManager userManager, IEmailService emailService, - ICacheService cacheService) + ICacheService cacheService, IHostEnvironment environment) { _logger = logger; _unitOfWork = unitOfWork; @@ -60,7 +63,9 @@ public class StatsService : IStatsService _emailService = emailService; _cacheService = cacheService; - FlurlConfiguration.ConfigureClientForUrl(ApiUrl); + FlurlConfiguration.ConfigureClientForUrl(Configuration.StatsApiUrl); + + _apiUrl = environment.IsDevelopment() ? "http://localhost:5001" : Configuration.StatsApiUrl; } /// @@ -98,13 +103,8 @@ public class StatsService : IStatsService try { - var response = await (ApiUrl + "/api/v3/stats") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(30)) + var response = await (_apiUrl + "/api/v3/stats") + .WithBasicHeaders(ApiKey) .PostJsonAsync(data); if (response.StatusCode != StatusCodes.Status200OK) @@ -151,12 +151,8 @@ public class StatsService : IStatsService try { - var response = await (ApiUrl + "/api/v2/stats/opt-out?installId=" + installId) - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") + var response = await (_apiUrl + "/api/v2/stats/opt-out?installId=" + installId) + .WithBasicHeaders(ApiKey) .WithTimeout(TimeSpan.FromSeconds(30)) .PostAsync(); @@ -180,12 +176,8 @@ public class StatsService : IStatsService try { var sw = Stopwatch.StartNew(); - var response = await (ApiUrl + "/api/health/") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") + var response = await (Configuration.StatsApiUrl + "/api/health/") + .WithBasicHeaders(ApiKey) .WithTimeout(TimeSpan.FromSeconds(30)) .GetAsync(); @@ -244,6 +236,7 @@ public class StatsService : IStatsService private async Task GetStatV3Payload() { var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + var mediaSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings(); var dto = new ServerInfoV3Dto() { InstallId = serverSettings.InstallId, @@ -256,6 +249,7 @@ public class StatsService : IStatsService DotnetVersion = Environment.Version.ToString(), OpdsEnabled = serverSettings.EnableOpds, EncodeMediaAs = serverSettings.EncodeMediaAs, + MatchedMetadataEnabled = mediaSettings.Enabled }; dto.OsLocale = CultureInfo.CurrentCulture.EnglishName; diff --git a/Kavita.Common/Configuration.cs b/Kavita.Common/Configuration.cs index ca0fc40ec..00ec84d06 100644 --- a/Kavita.Common/Configuration.cs +++ b/Kavita.Common/Configuration.cs @@ -17,6 +17,7 @@ public static class Configuration private static readonly string AppSettingsFilename = Path.Join("config", GetAppSettingFilename()); public static string KavitaPlusApiUrl = "https://plus.kavitareader.com"; + public static string StatsApiUrl = "https://stats.kavitareader.com"; public static int Port { diff --git a/README.md b/README.md index a2aa1ac8e..1ea5a94ca 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ your reading collection with your friends and family! - Rich web readers supporting webtoon, continuous reading mode (continue without leaving the reader), virtual pages (epub), etc - Ability to customize your dashboard and side nav with smart filters, custom order and visibility toggles - Full Localization Support +- Ability to download metadata (available via [Kavita+](https://wiki.kavitareader.com/kavita+)) ## Support diff --git a/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts index 6c1d70478..77166a22a 100644 --- a/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts +++ b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts @@ -70,8 +70,10 @@ export class MatchSeriesModalComponent implements OnInit { const model: any = this.formGroup.value; model.seriesId = this.series.id; + const dontMatchChanged = this.series.dontMatch !== model.dontMatch; + // We need to update the dontMatch status - if (model.dontMatch) { + if (dontMatchChanged) { this.seriesService.updateDontMatch(this.series.id, model.dontMatch).subscribe(_ => { this.modalService.close(true); }); diff --git a/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html b/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html index 60d930100..60b62a9c4 100644 --- a/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html +++ b/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html @@ -37,7 +37,7 @@ [limit]="pageInfo.size" > - + {{t('last-modified-header')}} @@ -46,7 +46,7 @@ - + {{t('type-header')}} @@ -55,7 +55,7 @@ - + {{t('series-header')}} @@ -64,7 +64,7 @@ - + {{t('data-header')}} @@ -98,7 +98,7 @@ - + {{t('is-processed-header')}} diff --git a/UI/Web/src/app/admin/edit-user/edit-user.component.html b/UI/Web/src/app/admin/edit-user/edit-user.component.html index ef0e608cb..cbcaad08b 100644 --- a/UI/Web/src/app/admin/edit-user/edit-user.component.html +++ b/UI/Web/src/app/admin/edit-user/edit-user.component.html @@ -50,8 +50,12 @@ } } + } + @if (isEmailInvalid$ | async) { +
{{t('invalid-email-warning')}}
+ } } diff --git a/UI/Web/src/app/admin/edit-user/edit-user.component.ts b/UI/Web/src/app/admin/edit-user/edit-user.component.ts index 4de2e5205..4d787c4f0 100644 --- a/UI/Web/src/app/admin/edit-user/edit-user.component.ts +++ b/UI/Web/src/app/admin/edit-user/edit-user.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, Input, OnInit} from '@angular/core'; import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; import {AgeRestriction} from 'src/app/_models/metadata/age-restriction'; @@ -9,23 +9,28 @@ import {SentenceCasePipe} from '../../_pipes/sentence-case.pipe'; import {RestrictionSelectorComponent} from '../../user-settings/restriction-selector/restriction-selector.component'; import {LibrarySelectorComponent} from '../library-selector/library-selector.component'; import {RoleSelectorComponent} from '../role-selector/role-selector.component'; -import {NgIf} from '@angular/common'; +import {AsyncPipe, NgIf} from '@angular/common'; import {TranslocoDirective} from "@jsverse/transloco"; +import {debounceTime, distinctUntilChanged, Observable, startWith, switchMap, tap} from "rxjs"; +import {map} from "rxjs/operators"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; const AllowedUsernameCharacters = /^[\sa-zA-Z0-9\-._@+/\s]*$/; +const EmailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; @Component({ selector: 'app-edit-user', templateUrl: './edit-user.component.html', styleUrls: ['./edit-user.component.scss'], standalone: true, - imports: [ReactiveFormsModule, NgIf, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, SentenceCasePipe, TranslocoDirective], + imports: [ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, SentenceCasePipe, TranslocoDirective, AsyncPipe], changeDetection: ChangeDetectionStrategy.OnPush }) export class EditUserComponent implements OnInit { private readonly accountService = inject(AccountService); private readonly cdRef = inject(ChangeDetectorRef); + private readonly destroyRef = inject(DestroyRef); protected readonly modal = inject(NgbActiveModal); @Input({required: true}) member!: Member; @@ -36,6 +41,7 @@ export class EditUserComponent implements OnInit { isSaving: boolean = false; userForm: FormGroup = new FormGroup({}); + isEmailInvalid$!: Observable; allowedCharacters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+/'; @@ -47,9 +53,17 @@ export class EditUserComponent implements OnInit { ngOnInit(): void { - this.userForm.addControl('email', new FormControl(this.member.email, [Validators.required, Validators.email])); + this.userForm.addControl('email', new FormControl(this.member.email, [Validators.required])); this.userForm.addControl('username', new FormControl(this.member.username, [Validators.required, Validators.pattern(AllowedUsernameCharacters)])); + this.isEmailInvalid$ = this.userForm.get('email')!.valueChanges.pipe( + startWith(this.member.email), + distinctUntilChanged(), + debounceTime(10), + map(value => !EmailRegex.test(value)), + takeUntilDestroyed(this.destroyRef) + ); + this.selectedRestriction = this.member.ageRestriction; this.cdRef.markForCheck(); } diff --git a/UI/Web/src/app/admin/email-history/email-history.component.html b/UI/Web/src/app/admin/email-history/email-history.component.html index 9ab6645ae..30dac8463 100644 --- a/UI/Web/src/app/admin/email-history/email-history.component.html +++ b/UI/Web/src/app/admin/email-history/email-history.component.html @@ -9,7 +9,7 @@ [footerHeight]="50" > - + {{t('template-header')}} @@ -19,7 +19,7 @@ - + {{t('date-header')}} @@ -28,7 +28,7 @@ - + {{t('user-header')}} @@ -37,7 +37,7 @@ - + {{t('sent-header')}} 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 07129cfba..60f494f38 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 @@ -24,7 +24,7 @@ [footerHeight]="50" > - + {{t('series-name-header')}} @@ -34,7 +34,7 @@ - + {{t('library-name-header')}} @@ -43,8 +43,7 @@ - - + {{t('status-header')}} @@ -64,20 +63,22 @@ - - - {{t('valid-until-header')}} - - - @if (item.series.isBlacklisted || item.series.dontMatch || !item.isMatched) { - {{null | defaultValue}} - } @else { - {{item.validUntilUtc | utcToLocalTime}} - } - - + @if (filterGroup.get('matchState')?.value === MatchStateOption.Matched) { + + + {{t('valid-until-header')}} + + + @if (item.series.isBlacklisted || item.series.dontMatch || !item.isMatched) { + {{null | defaultValue}} + } @else { + {{item.validUntilUtc | utcToLocalTime}} + } + + + } - + {{t('actions-header')}} 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 25a38b960..bdcbe1d7b 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 @@ -45,6 +45,7 @@ import {ScanSeriesEvent} from "../../_models/events/scan-series-event"; }) 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 private readonly licenseService = inject(LicenseService); @@ -119,7 +120,8 @@ export class ManageMatchedMetadataComponent implements OnInit { fixMatch(series: Series) { this.actionService.matchSeries(series, result => { if (!result) return; - this.loadData().subscribe(); + this.data = [...this.data.filter(s => s.series.id !== series.id)]; + this.cdRef.markForCheck(); }); } } diff --git a/UI/Web/src/app/admin/manage-media-issues/manage-media-issues.component.html b/UI/Web/src/app/admin/manage-media-issues/manage-media-issues.component.html index 59f135682..e9fb8b49b 100644 --- a/UI/Web/src/app/admin/manage-media-issues/manage-media-issues.component.html +++ b/UI/Web/src/app/admin/manage-media-issues/manage-media-issues.component.html @@ -21,7 +21,7 @@ [limit]="15" > - + {{t('file-header')}} @@ -31,7 +31,7 @@ - + {{t('comment-header')}} @@ -40,7 +40,7 @@ - + {{t('created-header')}} diff --git a/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts b/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts index bd6426dda..b1719fdf5 100644 --- a/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts +++ b/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts @@ -16,8 +16,7 @@ import {AgeRatingDto} from "../../_models/metadata/age-rating-dto"; import {MetadataFieldMapping, MetadataFieldType} from "../_models/metadata-settings"; import {PersonRole} from "../../_models/metadata/person"; import {PersonRolePipe} from "../../_pipes/person-role.pipe"; -import {NgClass} from "@angular/common"; -import {allMetadataSettingField} from "../_models/metadata-setting-field"; +import {allMetadataSettingField, MetadataSettingField} from "../_models/metadata-setting-field"; import {MetadataSettingFiledPipe} from "../../_pipes/metadata-setting-filed.pipe"; @@ -94,7 +93,7 @@ export class ManageMetadataSettingsComponent implements OnInit { this.settingsForm.addControl('overrides', this.fb.group( Object.fromEntries( - this.allMetadataSettingFields.map((role, index) => [ + this.allMetadataSettingFields.map((role: MetadataSettingField, index: number) => [ `override_${index}`, this.fb.control((settings.overrides || []).includes(role)), ]) @@ -182,8 +181,8 @@ export class ManageMetadataSettingsComponent implements OnInit { ...model, ageRatingMappings, fieldMappings: withFieldMappings ? fieldMappings : [], - blacklist: (model.blacklist || '').split(',').map((item: string) => item.trim()), - whitelist: (model.whitelist || '').split(',').map((item: string) => item.trim()), + blacklist: (model.blacklist || '').split(',').map((item: string) => item.trim()).filter((tag: string) => tag.length > 0), + whitelist: (model.whitelist || '').split(',').map((item: string) => item.trim()).filter((tag: string) => tag.length > 0), personRoles: Object.entries(this.settingsForm.get('personRoles')!.value) .filter(([_, value]) => value) .map(([key, _]) => this.personRoles[parseInt(key.split('_')[1], 10)]), diff --git a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html index b2e8db72d..7b1d9659f 100644 --- a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html +++ b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html @@ -24,7 +24,7 @@ [limit]="15" > - + {{t('series-header')}} @@ -34,7 +34,7 @@ - + {{t('created-header')}} @@ -43,7 +43,7 @@ - + {{t('comment-header')}} diff --git a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html index f404efa87..554ff34a1 100644 --- a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html +++ b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html @@ -160,7 +160,7 @@ [limit]="15" > - + {{t('job-title-header')}} @@ -170,7 +170,7 @@ - + {{t('last-executed-header')}} @@ -179,7 +179,7 @@ - + {{t('cron-header')}} diff --git a/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html index 9f5c83d02..982a77e84 100644 --- a/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html +++ b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html @@ -11,7 +11,7 @@ [footerHeight]="50" > - + {{t('username-header')}} @@ -21,7 +21,7 @@ - + {{t('anilist-header')}} @@ -34,7 +34,7 @@ - + {{t('mal-header')}} diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html index 255c4ccda..5572e89d1 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html @@ -122,7 +122,7 @@ [allowToggle]="false" (toggle)="switchTabsToDetail()"> - {{item.name}} + {{item.name}} diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts index 8ad9a82d0..d74dc5e94 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts @@ -1173,4 +1173,6 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { } }, 10); } + + protected readonly encodeURIComponent = encodeURIComponent; } diff --git a/UI/Web/src/app/shared/person-badge/person-badge.component.html b/UI/Web/src/app/shared/person-badge/person-badge.component.html index 6f95ef85f..4b1eebb02 100644 --- a/UI/Web/src/app/shared/person-badge/person-badge.component.html +++ b/UI/Web/src/app/shared/person-badge/person-badge.component.html @@ -1,11 +1,11 @@ @if (person !== undefined) { - +
@if (HasCoverImage) {
-
@@ -17,7 +17,7 @@ [limit]="15" > - + {{t('name-label')}} @@ -27,7 +27,7 @@ - + {{t('email-label')}} @@ -36,7 +36,7 @@ - + {{t('platform-label')}} diff --git a/UI/Web/src/app/user-settings/manage-devices/manage-devices.component.ts b/UI/Web/src/app/user-settings/manage-devices/manage-devices.component.ts index 86173f8d5..994ee1088 100644 --- a/UI/Web/src/app/user-settings/manage-devices/manage-devices.component.ts +++ b/UI/Web/src/app/user-settings/manage-devices/manage-devices.component.ts @@ -8,16 +8,10 @@ import { import { Device } from 'src/app/_models/device/device'; import { DeviceService } from 'src/app/_services/device.service'; import { DevicePlatformPipe } from '../../_pipes/device-platform.pipe'; -import { SentenceCasePipe } from '../../_pipes/sentence-case.pipe'; -import {NgbCollapse, NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {translate, TranslocoDirective} from "@jsverse/transloco"; import {SettingsService} from "../../admin/settings.service"; import {ConfirmService} from "../../shared/confirm.service"; -import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; -import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; -import {ScrobbleEventTypePipe} from "../../_pipes/scrobble-event-type.pipe"; -import {SortableHeader} from "../../_single-module/table/_directives/sortable-header.directive"; -import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; import {EditDeviceModalComponent} from "../_modals/edit-device-modal/edit-device-modal.component"; import {DefaultModalOptions} from "../../_models/default-modal-options"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; @@ -25,7 +19,7 @@ import {map} from "rxjs"; import {shareReplay} from "rxjs/operators"; import {AccountService} from "../../_services/account.service"; import {ColumnMode, NgxDatatableModule} from "@siemens/ngx-datatable"; -import {AsyncPipe, TitleCasePipe} from "@angular/common"; +import {AsyncPipe} from "@angular/common"; @Component({ selector: 'app-manage-devices', @@ -33,8 +27,7 @@ import {AsyncPipe, TitleCasePipe} from "@angular/common"; styleUrls: ['./manage-devices.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [NgbCollapse, SentenceCasePipe, DevicePlatformPipe, TranslocoDirective, SettingItemComponent, - DefaultValuePipe, ScrobbleEventTypePipe, SortableHeader, UtcToLocalTimePipe, AsyncPipe, NgxDatatableModule, TitleCasePipe] + imports: [DevicePlatformPipe, TranslocoDirective, AsyncPipe, NgxDatatableModule] }) export class ManageDevicesComponent implements OnInit { diff --git a/UI/Web/src/app/user-settings/user-holds/scrobbling-holds.component.html b/UI/Web/src/app/user-settings/user-holds/scrobbling-holds.component.html index 4912e7442..80e0d5662 100644 --- a/UI/Web/src/app/user-settings/user-holds/scrobbling-holds.component.html +++ b/UI/Web/src/app/user-settings/user-holds/scrobbling-holds.component.html @@ -11,7 +11,7 @@ [footerHeight]="50" > - + {{t('series-name-header')}} @@ -22,7 +22,7 @@ - + {{t('created-header')}} @@ -31,7 +31,7 @@ - + diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 67e74d80e..afa17e68c 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -24,7 +24,7 @@ "username": "{{common.username}}", "required": "{{validation.required-field}}", "email": "{{common.email}}", - "not-valid-email": "{{validation.valid-email}}", + "invalid-email-warning": "A non-valid email will block some functionalities of Kavita", "cancel": "{{common.cancel}}", "saving": "Saving…", "update": "Update", @@ -821,8 +821,7 @@ "first-last-name-tooltip": "Ensure People's names are written First then Last", "person-roles-label": "Roles", "overrides-label": "Overrides", - "overrides-description": "Allow Kavita to write over locked fields" - + "overrides-description": "Allow Kavita to write over locked fields." }, "book-line-overlay": { diff --git a/openapi.json b/openapi.json index ab22e3a25..33c00de85 100644 --- a/openapi.json +++ b/openapi.json @@ -2,7 +2,7 @@ "openapi": "3.0.1", "info": { "title": "Kavita", - "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.4.11", + "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.4.12", "license": { "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"