mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-01 04:34:49 -04:00
* Implemented a workaround for nginx users with BlockCommonExploits enabled, which would interfere with book image escaping done by Kavita when images had ../ in their path. * Added back to top support on all pages but those that untilize virtual scrolling without a parent scroll. * Hide jumpbar on pages where there is no scroll * Refactored jumbar code into a dedicated service * Stash some jumpkey resume code as I can't get it working with the virtual scroller. * Don't allow non-admins to see File locations on card detail drawer. * Some cleanup on GetServerInfo * When an error occurs in register, delete the user on exception. * Fixed a NPE in Stat collection for brand new users * When we catch an exception on registering a new user, delete the user as rolling back doesn't do anything. * Don't close typeahead when we are selecting options from it * Added shortcut key H to open shortcut modal on manga reader * When processing progress updates on cards, for volumes, properly find the chapter to update pages read. * Hide cover image on reading list if it's not set and fixed a missing closing div tag * Hide collection poster when nothing is set on collection detail * Small fix around updating state * Sped up the bookmark image call by removing one DB call * Fixed broken test from change in bookmark code * Fixed an oversight where if there is no tag in ComicInfo after a chapter was updated with People or Genres, then the People/Genres would never be removed. * Added test with TagHelper * Fixed a bug where 2 clear buttons would show on search bar due to browser injecting their own. Search bar wont show clear button until text is typed. * Fixed a bug where InstallID wasn't being selected correctly in converter
107 lines
4.1 KiB
C#
107 lines
4.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using API.Data;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
|
|
namespace API.Helpers;
|
|
|
|
public static class PersonHelper
|
|
{
|
|
/// <summary>
|
|
/// Given a list of all existing people, this will check the new names and roles and if it doesn't exist in allPeople, will create and
|
|
/// add an entry. For each person in name, the callback will be executed.
|
|
/// </summary>
|
|
/// <remarks>This does not remove people if an empty list is passed into names</remarks>
|
|
/// <remarks>This is used to add new people to a list without worrying about duplicating rows in the DB</remarks>
|
|
/// <param name="allPeople"></param>
|
|
/// <param name="names"></param>
|
|
/// <param name="role"></param>
|
|
/// <param name="action"></param>
|
|
public static void UpdatePeople(ICollection<Person> allPeople, IEnumerable<string> names, PersonRole role, Action<Person> action)
|
|
{
|
|
var allPeopleTypeRole = allPeople.Where(p => p.Role == role).ToList();
|
|
|
|
foreach (var name in names)
|
|
{
|
|
var normalizedName = Parser.Parser.Normalize(name);
|
|
var person = allPeopleTypeRole.FirstOrDefault(p =>
|
|
p.NormalizedName.Equals(normalizedName));
|
|
if (person == null)
|
|
{
|
|
person = DbFactory.Person(name, role);
|
|
allPeople.Add(person);
|
|
}
|
|
|
|
action(person);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Remove people on a list for a given role
|
|
/// </summary>
|
|
/// <remarks>Used to remove before we update/add new people</remarks>
|
|
/// <param name="existingPeople">Existing people on Entity</param>
|
|
/// <param name="people">People from metadata</param>
|
|
/// <param name="role">Role to filter on</param>
|
|
/// <param name="action">Callback which will be executed for each person removed</param>
|
|
public static void RemovePeople(ICollection<Person> existingPeople, IEnumerable<string> people, PersonRole role, Action<Person> action = null)
|
|
{
|
|
var normalizedPeople = people.Select(Parser.Parser.Normalize).ToList();
|
|
if (normalizedPeople.Count == 0)
|
|
{
|
|
var peopleToRemove = existingPeople.Where(p => p.Role == role).ToList();
|
|
foreach (var existingRoleToRemove in peopleToRemove)
|
|
{
|
|
existingPeople.Remove(existingRoleToRemove);
|
|
action?.Invoke(existingRoleToRemove);
|
|
}
|
|
return;
|
|
}
|
|
|
|
foreach (var person in normalizedPeople)
|
|
{
|
|
var existingPerson = existingPeople.FirstOrDefault(p => p.Role == role && person.Equals(p.NormalizedName));
|
|
if (existingPerson == null) continue;
|
|
|
|
existingPeople.Remove(existingPerson);
|
|
action?.Invoke(existingPerson);
|
|
}
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes all people that are not present in the removeAllExcept list.
|
|
/// </summary>
|
|
/// <param name="existingPeople"></param>
|
|
/// <param name="removeAllExcept"></param>
|
|
/// <param name="action">Callback for all entities that should be removed</param>
|
|
public static void KeepOnlySamePeopleBetweenLists(IEnumerable<Person> existingPeople, ICollection<Person> removeAllExcept, Action<Person> action = null)
|
|
{
|
|
foreach (var person in existingPeople)
|
|
{
|
|
var existingPerson = removeAllExcept.FirstOrDefault(p => p.Role == person.Role && person.NormalizedName.Equals(p.NormalizedName));
|
|
if (existingPerson == null)
|
|
{
|
|
action?.Invoke(person);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds the person to the list if it's not already in there
|
|
/// </summary>
|
|
/// <param name="metadataPeople"></param>
|
|
/// <param name="person"></param>
|
|
public static void AddPersonIfNotExists(ICollection<Person> metadataPeople, Person person)
|
|
{
|
|
var existingPerson = metadataPeople.SingleOrDefault(p =>
|
|
p.NormalizedName == Parser.Parser.Normalize(person.Name) && p.Role == person.Role);
|
|
if (existingPerson == null)
|
|
{
|
|
metadataPeople.Add(person);
|
|
}
|
|
}
|
|
}
|