glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-09-10 11:58:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge of Manga

Browse Source
This commit is contained in:
glax
2025-07-22 17:59:25 +02:00
parent 5d8f203a35
commit 356a22d72e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
API/Schema/MangaContext/MangaConnectorId.cs
View File

@@ -8,7 +8,7 @@ namespace API.Schema.MangaContext;
[PrimaryKey("Key")] [PrimaryKey("Key")]
public class MangaConnectorId<T> : Identifiable where T : Identifiable public class MangaConnectorId<T> : Identifiable where T : Identifiable
{ {
[StringLength(64)] [Required] public string ObjId { get; private set; } = null!; [StringLength(64)] [Required] public string ObjId { get; private set; }
[JsonIgnore] public T Obj = null!; [JsonIgnore] public T Obj = null!;
[StringLength(32)] [Required] public string MangaConnectorName { get; private set; } [StringLength(32)] [Required] public string MangaConnectorName { get; private set; }
@@ -21,6 +21,7 @@ public class MangaConnectorId<T> : Identifiable where T : Identifiable
: base(TokenGen.CreateToken(typeof(MangaConnectorId<T>), mangaConnector.Name, idOnConnectorSite)) : base(TokenGen.CreateToken(typeof(MangaConnectorId<T>), mangaConnector.Name, idOnConnectorSite))
{ {
this.Obj = obj; this.Obj = obj;
this.ObjId = obj.Key;
this.MangaConnectorName = mangaConnector.Name; this.MangaConnectorName = mangaConnector.Name;
this.IdOnConnectorSite = idOnConnectorSite; this.IdOnConnectorSite = idOnConnectorSite;
this.WebsiteUrl = websiteUrl; this.WebsiteUrl = websiteUrl;

5
API/Tranga.cs
View File

@@ -9,6 +9,7 @@ using API.Workers;
using API.Workers.MaintenanceWorkers; using API.Workers.MaintenanceWorkers;
using log4net; using log4net;
using log4net.Config; using log4net.Config;
using Microsoft.EntityFrameworkCore.ChangeTracking;
namespace API; namespace API;
@@ -165,6 +166,10 @@ public static class Tranga
MangaConnectorId<Manga> mcId = context.MangaConnectorToManga.Find(addMcId.Key) ?? addMcId; MangaConnectorId<Manga> mcId = context.MangaConnectorToManga.Find(addMcId.Key) ?? addMcId;
mcId.Obj = manga; mcId.Obj = manga;
foreach (CollectionEntry collectionEntry in context.Entry(manga).Collections)
collectionEntry.Load();
context.Entry(manga).Navigation(nameof(Manga.Library)).Load();
IEnumerable<MangaTag> mergedTags = manga.MangaTags.Select(mt => IEnumerable<MangaTag> mergedTags = manga.MangaTags.Select(mt =>
{ {
MangaTag? inDb = context.Tags.Find(mt.Tag); MangaTag? inDb = context.Tags.Find(mt.Tag);