Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2026-06-05 14:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Progress Overhaul + Profile Page and a LOT more! (#4262)

Browse Source 
Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com>
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo
2025-12-09 10:00:11 -07:00
committed by GitHub
parent 4ac13f1f25
commit 9f29fa593d
645 changed files with 25585 additions and 4805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/Services/Tasks/Scanner/ProcessSeries.cs
+7 -23
View File
@@ -4,7 +4,6 @@ using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Threading.Channels;
using System.Threading.Tasks;
using API.Data;
using API.Data.Metadata;
@@ -12,16 +11,13 @@ using API.Data.Repositories;
using API.DTOs.KavitaPlus.Metadata;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Metadata;
using API.Entities.Person;
using API.Extensions;
using API.Helpers;
using API.Helpers.Builders;
using API.Services.Plus;
using API.Services.Tasks.Metadata;
using API.Services.Tasks.Scanner.Parser;
using API.SignalR;
using Hangfire;
using Kavita.Common;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -366,6 +362,8 @@ public class ProcessSeries(
foreach (var personRole in Enum.GetValues<PersonRole>().Where(r => r != PersonRole.Other))
{
if (series.Metadata.IsPersonRoleLocked(personRole)) continue;
var chapterPeople = chapters
.SelectMany(c => c.People.Where(p => p.Role == personRole)).ToList();
@@ -485,12 +483,9 @@ public class ProcessSeries(
var metadataTagTitles = new HashSet<string>(metadataTags.Select(mt => mt.NormalizedTitle));
// Add any tags from chapterTags that do not already exist in metadataTags
foreach (var tag in chapterTags)
foreach (var tag in chapterTags.Where(tag => !metadataTagTitles.Contains(tag.NormalizedTitle)))
{
if (!metadataTagTitles.Contains(tag.NormalizedTitle))
{
metadataTags.Add(tag);
}
metadataTags.Add(tag);
}
}
@@ -513,23 +508,12 @@ public class ProcessSeries(
var metadataGenreTitles = new HashSet<string>(metadataGenres.Select(mg => mg.NormalizedTitle));
// Add any genres from chapterGenres that are not already in metadataGenres
foreach (var genre in chapterGenres)
foreach (var genre in chapterGenres.Where(genre => !metadataGenreTitles.Contains(genre.NormalizedTitle)))
{
if (!metadataGenreTitles.Contains(genre.NormalizedTitle))
{
metadataGenres.Add(genre);
}
metadataGenres.Add(genre);
}
}
private async Task UpdateSeriesMetadataPeople(SeriesMetadata metadata, ICollection<SeriesMetadataPeople> metadataPeople,
IEnumerable<ChapterPeople> chapterPeople, PersonRole role)
{
await PersonHelper.UpdateSeriesMetadataPeopleAsync(metadata, metadataPeople, chapterPeople, role, unitOfWork);
}
private void DeterminePublicationStatus(Series series, List<Chapter> chapters)
{
try
@@ -551,7 +535,7 @@ public class ProcessSeries(
{
series.Metadata.MaxCount = 1;
}
else if (series.Metadata.TotalCount <= 1 && chapters.Count == 1 && chapters[0].IsSpecial)
else if (series.Metadata.TotalCount <= 1 && chapters is [{IsSpecial: true}])
{
// If a series has a TotalCount of 1 (or no total count) and there is only a Special, mark it as Complete
series.Metadata.MaxCount = series.Metadata.TotalCount;