mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-07-08 18:54:21 -04:00
A few more bug fixes (#3876)
Co-authored-by: Joseph Milazzo <joseph.v.milazzo@gmail.com>
This commit is contained in:
parent
4b9bbc5d78
commit
d909e03baf
@ -9,6 +9,7 @@ using API.DTOs;
|
||||
using API.DTOs.SeriesDetail;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Entities.Person;
|
||||
using API.Extensions;
|
||||
using API.Helpers;
|
||||
@ -208,6 +209,7 @@ public class ChapterController : BaseApiController
|
||||
if (chapter.AgeRating != dto.AgeRating)
|
||||
{
|
||||
chapter.AgeRating = dto.AgeRating;
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.AgeRating);
|
||||
}
|
||||
|
||||
dto.Summary ??= string.Empty;
|
||||
@ -215,6 +217,7 @@ public class ChapterController : BaseApiController
|
||||
if (chapter.Summary != dto.Summary.Trim())
|
||||
{
|
||||
chapter.Summary = dto.Summary.Trim();
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterSummary);
|
||||
}
|
||||
|
||||
if (chapter.Language != dto.Language)
|
||||
@ -230,11 +233,13 @@ public class ChapterController : BaseApiController
|
||||
if (chapter.TitleName != dto.TitleName)
|
||||
{
|
||||
chapter.TitleName = dto.TitleName;
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterTitle);
|
||||
}
|
||||
|
||||
if (chapter.ReleaseDate != dto.ReleaseDate)
|
||||
{
|
||||
chapter.ReleaseDate = dto.ReleaseDate;
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterReleaseDate);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(dto.ISBN) && ArticleNumberHelper.IsValidIsbn10(dto.ISBN) ||
|
||||
@ -333,6 +338,8 @@ public class ChapterController : BaseApiController
|
||||
_unitOfWork
|
||||
);
|
||||
|
||||
// TODO: Only remove field if changes were made
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterPublisher);
|
||||
// Update publishers
|
||||
await PersonHelper.UpdateChapterPeopleAsync(
|
||||
chapter,
|
||||
|
@ -6,6 +6,7 @@ using API.Data;
|
||||
using API.Data.Repositories;
|
||||
using API.DTOs.Koreader;
|
||||
using API.Entities;
|
||||
using API.Extensions;
|
||||
using API.Services;
|
||||
using Kavita.Common;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
@ -94,7 +95,7 @@ public class KoreaderController : BaseApiController
|
||||
{
|
||||
var userId = await GetUserId(apiKey);
|
||||
var response = await _koreaderService.GetProgress(ebookHash, userId);
|
||||
_logger.LogDebug("Koreader response progress: {Progress}", response.Progress);
|
||||
_logger.LogDebug("Koreader response progress for User ({UserId}): {Progress}", userId, response.Progress.Sanitize());
|
||||
|
||||
return Ok(response);
|
||||
}
|
||||
|
@ -14,6 +14,7 @@ using API.DTOs.Recommendation;
|
||||
using API.DTOs.SeriesDetail;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Extensions;
|
||||
using API.Helpers;
|
||||
using API.Services;
|
||||
@ -224,6 +225,7 @@ public class SeriesController : BaseApiController
|
||||
needsRefreshMetadata = true;
|
||||
series.CoverImage = null;
|
||||
series.CoverImageLocked = false;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Covers);
|
||||
_logger.LogDebug("[SeriesCoverImageBug] Setting Series Cover Image to null: {SeriesId}", series.Id);
|
||||
series.ResetColorScape();
|
||||
|
||||
|
@ -6,6 +6,7 @@ using API.Data;
|
||||
using API.Data.Repositories;
|
||||
using API.DTOs.Uploads;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Extensions;
|
||||
using API.Services;
|
||||
using API.Services.Tasks.Metadata;
|
||||
@ -112,8 +113,10 @@ public class UploadController : BaseApiController
|
||||
|
||||
series.CoverImage = filePath;
|
||||
series.CoverImageLocked = lockState;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Covers);
|
||||
_imageService.UpdateColorScape(series);
|
||||
_unitOfWork.SeriesRepository.Update(series);
|
||||
_unitOfWork.SeriesRepository.Update(series.Metadata);
|
||||
|
||||
if (_unitOfWork.HasChanges())
|
||||
{
|
||||
@ -277,6 +280,7 @@ public class UploadController : BaseApiController
|
||||
|
||||
chapter.CoverImage = filePath;
|
||||
chapter.CoverImageLocked = lockState;
|
||||
chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterCovers);
|
||||
_unitOfWork.ChapterRepository.Update(chapter);
|
||||
var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(chapter.VolumeId);
|
||||
if (volume != null)
|
||||
|
@ -4,7 +4,6 @@ using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using API.DTOs.KavitaPlus.Metadata;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Enums.UserPreferences;
|
||||
@ -18,7 +17,6 @@ using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.ChangeTracking;
|
||||
using Microsoft.EntityFrameworkCore.Diagnostics;
|
||||
|
||||
namespace API.Data;
|
||||
|
||||
@ -43,7 +41,7 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
public DbSet<ServerSetting> ServerSetting { get; set; } = null!;
|
||||
public DbSet<AppUserPreferences> AppUserPreferences { get; set; } = null!;
|
||||
public DbSet<SeriesMetadata> SeriesMetadata { get; set; } = null!;
|
||||
[Obsolete]
|
||||
[Obsolete("Use AppUserCollection")]
|
||||
public DbSet<CollectionTag> CollectionTag { get; set; } = null!;
|
||||
public DbSet<AppUserBookmark> AppUserBookmark { get; set; } = null!;
|
||||
public DbSet<ReadingList> ReadingList { get; set; } = null!;
|
||||
@ -72,7 +70,7 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
public DbSet<ExternalSeriesMetadata> ExternalSeriesMetadata { get; set; } = null!;
|
||||
public DbSet<ExternalRecommendation> ExternalRecommendation { get; set; } = null!;
|
||||
public DbSet<ManualMigrationHistory> ManualMigrationHistory { get; set; } = null!;
|
||||
[Obsolete]
|
||||
[Obsolete("Use IsBlacklisted field on Series")]
|
||||
public DbSet<SeriesBlacklist> SeriesBlacklist { get; set; } = null!;
|
||||
public DbSet<AppUserCollection> AppUserCollection { get; set; } = null!;
|
||||
public DbSet<ChapterPeople> ChapterPeople { get; set; } = null!;
|
||||
@ -286,6 +284,22 @@ public sealed class DataContext : IdentityDbContext<AppUser, AppRole, int,
|
||||
v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default),
|
||||
v => JsonSerializer.Deserialize<List<int>>(v, JsonSerializerOptions.Default) ?? new List<int>())
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
builder.Entity<SeriesMetadata>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasConversion(
|
||||
v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default),
|
||||
v => JsonSerializer.Deserialize<IList<MetadataSettingField>>(v, JsonSerializerOptions.Default) ??
|
||||
new List<MetadataSettingField>())
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
builder.Entity<Chapter>()
|
||||
.Property(sm => sm.KPlusOverrides)
|
||||
.HasConversion(
|
||||
v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default),
|
||||
v => JsonSerializer.Deserialize<IList<MetadataSettingField>>(v, JsonSerializerOptions.Default) ?? new List<MetadataSettingField>())
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue(new List<MetadataSettingField>());
|
||||
}
|
||||
|
||||
#nullable enable
|
||||
|
3721
API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.Designer.cs
generated
Normal file
3721
API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,40 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace API.Data.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class TrackKavitaPlusMetadata : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "KPlusOverrides",
|
||||
table: "SeriesMetadata",
|
||||
type: "TEXT",
|
||||
nullable: true,
|
||||
defaultValue: "[]");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "KPlusOverrides",
|
||||
table: "Chapter",
|
||||
type: "TEXT",
|
||||
nullable: true,
|
||||
defaultValue: "[]");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "KPlusOverrides",
|
||||
table: "SeriesMetadata");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "KPlusOverrides",
|
||||
table: "Chapter");
|
||||
}
|
||||
}
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using API.Data;
|
||||
using API.Entities.MetadataMatching;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
@ -957,6 +959,11 @@ namespace API.Data.Migrations
|
||||
b.Property<bool>("IsSpecial")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("KPlusOverrides")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue("[]");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
@ -1683,6 +1690,11 @@ namespace API.Data.Migrations
|
||||
b.Property<bool>("InkerLocked")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("KPlusOverrides")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("TEXT")
|
||||
.HasDefaultValue("[]");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
|
@ -387,8 +387,8 @@ public class PersonRepository : IPersonRepository
|
||||
|
||||
return await _context.Person
|
||||
.Includes(includes)
|
||||
.Where(p => EF.Functions.Like(p.Name, $"%{searchQuery}%")
|
||||
|| p.Aliases.Any(pa => EF.Functions.Like(pa.Alias, $"%{searchQuery}%")))
|
||||
.Where(p => EF.Functions.Like(p.NormalizedName, $"%{searchQuery}%")
|
||||
|| p.Aliases.Any(pa => EF.Functions.Like(pa.NormalizedAlias, $"%{searchQuery}%")))
|
||||
.ProjectTo<PersonDto>(_mapper.ConfigurationProvider)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
@ -82,6 +82,7 @@ public interface ISeriesRepository
|
||||
void Attach(Series series);
|
||||
void Attach(SeriesRelation relation);
|
||||
void Update(Series series);
|
||||
void Update(SeriesMetadata seriesMetadata);
|
||||
void Remove(Series series);
|
||||
void Remove(IEnumerable<Series> series);
|
||||
void Detach(Series series);
|
||||
@ -219,6 +220,11 @@ public class SeriesRepository : ISeriesRepository
|
||||
_context.Entry(series).State = EntityState.Modified;
|
||||
}
|
||||
|
||||
public void Update(SeriesMetadata seriesMetadata)
|
||||
{
|
||||
_context.Entry(seriesMetadata).State = EntityState.Modified;
|
||||
}
|
||||
|
||||
public void Remove(Series series)
|
||||
{
|
||||
_context.Series.Remove(series);
|
||||
|
@ -4,13 +4,14 @@ using System.Globalization;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Interfaces;
|
||||
using API.Entities.Metadata;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Entities.Person;
|
||||
using API.Extensions;
|
||||
using API.Services.Tasks.Scanner.Parser;
|
||||
|
||||
namespace API.Entities;
|
||||
|
||||
public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage
|
||||
public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage, IHasKPlusMetadata
|
||||
{
|
||||
public int Id { get; set; }
|
||||
/// <summary>
|
||||
@ -126,6 +127,11 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage
|
||||
public string WebLinks { get; set; } = string.Empty;
|
||||
public string ISBN { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Tracks which metadata has been set by K+
|
||||
/// </summary>
|
||||
public IList<MetadataSettingField> KPlusOverrides { get; set; } = [];
|
||||
|
||||
/// <summary>
|
||||
/// (Kavita+) Average rating from Kavita+ metadata
|
||||
/// </summary>
|
||||
|
12
API/Entities/Interfaces/IHasKPlusMetadata.cs
Normal file
12
API/Entities/Interfaces/IHasKPlusMetadata.cs
Normal file
@ -0,0 +1,12 @@
|
||||
using System.Collections.Generic;
|
||||
using API.Entities.MetadataMatching;
|
||||
|
||||
namespace API.Entities.Interfaces;
|
||||
|
||||
public interface IHasKPlusMetadata
|
||||
{
|
||||
/// <summary>
|
||||
/// Tracks which metadata has been set by K+
|
||||
/// </summary>
|
||||
public IList<MetadataSettingField> KPlusOverrides { get; set; }
|
||||
}
|
@ -4,13 +4,14 @@ using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Interfaces;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Entities.Person;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace API.Entities.Metadata;
|
||||
|
||||
[Index(nameof(Id), nameof(SeriesId), IsUnique = true)]
|
||||
public class SeriesMetadata : IHasConcurrencyToken
|
||||
public class SeriesMetadata : IHasConcurrencyToken, IHasKPlusMetadata
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
@ -42,6 +43,10 @@ public class SeriesMetadata : IHasConcurrencyToken
|
||||
/// </summary>
|
||||
/// <remarks>This is not populated from Chapters of the Series</remarks>
|
||||
public string WebLinks { get; set; } = string.Empty;
|
||||
/// <summary>
|
||||
/// Tracks which metadata has been set by K+
|
||||
/// </summary>
|
||||
public IList<MetadataSettingField> KPlusOverrides { get; set; } = [];
|
||||
|
||||
#region Locks
|
||||
|
||||
|
21
API/Extensions/IHasKPlusMetadataExtensions.cs
Normal file
21
API/Extensions/IHasKPlusMetadataExtensions.cs
Normal file
@ -0,0 +1,21 @@
|
||||
using API.Entities.Interfaces;
|
||||
using API.Entities.MetadataMatching;
|
||||
|
||||
namespace API.Extensions;
|
||||
|
||||
public static class IHasKPlusMetadataExtensions
|
||||
{
|
||||
|
||||
public static bool HasSetKPlusMetadata(this IHasKPlusMetadata hasKPlusMetadata, MetadataSettingField field)
|
||||
{
|
||||
return hasKPlusMetadata.KPlusOverrides.Contains(field);
|
||||
}
|
||||
|
||||
public static void AddKPlusOverride(this IHasKPlusMetadata hasKPlusMetadata, MetadataSettingField field)
|
||||
{
|
||||
if (hasKPlusMetadata.KPlusOverrides.Contains(field)) return;
|
||||
|
||||
hasKPlusMetadata.KPlusOverrides.Add(field);
|
||||
}
|
||||
|
||||
}
|
@ -2,6 +2,7 @@ using System.Threading.Tasks;
|
||||
using API.Data;
|
||||
using API.DTOs.Koreader;
|
||||
using API.DTOs.Progress;
|
||||
using API.Extensions;
|
||||
using API.Helpers;
|
||||
using API.Helpers.Builders;
|
||||
using Kavita.Common;
|
||||
@ -39,7 +40,7 @@ public class KoreaderService : IKoreaderService
|
||||
/// <param name="userId"></param>
|
||||
public async Task SaveProgress(KoreaderBookDto koreaderBookDto, int userId)
|
||||
{
|
||||
_logger.LogDebug("Saving Koreader progress for {UserId}: {KoreaderProgress}", userId, koreaderBookDto.Progress);
|
||||
_logger.LogDebug("Saving Koreader progress for User ({UserId}): {KoreaderProgress}", userId, koreaderBookDto.Progress.Sanitize());
|
||||
var file = await _unitOfWork.MangaFileRepository.GetByKoreaderHash(koreaderBookDto.Document);
|
||||
if (file == null) throw new KavitaException(await _localizationService.Translate(userId, "file-missing"));
|
||||
|
||||
|
@ -16,6 +16,7 @@ using API.DTOs.Scrobbling;
|
||||
using API.DTOs.SeriesDetail;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Interfaces;
|
||||
using API.Entities.Metadata;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Entities.Person;
|
||||
@ -526,6 +527,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
if (madeMetadataModification)
|
||||
{
|
||||
_unitOfWork.SeriesRepository.Update(series);
|
||||
_unitOfWork.SeriesRepository.Update(series.Metadata);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -782,7 +784,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (externalCharacters == null || externalCharacters.Count == 0) return false;
|
||||
|
||||
if (series.Metadata.CharacterLocked && !settings.HasOverride(MetadataSettingField.People))
|
||||
if (series.Metadata.CharacterLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -849,7 +851,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.People);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -864,7 +866,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (upstreamArtists.Count == 0) return false;
|
||||
|
||||
if (series.Metadata.CoverArtistLocked && !settings.HasOverride(MetadataSettingField.People))
|
||||
if (series.Metadata.CoverArtistLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -907,6 +909,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
await DownloadAndSetPersonCovers(upstreamArtists);
|
||||
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.People);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -920,7 +923,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (upstreamWriters.Count == 0) return false;
|
||||
|
||||
if (series.Metadata.WriterLocked && !settings.HasOverride(MetadataSettingField.People))
|
||||
if (series.Metadata.WriterLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -963,7 +966,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
await _unitOfWork.CommitAsync();
|
||||
|
||||
await DownloadAndSetPersonCovers(upstreamWriters);
|
||||
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.People);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -973,7 +976,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (!settings.EnableTags || processedTags.Count == 0) return false;
|
||||
|
||||
if (series.Metadata.TagsLocked && !settings.HasOverride(MetadataSettingField.Tags))
|
||||
if (series.Metadata.TagsLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Tags))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -990,6 +993,11 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
madeModification = true;
|
||||
}, () => series.Metadata.TagsLocked = true);
|
||||
|
||||
if (madeModification)
|
||||
{
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.Tags);
|
||||
}
|
||||
|
||||
return madeModification;
|
||||
}
|
||||
|
||||
@ -1014,7 +1022,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (!settings.EnableGenres || processedGenres.Count == 0) return false;
|
||||
|
||||
if (series.Metadata.GenresLocked && !settings.HasOverride(MetadataSettingField.Genres))
|
||||
if (series.Metadata.GenresLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Genres))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1035,6 +1043,12 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
{
|
||||
if (series.Metadata.Genres.FirstOrDefault(g => g.NormalizedTitle == genre.NormalizedTitle) != null) continue;
|
||||
series.Metadata.Genres.Add(genre);
|
||||
madeModification = true;
|
||||
}
|
||||
|
||||
if (madeModification)
|
||||
{
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.Genres);
|
||||
}
|
||||
|
||||
return madeModification;
|
||||
@ -1044,7 +1058,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
{
|
||||
if (!settings.EnablePublicationStatus) return false;
|
||||
|
||||
if (series.Metadata.PublicationStatusLocked && !settings.HasOverride(MetadataSettingField.PublicationStatus))
|
||||
if (series.Metadata.PublicationStatusLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.PublicationStatus))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1058,6 +1072,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
series.Metadata.PublicationStatus = status;
|
||||
series.Metadata.PublicationStatusLocked = true;
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.PublicationStatus);
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -1071,7 +1086,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
private bool UpdateAgeRating(Series series, MetadataSettingsDto settings, IEnumerable<string> allExternalTags)
|
||||
{
|
||||
|
||||
if (series.Metadata.AgeRatingLocked && !settings.HasOverride(MetadataSettingField.AgeRating))
|
||||
if (series.Metadata.AgeRatingLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.AgeRating))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1087,6 +1102,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
if (series.Metadata.AgeRating <= ageRating)
|
||||
{
|
||||
series.Metadata.AgeRating = ageRating;
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.AgeRating);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -1127,7 +1143,10 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
madeModification = UpdateChapterTitle(chapter, settings, potentialMatch.Title, series.Name) || madeModification;
|
||||
madeModification = UpdateChapterSummary(chapter, settings, potentialMatch.Summary) || madeModification;
|
||||
madeModification = UpdateChapterReleaseDate(chapter, settings, potentialMatch.ReleaseDate) || madeModification;
|
||||
madeModification = await UpdateChapterPublisher(chapter, settings, potentialMatch.Publisher) || madeModification;
|
||||
|
||||
var hasUpdatedPublisher = await UpdateChapterPublisher(chapter, settings, potentialMatch.Publisher);
|
||||
if (hasUpdatedPublisher) chapter.AddKPlusOverride(MetadataSettingField.ChapterPublisher);
|
||||
madeModification = hasUpdatedPublisher || madeModification;
|
||||
|
||||
madeModification = await UpdateChapterPeople(chapter, settings, PersonRole.CoverArtist, potentialMatch.Artists) || madeModification;
|
||||
madeModification = await UpdateChapterPeople(chapter, settings, PersonRole.Writer, potentialMatch.Writers) || madeModification;
|
||||
@ -1245,17 +1264,18 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(summary)) return false;
|
||||
|
||||
if (chapter.SummaryLocked && !settings.HasOverride(MetadataSettingField.ChapterSummary))
|
||||
if (chapter.SummaryLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterSummary))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(summary) && !settings.HasOverride(MetadataSettingField.ChapterSummary))
|
||||
if (!string.IsNullOrWhiteSpace(summary) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterSummary))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
chapter.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(summary));
|
||||
chapter.AddKPlusOverride(MetadataSettingField.ChapterSummary);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1265,17 +1285,18 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(title)) return false;
|
||||
|
||||
if (chapter.TitleNameLocked && !settings.HasOverride(MetadataSettingField.ChapterTitle))
|
||||
if (chapter.TitleNameLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterTitle))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!title.Contains(seriesName) && !settings.HasOverride(MetadataSettingField.ChapterTitle))
|
||||
if (!title.Contains(seriesName) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterTitle))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
chapter.TitleName = title;
|
||||
chapter.AddKPlusOverride(MetadataSettingField.ChapterTitle);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1285,17 +1306,18 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (releaseDate == null || releaseDate == DateTime.MinValue) return false;
|
||||
|
||||
if (chapter.ReleaseDateLocked && !settings.HasOverride(MetadataSettingField.ChapterReleaseDate))
|
||||
if (chapter.ReleaseDateLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterReleaseDate))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!settings.HasOverride(MetadataSettingField.ChapterReleaseDate))
|
||||
if (!HasForceOverride(settings, chapter, MetadataSettingField.ChapterReleaseDate))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
chapter.ReleaseDate = releaseDate.Value;
|
||||
chapter.AddKPlusOverride(MetadataSettingField.ChapterReleaseDate);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1305,12 +1327,12 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(publisher)) return false;
|
||||
|
||||
if (chapter.PublisherLocked && !settings.HasOverride(MetadataSettingField.ChapterPublisher))
|
||||
if (chapter.PublisherLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterPublisher))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(publisher) && !settings.HasOverride(MetadataSettingField.ChapterPublisher))
|
||||
if (!string.IsNullOrWhiteSpace(publisher) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterPublisher))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1332,7 +1354,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(coverUrl)) return false;
|
||||
|
||||
if (chapter.CoverImageLocked && !settings.HasOverride(MetadataSettingField.ChapterCovers))
|
||||
if (chapter.CoverImageLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterCovers))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1343,6 +1365,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
}
|
||||
|
||||
await DownloadChapterCovers(chapter, coverUrl);
|
||||
chapter.AddKPlusOverride(MetadataSettingField.ChapterCovers);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1352,7 +1375,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (staff?.Count == 0) return false;
|
||||
|
||||
if (chapter.IsPersonRoleLocked(role) && !settings.HasOverride(MetadataSettingField.People))
|
||||
if (chapter.IsPersonRoleLocked(role) && !HasForceOverride(settings, chapter, MetadataSettingField.People))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1401,7 +1424,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(externalMetadata.CoverUrl)) return false;
|
||||
|
||||
if (series.CoverImageLocked && !settings.HasOverride(MetadataSettingField.Covers))
|
||||
if (series.CoverImageLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Covers))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1412,6 +1435,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
}
|
||||
|
||||
await DownloadSeriesCovers(series, externalMetadata.CoverUrl);
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.Covers);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1422,17 +1446,18 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (!externalMetadata.StartDate.HasValue) return false;
|
||||
|
||||
if (series.Metadata.ReleaseYearLocked && !settings.HasOverride(MetadataSettingField.StartDate))
|
||||
if (series.Metadata.ReleaseYearLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.StartDate))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (series.Metadata.ReleaseYear != 0 && !settings.HasOverride(MetadataSettingField.StartDate))
|
||||
if (series.Metadata.ReleaseYear != 0 && !HasForceOverride(settings, series.Metadata, MetadataSettingField.StartDate))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
series.Metadata.ReleaseYear = externalMetadata.StartDate.Value.Year;
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.StartDate);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1440,12 +1465,12 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
{
|
||||
if (!settings.EnableLocalizedName) return false;
|
||||
|
||||
if (series.LocalizedNameLocked && !settings.HasOverride(MetadataSettingField.LocalizedName))
|
||||
if (series.LocalizedNameLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.LocalizedName))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(series.LocalizedName) && !settings.HasOverride(MetadataSettingField.LocalizedName))
|
||||
if (!string.IsNullOrWhiteSpace(series.LocalizedName) && !HasForceOverride(settings, series.Metadata, MetadataSettingField.LocalizedName))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1471,6 +1496,7 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
}
|
||||
|
||||
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.LocalizedName);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1480,17 +1506,18 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
if (string.IsNullOrEmpty(externalMetadata.Summary)) return false;
|
||||
|
||||
if (series.Metadata.SummaryLocked && !settings.HasOverride(MetadataSettingField.Summary))
|
||||
if (series.Metadata.SummaryLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Summary))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(series.Metadata.Summary) && !settings.HasOverride(MetadataSettingField.Summary))
|
||||
if (!string.IsNullOrWhiteSpace(series.Metadata.Summary) && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Summary))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
series.Metadata.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(externalMetadata.Summary));
|
||||
series.Metadata.AddKPlusOverride(MetadataSettingField.Summary);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1509,7 +1536,8 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
{
|
||||
try
|
||||
{
|
||||
await _coverDbService.SetSeriesCoverByUrl(series, coverUrl, false, true);
|
||||
// Only choose the better image if we're overriding a user provided cover
|
||||
await _coverDbService.SetSeriesCoverByUrl(series, coverUrl, false, !series.Metadata.HasSetKPlusMetadata(MetadataSettingField.Covers));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -1881,4 +1909,10 @@ public class ExternalMetadataService : IExternalMetadataService
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static bool HasForceOverride(MetadataSettingsDto settings, IHasKPlusMetadata kPlusMetadata,
|
||||
MetadataSettingField field)
|
||||
{
|
||||
return settings.HasOverride(field) || kPlusMetadata.HasSetKPlusMetadata(field);
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,9 @@ using API.DTOs.Person;
|
||||
using API.DTOs.SeriesDetail;
|
||||
using API.Entities;
|
||||
using API.Entities.Enums;
|
||||
using API.Entities.Interfaces;
|
||||
using API.Entities.Metadata;
|
||||
using API.Entities.MetadataMatching;
|
||||
using API.Entities.Person;
|
||||
using API.Extensions;
|
||||
using API.Helpers;
|
||||
@ -120,23 +122,27 @@ public class SeriesService : ISeriesService
|
||||
{
|
||||
series.Metadata.ReleaseYear = updateSeriesMetadataDto.SeriesMetadata.ReleaseYear;
|
||||
series.Metadata.ReleaseYearLocked = true;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.StartDate);
|
||||
}
|
||||
|
||||
if (series.Metadata.PublicationStatus != updateSeriesMetadataDto.SeriesMetadata.PublicationStatus)
|
||||
{
|
||||
series.Metadata.PublicationStatus = updateSeriesMetadataDto.SeriesMetadata.PublicationStatus;
|
||||
series.Metadata.PublicationStatusLocked = true;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.PublicationStatus);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(updateSeriesMetadataDto.SeriesMetadata.Summary))
|
||||
{
|
||||
updateSeriesMetadataDto.SeriesMetadata.Summary = string.Empty;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Summary);
|
||||
}
|
||||
|
||||
if (series.Metadata.Summary != updateSeriesMetadataDto.SeriesMetadata.Summary.Trim())
|
||||
{
|
||||
series.Metadata.Summary = updateSeriesMetadataDto.SeriesMetadata?.Summary.Trim() ?? string.Empty;
|
||||
series.Metadata.SummaryLocked = true;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Summary);
|
||||
}
|
||||
|
||||
if (series.Metadata.Language != updateSeriesMetadataDto.SeriesMetadata?.Language)
|
||||
@ -195,6 +201,7 @@ public class SeriesService : ISeriesService
|
||||
series.Metadata.AgeRating = updateSeriesMetadataDto.SeriesMetadata?.AgeRating ?? AgeRating.Unknown;
|
||||
series.Metadata.AgeRatingLocked = true;
|
||||
await _readingListService.UpdateReadingListAgeRatingForSeries(series.Id, series.Metadata.AgeRating);
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.AgeRating);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -206,6 +213,7 @@ public class SeriesService : ISeriesService
|
||||
if (updatedRating > series.Metadata.AgeRating)
|
||||
{
|
||||
series.Metadata.AgeRating = updatedRating;
|
||||
series.Metadata.KPlusOverrides.Remove(MetadataSettingField.AgeRating);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -319,6 +327,7 @@ public class SeriesService : ISeriesService
|
||||
return true;
|
||||
}
|
||||
|
||||
_unitOfWork.SeriesRepository.Update(series.Metadata);
|
||||
await _unitOfWork.CommitAsync();
|
||||
|
||||
// Trigger code to clean up tags, collections, people, etc
|
||||
|
@ -81,10 +81,6 @@ export class SeriesService {
|
||||
return this.httpClient.post<string>(this.baseUrl + 'series/delete-multiple', {seriesIds}, TextResonse).pipe(map(s => s === "true"));
|
||||
}
|
||||
|
||||
updateRating(seriesId: number, userRating: number) {
|
||||
return this.httpClient.post(this.baseUrl + 'series/update-rating', {seriesId, userRating});
|
||||
}
|
||||
|
||||
updateSeries(model: any) {
|
||||
return this.httpClient.post(this.baseUrl + 'series/update', model);
|
||||
}
|
||||
|
@ -78,6 +78,7 @@ export class ExternalRatingComponent implements OnInit {
|
||||
modalRef.componentInstance.userRating = this.userRating;
|
||||
modalRef.componentInstance.seriesId = this.seriesId;
|
||||
modalRef.componentInstance.hasUserRated = this.hasUserRated;
|
||||
modalRef.componentInstance.chapterId = this.chapterId;
|
||||
|
||||
modalRef.closed.subscribe((updated: {hasUserRated: boolean, userRating: number}) => {
|
||||
this.userRating = updated.userRating;
|
||||
|
@ -5,6 +5,7 @@ import {Breakpoint} from "../../../shared/_services/utility.service";
|
||||
import {NgxStarsModule} from "ngx-stars";
|
||||
import {ThemeService} from "../../../_services/theme.service";
|
||||
import {SeriesService} from "../../../_services/series.service";
|
||||
import {ReviewService} from "../../../_services/review.service";
|
||||
|
||||
@Component({
|
||||
selector: 'app-rating-modal',
|
||||
@ -20,7 +21,7 @@ export class RatingModalComponent {
|
||||
|
||||
protected readonly modal = inject(NgbActiveModal);
|
||||
protected readonly themeService = inject(ThemeService);
|
||||
protected readonly seriesService = inject(SeriesService);
|
||||
protected readonly reviewService = inject(ReviewService);
|
||||
protected readonly cdRef = inject(ChangeDetectorRef);
|
||||
|
||||
protected readonly Breakpoint = Breakpoint;
|
||||
@ -28,14 +29,16 @@ export class RatingModalComponent {
|
||||
@Input({required: true}) userRating!: number;
|
||||
@Input({required: true}) seriesId!: number;
|
||||
@Input({required: true}) hasUserRated!: boolean;
|
||||
@Input() chapterId: number | undefined;
|
||||
starColor = this.themeService.getCssVariable('--rating-star-color');
|
||||
|
||||
|
||||
updateRating(rating: number) {
|
||||
this.seriesService.updateRating(this.seriesId, rating).subscribe(() => {
|
||||
this.reviewService.updateRating(this.seriesId, rating, this.chapterId).subscribe(() => {
|
||||
this.userRating = rating;
|
||||
this.hasUserRated = true;
|
||||
this.cdRef.markForCheck();
|
||||
this.close();
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -190,7 +190,7 @@ export class FilterUtilitiesService {
|
||||
switch (type) {
|
||||
case 'series':
|
||||
return [
|
||||
FilterField.SeriesName, FilterField.Summary, FilterField.Path, FilterField.FilePath, PersonFilterField.Name
|
||||
FilterField.SeriesName, FilterField.Summary, FilterField.Path, FilterField.FilePath
|
||||
] as unknown as T[];
|
||||
case 'person':
|
||||
return [
|
||||
|
Loading…
x
Reference in New Issue
Block a user